Updates to use new, easier command sequences for Git.

diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index d94977fb7344d50363b7278987060305005e328b..3f4cb9169e233cecf8c5237e35aa9ac3a079e8be 100644 (file)
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -124,9 +124,10 @@ Bugzilla
 
 The best way to get Bugzilla is to check it out from git:
 
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch bugzilla-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
 
-.. todo:: Need to check out stable branch, not master
+Run the above command in your home directory, replacing "X.X" with the 2-digit
+version number of the stable release of Bugzilla that you want - e.g. "4.4".
 
 If that's not possible, you can
 `download a tarball of Bugzilla <http://www.bugzilla.org/download/>`_.

diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
index 77730ce6e3d3d7342325715be36d602673eeacd4..bc04d8a66ccc588aa636a69f70f0150834df1f9e 100644 (file)
--- a/docs/en/rst/installing/mac-os-x.rst
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -23,10 +23,11 @@ Bugzilla
 
 The best way to get Bugzilla is to check it out from git:
 
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch bugzilla-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
 
-Run the above command in your home directory. This will place Bugzilla in
-the directory :file:`$HOME/bugzilla`.
+Run the above command in your home directory, replacing "X.X" with the 2-digit
+version number of the stable release of Bugzilla that you want - e.g. "4.4".
+This will place Bugzilla in the directory :file:`$HOME/bugzilla`.
 
 If that's not possible, you can
 `download a tarball of Bugzilla <http://www.bugzilla.org/download/>`_.

diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
index 414ebc2c38b2363b211262bff752ad100cf5921f..5ef758f3065707923a303d23b0405b7018a739c5 100644 (file)
--- a/docs/en/rst/installing/quick-start.rst
+++ b/docs/en/rst/installing/quick-start.rst
@@ -66,17 +66,12 @@ Get it from our Git repository:
 
 :command:`rm -rf html`
 
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla html`
+:command:`git clone --branch bugzilla-X.X-stable https://git.mozilla.org/bugzilla/bugzilla html`
 
-:command:`cd html`
-
-:command:`git checkout bugzilla-stable`
+(where "X.X" is the 2-digit version number of the stable release of Bugzilla
+that you want - e.g. 4.4)
 
-You will get a notification about having a detached HEAD. Don't worry,
-your head is still firmly on your shoulders.
-
-.. todo:: is this the right way to get the current bugzilla-stable code? Or
-         should we pull directly from a branch?
+:command:`cd html`
    
 Configure MySQL
 ===============

diff --git a/docs/en/rst/installing/windows.rst b/docs/en/rst/installing/windows.rst
index 5b5da335ade89fdd25ca29fb4e66897324aa4587..49c2a9ea604428de2970eeb1c7af5aacb89d65d8 100644 (file)
--- a/docs/en/rst/installing/windows.rst
+++ b/docs/en/rst/installing/windows.rst
@@ -44,7 +44,10 @@ Bugzilla
 The best way to get Bugzilla is to check it out from git. Download and install
 git from the `git website <http://git-scm.com/download>`_, and then run:
 
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla C:\\bugzilla`
+:command:`git clone --branch bugzilla-X.X-stable https://git.mozilla.org/bugzilla/bugzilla C:\\bugzilla`
+
+where "X.X" is the 2-digit version number of the stable release of Bugzilla
+that you want (e.g. 4.4).
 
 The rest of this documentation assumes you have installed Bugzilla into
 :file:`C:\\bugzilla`. Adjust paths appropriately if not.

diff --git a/docs/en/rst/upgrading/migrating-from-2.inc.rst b/docs/en/rst/upgrading/migrating-from-2.inc.rst
index e49ca34ed2bbd83ea3d4f1fbe743ba8304b385a2..351850ada7b39229a07a90dbd71ae5b919be79b1 100644 (file)
--- a/docs/en/rst/upgrading/migrating-from-2.inc.rst
+++ b/docs/en/rst/upgrading/migrating-from-2.inc.rst
@@ -18,11 +18,11 @@ Once git is installed, run these commands to pull a copy of Bugzilla:
 
 :command:`cd bugzilla-new`
 
-:command:`git checkout $VERSION`
+:command:`git checkout release-$VERSION`
 
-Replace $VERSION with the two-digit version number of your current Bugzilla, e.g.
-4.2. These command will automatically switch your checkout to be a copy of
-the latest point release of version $VERSION.
+Replace $VERSION with the three-digit version number of your current Bugzilla,
+e.g. "4.2.2". (If the the final digit would have been a 0, omit it - so use
+"4.4" for the first release in the 4.4 series.)
 
 Save Any Local Customizations
 =============================

diff --git a/docs/en/rst/upgrading/upgrading-with-git.rst b/docs/en/rst/upgrading/upgrading-with-git.rst
index 523906f44475b4dd944ef61319c4e3941885dfae..78b4fb1e088be6f2b18f096ddc46c5959d548e1c 100644 (file)
--- a/docs/en/rst/upgrading/upgrading-with-git.rst
+++ b/docs/en/rst/upgrading/upgrading-with-git.rst
@@ -43,15 +43,23 @@ Getting The New Bugzilla
 ========================
 
 In the commands below, ``$BUGZILLA_HOME`` represents the directory
-in which Bugzilla is installed.
+in which Bugzilla is installed. Assuming you followed the installation
+instructions and your Bugzilla is a checkout of a stable branch,
+you can get the latest point release of your current version by simply doing:
 
 :command:`cd $BUGZILLA_HOME`
 
-:command:`git checkout`
-
 :command:`git pull`
 
-.. todo:: What is the best way to pull latest stable?
+If you want to upgrade to a newer release of Bugzilla, then you will
+additionally need to do:
+
+:command:`git checkout bugzilla-X.X-stable`
+
+where "X.X" is the 2-digit version number of the stable version you want to
+upgrade to (e.g. "4.4").
+
+.. note:: Do not attempt to downgrade Bugzilla this way - it won't work.
 
 If you have local code customizations, git will attempt to merge them. If
 it fails, then you should implement the plan you came up with when you