diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-06-02 23:12:45 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-06-02 23:12:45 -0500 |
| commit | 349f5b19f768f4880b544732c77991ef7bdab6c8 (patch) | |
| tree | 77cb3c258884180e2a01f7ec0bdfc7981bc26a21 | |
| parent | 791cc619b5a1a5bbbd5b1451399babb38a5e1b74 (diff) | |
| parent | 0e60e7e81b58f2ef8ca4bd571bb9544e41e573c8 (diff) | |
| download | mediagoblin-349f5b19f768f4880b544732c77991ef7bdab6c8.tar.lz mediagoblin-349f5b19f768f4880b544732c77991ef7bdab6c8.tar.xz mediagoblin-349f5b19f768f4880b544732c77991ef7bdab6c8.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
| -rw-r--r-- | docs/source/index.rst | 9 | ||||
| -rw-r--r-- | docs/source/siteadmin/about.rst | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/docs/source/index.rst b/docs/source/index.rst index 5b8d5c85..569eda14 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -16,6 +16,15 @@ Welcome to GNU MediaGoblin's documentation! =========================================== +GNU MediaGoblin is a platform for sharing photos, video and other media +in an environment that respects our freedom and independence. + +This is a Free Software project. It is built by contributors for all +to use and enjoy. If you're intrested in contributing, see `the wiki +<http://wiki.mediagoblin.org/>`_ which has pages that talk about the +ways someone can contribute. + + Part 1: Site Administrator's Guide ================================== diff --git a/docs/source/siteadmin/about.rst b/docs/source/siteadmin/about.rst index 95647abb..f9602397 100644 --- a/docs/source/siteadmin/about.rst +++ b/docs/source/siteadmin/about.rst @@ -36,10 +36,11 @@ freedom look like on the participatory web?" Their answer, the Identi.ca and Libre.fm address the need for micro-blogging and music sharing services and software that respect users' freedom and -autonomy. GNU MediaGoblin emerges from this milieu to create a -platform for us to share photos in an environment that respects our -freedom and independence. In the future MediaGoblin will include -support other media, like video, and provide tools to facilitate +autonomy. + +GNU MediaGoblin emerges from this milieu to create a platform for us to share +photos, video and other media in an environment that respects our freedom and +independence. In the future MediaGoblin will provide tools to facilitate collaboration on media projects. |