aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-08-03 18:01:17 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-08-03 18:01:17 -0500
commite69bb23b4c3352cd119f9a513ea0e12a123a9d15 (patch)
tree5c9576f6b5ceb3e823756d49f53c60e6dccf830e /README
parent5bb1f9b0efdfa801dfdf083184e5820fb29e00b0 (diff)
parent4d74812dfc5a671aa50f54951ffe9e0ee520f8f7 (diff)
downloadmediagoblin-e69bb23b4c3352cd119f9a513ea0e12a123a9d15.tar.lz
mediagoblin-e69bb23b4c3352cd119f9a513ea0e12a123a9d15.tar.xz
mediagoblin-e69bb23b4c3352cd119f9a513ea0e12a123a9d15.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'README')
-rw-r--r--README10
1 files changed, 7 insertions, 3 deletions
diff --git a/README b/README
index 082ab2a7..0aba179b 100644
--- a/README
+++ b/README
@@ -33,6 +33,10 @@ hang out, see `our Join page <http://mediagoblin.org/join/>`_
Where is the documentation?
===========================
-Documentation is located in the ``docs/`` directory in a "raw"
-restructured-text form. It is also available at
-http://docs.mediagoblin.org/ in HTML form.
+The beginnings of a user manual is located in the ``docs/`` directory
+in HTML, Texinfo, and source (Restructured Text) forms. It's also
+available online at http://docs.mediagoblin.org/ in HTML form.
+
+Contributor/developer documentation as well as documentation on the
+project processes and infrastructure is located on
+`the wiki <http://wiki.mediagoblin.org/>`_.