aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/deploying.rst
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2012-02-18 10:01:47 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2012-02-18 10:01:47 -0600
commit63352aaf70d97a37b6277fab0f9b957d34dcb9df (patch)
treeacdedffc204d89f1f71f09696270e5719f5e3123 /docs/source/deploying.rst
parent7f3ec607a34e727324397c2bf240f771b12a0455 (diff)
parentfeba5c5287a7cb4c0ed8f5124ad60a8a291770ad (diff)
downloadmediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.lz
mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.xz
mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.zip
Merge branch 'master' into sqlmigrate
Conflicts: mediagoblin/db/sql/models.py
Diffstat (limited to 'docs/source/deploying.rst')
-rw-r--r--docs/source/deploying.rst15
1 files changed, 14 insertions, 1 deletions
diff --git a/docs/source/deploying.rst b/docs/source/deploying.rst
index 4aded2e6..ce39dc4e 100644
--- a/docs/source/deploying.rst
+++ b/docs/source/deploying.rst
@@ -1,3 +1,16 @@
+.. MediaGoblin Documentation
+
+ Written in 2011, 2012 by MediaGoblin contributors
+
+ To the extent possible under law, the author(s) have dedicated all
+ copyright and related and neighboring rights to this software to
+ the public domain worldwide. This software is distributed without
+ any warranty.
+
+ You should have received a copy of the CC0 Public Domain
+ Dedication along with this software. If not, see
+ <http://creativecommons.org/publicdomain/zero/1.0/>.
+
=====================
Deploying MediaGoblin
=====================
@@ -118,7 +131,7 @@ Clone the MediaGoblin repository::
And setup the in-package virtualenv::
cd mediagoblin
- virtualenv . && ./bin/python setup.py develop
+ (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop
.. note::