summaryrefslogtreecommitdiffstats
path: root/docs/en/rst/installing
diff options
context:
space:
mode:
authorGervase Markham <gerv@gerv.net>2015-04-07 16:33:54 +0200
committerGervase Markham <gerv@gerv.net>2015-04-07 16:33:54 +0200
commitba69f972b0e98a4a81c3730ad87a17f6b386c87e (patch)
treee6abffde638ac146e447b0f30313738abf2425fa /docs/en/rst/installing
parentb1886835c81c014c1423fa2f2d83e157cbde1406 (diff)
downloadbugzilla-ba69f972b0e98a4a81c3730ad87a17f6b386c87e.tar.gz
bugzilla-ba69f972b0e98a4a81c3730ad87a17f6b386c87e.tar.xz
Remove 'upgrade to latest point release' step from docs about migrating SCMs; r=mcote
Diffstat (limited to 'docs/en/rst/installing')
-rw-r--r--docs/en/rst/installing/upgrading.rst12
1 files changed, 5 insertions, 7 deletions
diff --git a/docs/en/rst/installing/upgrading.rst b/docs/en/rst/installing/upgrading.rst
index f43897fb3..f37998cf8 100644
--- a/docs/en/rst/installing/upgrading.rst
+++ b/docs/en/rst/installing/upgrading.rst
@@ -3,9 +3,8 @@
Upgrading
#########
-You can upgrade Bugzilla from any version to any later version in one go -
-there is no need to pass through intermediate versions unless you are changing
-the method by which you obtain the code along the way.
+You can upgrade Bugzilla from any version to any later version in one go—there
+is no need to pass through intermediate versions.
.. warning:: Upgrading is a one-way process. You cannot "downgrade" an
upgraded Bugzilla. If you wish to revert to the old Bugzilla
@@ -21,11 +20,10 @@ already true of your installation, see :ref:`upgrading-with-git`.
Before Git, we used to use Bazaar and, before that, CVS. If your installation
of Bugzilla consists of a checkout from one of those two systems, you need to
-upgrade in three steps:
+upgrade in two steps:
-1. Upgrade to the latest point release of your current Bugzilla version.
-2. Move to Git while staying on exactly the same release.
-3. Upgrade to the latest Bugzilla using the instructions for :ref:`upgrading-with-git`.
+1. Move to running from a Git checkout, while staying on exactly the same release.
+2. Upgrade to the latest Bugzilla using the instructions for :ref:`upgrading-with-git`.
See :ref:`migrating-from-bazaar` or :ref:`migrating-from-cvs` as appropriate.