Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / doc-src / tags

diff --git a/doc-src/tags b/doc-src/tags
index 2ed352e7014314e9184ffc959e4cf45b98d8d31b..8f42b5b75238a425c087788226eb7556efb5ffdc 100644 (file)
--- a/doc-src/tags
+++ b/doc-src/tags
@@ -1,3 +1,7 @@
+<!-- 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
@@ -13,28 +17,37 @@ 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. 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
---------------------------
-
-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 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
+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.