Switch docs back over to using old virtualenv setup while we resolve issue #755

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 6123dc9e9165f3af150e004df332e09dbf10e18a..de4ce1acc3ac9ea671daaf89a536cf33aa886b82 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -203,18 +203,20 @@ Clone the MediaGoblin repository and set up the git submodules::
     cd mediagoblin
     git submodule init && git submodule update
 
-Set up the in-package virtualenv via make::
 
-    ./bootstrap.sh && ./configure && make
+And set up the in-package virtualenv::
+
+    (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop
 
 .. note::
 
-   Prefer not to use make, or want to use the "old way" of installing
-   MediaGoblin (maybe you know how to use virtualenv and python
-   packaging)?  You still can!  All that the above make script is doing
-   is installing an in-package virtualenv and running
+   We presently have an experimental make-style deployment system.  if
+   you'd like to try it, instead of the above command, you can run::
+
+     ./bootstrap.sh && ./configure && make
 
-     ./bin/python setup.py develop
+   This also includes a number of nice features, such as keeping your
+   viratualenv up to date by simply running `make update`.
 
 .. ::