aboutsummaryrefslogtreecommitdiff
path: root/doc-src
diff options
context:
space:
mode:
authorIan Denhardt <ian@zenhack.net>2011-05-23 21:50:48 -0400
committerIan Denhardt <ian@zenhack.net>2011-05-23 21:50:48 -0400
commit31b29fde50e9664e1b70064c043879ce87553883 (patch)
tree20f3bbafb9f0282deed6d0d7734fd34285456d14 /doc-src
parent58254aa4970392b5d9eab36974fe89c50227c84f (diff)
parentfd847c29c517d51851213168c3129b7b5169b5b8 (diff)
downloadgnu-social-31b29fde50e9664e1b70064c043879ce87553883.tar
gnu-social-31b29fde50e9664e1b70064c043879ce87553883.zip
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts: plugins/OStatus/actions/ostatusinit.php
Diffstat (limited to 'doc-src')
-rw-r--r--doc-src/help3
-rw-r--r--doc-src/lists73
-rw-r--r--doc-src/tags49
3 files changed, 114 insertions, 11 deletions
diff --git a/doc-src/help b/doc-src/help
index 6d12b4cd76..92d5d05afa 100644
--- a/doc-src/help
+++ b/doc-src/help
@@ -28,8 +28,9 @@ Here are some documents that you might find helpful in understanding
* [Contact](%%doc.contact%%) - who to contact with questions about the service
* [IM](%%doc.im%%) - using the instant-message (IM) features of %%site.name%%
* [SMS](%%doc.sms%%) - tying your cellphone to %%site.name%%
-* [tags](%%doc.tags%%) - different ways to use tagging
+* [Tags](%%doc.tags%%) - different ways to use tagging
* [Groups](%%doc.groups%%) - joining together in groups
+* [Lists](%%doc.lists%%) - organize your contacts
* [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
* [Source](%%doc.source%%) - How to get the StatusNet source code
diff --git a/doc-src/lists b/doc-src/lists
new file mode 100644
index 0000000000..b2e93aa853
--- /dev/null
+++ b/doc-src/lists
@@ -0,0 +1,73 @@
+<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+
+%%site.name%% supports
+[tags](http://en.wikipedia.org/wiki/Tag_(metadata)) to help you
+organize your activities here. You can use tags for people and for
+notices.
+
+Tagging a notice
+----------------
+
+You can tag a notice using a *hashtag*; a # character followed by
+letters and numbers as well as '.', '-', and '_'. Note that accented
+latin characters are not supported, and non-roman scripts are right out.
+
+The HTML for the notice will link to a stream of all the other notices
+with that tag. This can be a great way to keep track of a conversation.
+
+The most popular current tags on the site can be found in the [public
+tag cloud](%%action.publictagcloud%%). Their size shows their
+popularity and recency.
+
+Tagging yourself
+----------------
+
+You can also add tags for yourself on your [profile
+settings](%%action.profilesettings%%) page or by using the edit tags
+button on your profile page. Use single words to
+describe yourself, your experiences and your interest. The tags will
+become links on your profile page to a list of all the users on the
+site who use that same tag. It can be a nice way to find people who
+are related to you geographically or who have a common interest.
+
+Tagging others
+--------------
+
+You can also tag other users by using the edit tags button next to
+their profile. Such tags are called *people tags*. Once you have
+created a people tag, you can add or remove users from it using the
+tag's edit form. This makes it easy to organize your subscriptions
+into groups and sort through them separately. Also, it will let
+you create custom lists of people that others can subscribe to.
+
+You can also send a notice "to the attention of" your subscribers
+whom you've marked with a particular tag (note: *not* people who've
+marked themselves with that tag). "@#family hello" will send a
+notice to all your subscribers you've marked with the tag 'family'.
+
+Private and public people tags
+------------------------------
+
+A private people tag is only visible to the creator, it cannot be
+subscribed to, but the timeline can be viewed. To create a new
+private prepend a '.' to the tag in the tags editing box. To set
+an existing public tag as private or vice-versa, go to the tag's
+edit page.
+
+The most used public tags are displayed in the
+[public people tag cloud](%%action.publicpeopletagcloud%%). Their
+size shows their frequency of use.
+
+Remote people tags
+------------------
+
+You can even [tag remote users](%%action.profilesettings%%). Just
+enter the remote profile's URI and click on the "Fetch" button to
+fetch the profile, you can then add tags and save them.
+
+Subscribing to the timeline of a people tag on another server also
+works. Just copy the URL of the people tag's timeline page to the
+[OStatus subscription](%%action.ostatussub%%) form.
+
diff --git a/doc-src/tags b/doc-src/tags
index 091b147ad3..b2e93aa853 100644
--- a/doc-src/tags
+++ b/doc-src/tags
@@ -25,20 +25,49 @@ Tagging yourself
----------------
You can also add tags for yourself on your [profile
-settings](%%action.profilesettings%%) page. Use single words to
+settings](%%action.profilesettings%%) page or by using the edit tags
+button on your profile page. Use single words to
describe yourself, your experiences and your interest. The tags will
become links on your profile page to a list of all the users on the
site who use that same tag. It can be a nice way to find people who
are related to you geographically or who have a common interest.
-Tagging your subscriptions
---------------------------
+Tagging others
+--------------
-You can also tag your subscriptions, on the subscriptions page. This
-makes it easy to organize your subscriptions into groups and sort
-through them separately.
+You can also tag other users by using the edit tags button next to
+their profile. Such tags are called *people tags*. Once you have
+created a people tag, you can add or remove users from it using the
+tag's edit form. This makes it easy to organize your subscriptions
+into groups and sort through them separately. Also, it will let
+you create custom lists of people that others can subscribe to.
+
+You can also send a notice "to the attention of" your subscribers
+whom you've marked with a particular tag (note: *not* people who've
+marked themselves with that tag). "@#family hello" will send a
+notice to all your subscribers you've marked with the tag 'family'.
+
+Private and public people tags
+------------------------------
+
+A private people tag is only visible to the creator, it cannot be
+subscribed to, but the timeline can be viewed. To create a new
+private prepend a '.' to the tag in the tags editing box. To set
+an existing public tag as private or vice-versa, go to the tag's
+edit page.
+
+The most used public tags are displayed in the
+[public people tag cloud](%%action.publicpeopletagcloud%%). Their
+size shows their frequency of use.
+
+Remote people tags
+------------------
+
+You can even [tag remote users](%%action.profilesettings%%). Just
+enter the remote profile's URI and click on the "Fetch" button to
+fetch the profile, you can then add tags and save them.
+
+Subscribing to the timeline of a people tag on another server also
+works. Just copy the URL of the people tag's timeline page to the
+[OStatus subscription](%%action.ostatussub%%) form.
-You can also send a notice "to the attention of" everyone you've
-marked with a particular tag (note: *not* people who've marked
-themselves with that tag). "@#family hello" will send a notice to
-everyone you've marked with the tag 'family'. \ No newline at end of file