Update version number, relnotes and upgrading docs in preparation for release.

1 files changed, 20 insertions, 11 deletions

diff --git a/docs/source/siteadmin/upgrading.rst b/docs/source/siteadmin/upgrading.rst
index 47d78264..a4a851d1 100644
--- a/docs/source/siteadmin/upgrading.rst
+++ b/docs/source/siteadmin/upgrading.rst
@@ -27,19 +27,28 @@ way if something goes wrong, we can fix things!
 And be sure to shut down your current MediaGoblin/Celery processes before
 upgrading!
 
+.. note::
+
+   Previous versions of the upgrade docs recommended ``./bootstrap.sh &&
+   ./configure && make`` without ``--system-site-packages``. This ignores any
+   system-wide Python modules and installs everything from the Python Package
+   Index. That's not strictly a problem, but is inconsistent with the
+   ":doc:`deploying`" instructions. If you have problems with dependencies, feel
+   free to revert to this approach.
+
 
 Upgrade (already on Python 3)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. Update to the latest release.  In your ``mediagoblin`` directory, run:
-   ``git fetch && git checkout -q v0.10.0 && git submodule update``
+   ``git fetch && git checkout -q v0.11.0 && git submodule update``
 2. Remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make distclean``
 3. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 4. Update the database:
    ``./bin/gmg dbupdate``
-5. Restart MediaGoblin
+5. Restart the Paster and Celery processes
 
 
 Upgrade (upgrading to Python 3)
@@ -48,14 +57,14 @@ Upgrade (upgrading to Python 3)
 1. Refer to the "Dependences" and "Configure PostgreSQL" sections of
    ":doc:`deploying`" to install the necessary Python 3 dependencies.
 2. Update to the latest release.  In your ``mediagoblin`` directory, run:
-   ``git fetch && git checkout -q stable && git submodule update``
+   ``git fetch && git checkout -q v0.11.0 && git submodule update``
 3. Remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make distclean``
 4. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 5. Update the database:
    ``./bin/gmg dbupdate``
-6. Restart MediaGoblin
+6. Restart the Paster and Celery processes
 
 
 Updating your system Python
@@ -66,9 +75,9 @@ Python may break MediaGoblin. This typically occurs because Python virtual
 environment is referring to a copy of Python that no longer exists. To fix this:
 
 1. In your ``mediagoblin`` directory, remove your existing installation:
-   ``rm -rf bin include lib lib64 node_modules``
+   ``make disclean``
 2. Install MediaGoblin:
-   ``./bootstrap.sh && ./configure && make``
+   ``./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make``
 3. Update the database:
    ``./bin/gmg dbupdate``
-4. Restart MediaGoblin
+4. Restart the Paster and Celery processes