aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/contributinghowto.rst2
-rw-r--r--docs/foreward.rst10
-rw-r--r--docs/mediagoblin.rst21
3 files changed, 18 insertions, 15 deletions
diff --git a/docs/contributinghowto.rst b/docs/contributinghowto.rst
index a44c361f..cb5cd909 100644
--- a/docs/contributinghowto.rst
+++ b/docs/contributinghowto.rst
@@ -64,7 +64,7 @@ help with.
Are there things about our instance you want to change? Are there
things about other instances you wish were different? That's
- great--you can run your own instance!
+ great---you can run your own instance!
For more information on deploying your own instance, see
:ref:`deployment-howto`.
diff --git a/docs/foreward.rst b/docs/foreward.rst
index c1d60587..edc75e30 100644
--- a/docs/foreward.rst
+++ b/docs/foreward.rst
@@ -16,8 +16,8 @@ This manual is a living document and is in the ``mediagoblin``
repository in the ``docs/`` directory.
-Who wrote this documentation
-============================
+Who wrote this documentation?
+=============================
In no particular order:
@@ -29,10 +29,10 @@ In no particular order:
* Matt
-How should I bring up errors in the documentation
-=================================================
+I found an error in the docs---who do I tell?
+=============================================
-There are a few ways--please pick the one most convenient to you!
+There are a few ways---please pick the one most convenient to you!
1. Send an email to Will ``willg at bluesock dot org``.
2. Write up a bug report in the bug tracker at http://bugs.foocorp.net/ .
diff --git a/docs/mediagoblin.rst b/docs/mediagoblin.rst
index 6c3a8dfa..a6194dc4 100644
--- a/docs/mediagoblin.rst
+++ b/docs/mediagoblin.rst
@@ -5,12 +5,13 @@
What is GNU MediaGoblin
=======================
-Three years ago, a number of free software luminaries got together at
-the FSF office to answer the question, "What should software freedom
-look like on the participatory web?" Those thinkers included Richard
-Stallman - founder of the free software movement and instigator of the
-GNU project, Evan Prodromou - the driving force behind Status.net, a
-highly sucessful federated micro-blogging service, and FIXME.
+Three years ago (2008), a number of free software luminaries got
+together at the FSF office to answer the question, "What should
+software freedom look like on the participatory web?" Those thinkers
+included Richard Stallman---founder of the free software movement and
+instigator of the GNU project, Evan Prodromou---the driving force
+behind Status.net, a highly sucessful federated micro-blogging
+service, and FIXME.
Since that time Identi.ca and Libre.fm have answered the
freedom-loving web-user's need for micro-blogging and music sharing.
@@ -46,10 +47,12 @@ How can I participate?
See `Get Involved <http://mediagoblin.org/join/>`.
-How is this licensed?
-=====================
+How is GNU MediaGoblin licensed?
+================================
-FIXME - write this once we work out the details
+GNU MediaGoblin software is released under an AGPLv3 license.
+
+See the ``COPYING`` file in the source for details.
Is this an official GNU Project? What does that mean?