Merge branch '0.9.x' into 1.0.x

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

diff --git a/doc-src/faq b/doc-src/faq
index 31582b9f0dcaf4566638911518e4e8005df96a1b..589b18b8d8844193e21188e4d941f90deb643d49 100644 (file)
--- a/doc-src/faq
+++ b/doc-src/faq
@@ -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. -->
+
 These are some *Frequently Asked Questions* about this service, with
 some answers.
 
@@ -26,7 +30,7 @@ presence. If you don't like how %%site.name%% works, you can take your data and
 Where is feature X?
 -------------------
 
-The software we run, [Laconica](http://laconi.ca/), is still in its early stages,
+The software we run, [StatusNet](http://status.net/), is still in its early stages,
 and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon":
 
 * More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface
@@ -36,7 +40,7 @@ and many features people expect from microblogging sites are not yet implemented
 * [Facebook](http://www.facebook.com/) integration
 * Image, video, audio notices
 
-There is [a list of bugs and features](http://laconi.ca/trac/) that you may find
+There is [a list of bugs and features](http://status.net/bugs/) that you may find
 interesting. New ideas or complaints are very welcome.