aboutsummaryrefslogtreecommitdiffstats
path: root/docs/mediagoblin.rst
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-04-30 08:27:15 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-04-30 08:27:15 -0500
commit776331fd96b55dba004e8bb5a10e02a555bf76c1 (patch)
tree5cf332de13e8cd47d72e9916896e14c93886a8ba /docs/mediagoblin.rst
parent1bb0fdf2f4f568019c3449f269c69f406507bd7c (diff)
parent87b44d61ef4c1ace855540ab35f047a2067e277c (diff)
downloadmediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.tar.lz
mediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.tar.xz
mediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.zip
Merge branch 'master' into celerysubmit
Diffstat (limited to 'docs/mediagoblin.rst')
-rw-r--r--docs/mediagoblin.rst21
1 files changed, 12 insertions, 9 deletions
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?