Merge branch '0.9.x' into 1.0.x

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

diff --git a/doc-src/help b/doc-src/help
index 02cf0d14b0c1247f6db38ee9b72239ee7a2a608d..6d12b4cd765cfb0298eb46345499077048a7ae05 100644 (file)
--- a/doc-src/help
+++ b/doc-src/help
@@ -1,4 +1,8 @@
-%%site.name%% is a **microblogging service**. Users post short (140
+<!-- 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%% is a **microblogging service**. Users post short (%%site.textlimit%%

 character) notices which are broadcast to their friends and fans using
 the Web, RSS, or instant messages.
 
 character) notices which are broadcast to their friends and fans using
 the Web, RSS, or instant messages.
 


@@ -26,9 +30,9 @@ Here are some documents that you might find helpful in understanding
 * [SMS](%%doc.sms%%) - tying your cellphone to %%site.name%%
 * [tags](%%doc.tags%%) - different ways to use tagging
 * [Groups](%%doc.groups%%) - joining together in groups
 * [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
 * [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
-* [Badge](%%doc.badge%%) - How to put a Laconica badge on your blog or homepage
-* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
\ No newline at end of file
+* [Source](%%doc.source%%) - How to get the StatusNet source code
+* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
+* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
+* [API](%%doc.api%%) - API for use by external clients