Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

This commit is contained in:
Christopher Allan Webber 2012-06-02 23:12:45 -05:00
commit 349f5b19f7
2 changed files with 14 additions and 4 deletions

View File

@ -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
==================================

View File

@ -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.