Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / doc / help

diff --git a/doc/help b/doc/help
index 9e86bed2c16a62dae0e14d52c3b2ba0513a8a4a1..a8cfccd2b368132486a0439828ca1996a72d44f0 100644 (file)
--- a/doc/help
+++ b/doc/help
@@ -1,15 +1,32 @@
-Help
-----
+%%site.name%% is a **microblogging service**. Users post short (140
+character) notices which are broadcast to their friends and fans using
+the Web, RSS, or instant messages.
 
-%%site.name%% is a *microblogging* service -- a way for you to tell
-your friends and fans about what you're doing, wherever you are. You
-can post small (140 characters or less) texts to the site, and all
-your friends who "subscribe" to your posts will receive messages from
-you.
+If you'd like to try it out, first [register](%%action.register%%) a new account.
+Then, on the [public timeline](%%action.public%%), enter your message into
+the textbox at the top of the page, and click "Send". It will go out on the
+public timeline and to anyone who is subscribed to your notices (probably nobody,
+at first).
 
-The code is available under a Free Software/Open Source license, which
-means that you can set up your /own/ microblogging service. It
-supports the [OpenMicroBlogging](http://openmicroblogging.org/)
-standard, so that people using different services can subscribe to
-each others notices with as little work as necessary.
+To subscribe to other people's notifications, go to their profile page
+and click the "subscribe" button. They'll get a notice that you're now
+subscribed to their notifications, and, who knows?, they might subscribe
+back.
 
+More help
+---------
+
+Here are some documents that you might find helpful in understanding
+%%site.name%% and how to use it.
+
+* [About](%%doc.about%%) - an overview of the service
+* [FAQ](%%doc.faq%%) - frequently-asked questions about %%site.name%%
+* [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
+* [Groups](%%doc.groups%%) - joining together in groups
+* [OpenID](%%doc.openid%%) - what OpenID is and how to use it with this service
+* [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
+* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
+* [Source](%%doc.source%%) - How to get the Laconica source code