From a14f4f93eb99ac3ffb37c08f6a43cc77c14b0e55 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Mon, 29 Mar 2021 16:02:04 +1100
Subject: docs: Remove explicit references to Python 3 (now assumed).

---
 docs/source/siteadmin/upgrading.rst | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'docs/source/siteadmin')

diff --git a/docs/source/siteadmin/upgrading.rst b/docs/source/siteadmin/upgrading.rst
index b1b1fb8d..29dd04a6 100644
--- a/docs/source/siteadmin/upgrading.rst
+++ b/docs/source/siteadmin/upgrading.rst
@@ -25,8 +25,8 @@ Although not strictly necessary, we recommend you shut down your current
 MediaGoblin/Celery processes before upgrading.
 
 
-Upgrade (already on Python 3)
------------------------------
+Upgrade
+-------
 
 1. Update to the latest release.  In your ``mediagoblin`` directory, run::
 
@@ -36,16 +36,10 @@ Upgrade (already on Python 3)
 
      make distclean
 
-3. Install MediaGoblin (changed for 0.11.0, see notes section above)::
+3. Recreate the virtual environment and install MediaGoblin::
 
      ./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && make
 
-   (As of 0.11.0, the upgrade instructions have been updated to use
-   ``--system-site-package`` option for consistency with the deployment
-   instructions. If this approach causes any problems with for you, re-run
-   ``make distclean`` and then ``./bootstrap.sh && ./configure && make`` without
-   ``--system-site-packages``.)
-
 4. Update the database::
 
      ./bin/gmg dbupdate
@@ -65,18 +59,10 @@ Upgrade (already on Python 3)
    footer to confirm the version number you're running.
 
 
-Upgrading to Python 3
----------------------
-
-Refer to the "Dependences" and "Configure PostgreSQL" sections of
-":doc:`deploying`" to install the necessary Python 3 dependencies. Then follow
-the instructions for "Upgrade (already on Python 3)" above.
-
-
 Updating your system Python
 ---------------------------
 
-Upgrading your operating system or installing a new version of Python may break
-MediaGoblin. This typically occurs because Python virtual environment is
+Upgrading your operating system or installing a new major version of Python may
+break MediaGoblin. This typically occurs because Python virtual environment is
 referring to a copy of Python that no longer exists. In this situation use the
-same process for "Upgrade (already on Python 3)" above.
+same process for "Upgrade" above.
-- 
cgit v1.2.3