Merge remote-tracking branch 'upstream/5.0'

10 files changed, 25 insertions, 14 deletions

diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py
index a758fd248..34acb4778 100644
--- a/docs/en/rst/conf.py
+++ b/docs/en/rst/conf.py
@@ -44,7 +44,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Bugzilla'
-copyright = u'2014, The Bugzilla Team'
+copyright = u'2016, The Bugzilla Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -387,7 +387,7 @@ todo_include_todos = False
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 if on_rtd:
-    base_api_url = 'https://www.bugzilla.org/docs/5.0/en/html/api/'
+    base_api_url = 'https://www.bugzilla.org/docs/5.0/en/html/integrating/api/'
 else:
     base_api_url = '../integrating/api/'
 
diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index 22d0bf735..f40c5e8f0 100644
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -117,7 +117,7 @@ Bugzilla
 
 The best way to get Bugzilla is to check it out from git:
 
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/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".
diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
index b18a5ec31..37a1d3610 100644
--- a/docs/en/rst/installing/mac-os-x.rst
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -28,7 +28,7 @@ Bugzilla
 
 The best way to get Bugzilla is to check it out from git:
 
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/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".
diff --git a/docs/en/rst/installing/migrating-from-2.inc.rst b/docs/en/rst/installing/migrating-from-2.inc.rst
index c9328077f..889e5c3d8 100644
--- a/docs/en/rst/installing/migrating-from-2.inc.rst
+++ b/docs/en/rst/installing/migrating-from-2.inc.rst
@@ -21,7 +21,7 @@ Mac OS X, you can
 
 Once git is installed, run these commands to pull a copy of Bugzilla:
 
-:command:`git clone https://git.mozilla.org/bugzilla/bugzilla bugzilla-new`
+:command:`git clone https://github.com/bugzilla/bugzilla bugzilla-new`
 
 :command:`cd bugzilla-new`
 
diff --git a/docs/en/rst/installing/migrating.rst b/docs/en/rst/installing/migrating.rst
index 5b842dd3d..8fc0de5f4 100644
--- a/docs/en/rst/installing/migrating.rst
+++ b/docs/en/rst/installing/migrating.rst
@@ -4,8 +4,7 @@ Migrating From Other Bug-Tracking Systems
 #########################################
 
 Bugzilla has a framework you can use for migrating from other bug-tracking
-systems -
-`Bugzilla::Migrate <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Migrate.html>`_.
+systems - :api:`Bugzilla::Migrate <Bugzilla/Migrate.html>`.
 It provides the infrastructure you will need,
 but requires a module to be written to define the specifics of the system you
 are coming from. One exists for
diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
index 64a88e55b..7ea5ed58a 100644
--- a/docs/en/rst/installing/quick-start.rst
+++ b/docs/en/rst/installing/quick-start.rst
@@ -64,7 +64,7 @@ Get it from our Git repository:
 
 :command:`cd /var/www/html`
 
-:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla bugzilla`
 
 (where "X.X" is the 2-digit version number of the stable release of Bugzilla
 that you want - e.g. 5.0)
diff --git a/docs/en/rst/installing/upgrading-with-git.rst b/docs/en/rst/installing/upgrading-with-git.rst
index 075ff8902..855951349 100644
--- a/docs/en/rst/installing/upgrading-with-git.rst
+++ b/docs/en/rst/installing/upgrading-with-git.rst
@@ -9,6 +9,18 @@ intermediate steps. There is a script named :file:`checksetup.pl` included
 with Bugzilla that will automatically do all of the database migration
 for you.
 
+Bugzilla is now hosted on Github, but we used to be hosted on git.mozilla.org.
+If you got the code from git.mozilla.org, you need to point your
+checkout at Github instead. To find out, run:
+
+:command:`git remote -v`
+
+If you see "git.mozilla.org" anywhere in the output, then run:
+
+:command:`git remote set-url origin https://github.com/bugzilla/bugzilla`
+
+This change will only ever need to be done once.
+
 .. include:: upgrading-with-1.inc.rst
 
 You can see if you have local code customizations using:
diff --git a/docs/en/rst/installing/windows.rst b/docs/en/rst/installing/windows.rst
index adc1728c6..e2137a9fc 100644
--- a/docs/en/rst/installing/windows.rst
+++ b/docs/en/rst/installing/windows.rst
@@ -40,7 +40,7 @@ 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 --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla C:\\bugzilla`
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla C:\\bugzilla`
 
 where "X.X" is the 2-digit version number of the stable release of Bugzilla
 that you want (e.g. 5.0).
diff --git a/docs/en/rst/integrating/extensions.rst b/docs/en/rst/integrating/extensions.rst
index 18c5341d3..6a3fd8d3f 100644
--- a/docs/en/rst/integrating/extensions.rst
+++ b/docs/en/rst/integrating/extensions.rst
@@ -11,8 +11,8 @@ versions of Bugzilla with minimal effort. We maintain a
 written by other people on our wiki. You would need to
 make sure that the extension in question works with your version of Bugzilla.
 
-Or, you can write your own extension. See the `Bugzilla Extension
-documentation <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Extension.html>`_
+Or, you can write your own extension. See the :api:`Bugzilla Extension
+documentation <Bugzilla/Extension.html>`
 for the core documentation on how to do that. It would make sense to read
 the section on :ref:`templates`. There is also a sample extension in
 :file:`$BUGZILLA_HOME/extensions/Example/` which gives examples of how to
@@ -183,8 +183,8 @@ bugs, except to comment and add themselves to the CC list.
 
 Because this kind of change is such a common request, we have added a
 specific hook for it that :ref:`extensions` can call. It's called
-``bug_check_can_change_field``, and it's documented `in the Hooks
-documentation <http://www.bugzilla.org/docs/tip/en/html/api/Bugzilla/Hook.html#bug_check_can_change_field>`_.
+``bug_check_can_change_field``, and it's documented :api:`in the Hooks
+documentation <Bugzilla/Hook.html#bug_check_can_change_field>`.
 
 Checking Syntax
 ===============
diff --git a/docs/en/rst/integrating/skins.rst b/docs/en/rst/integrating/skins.rst
index 2cd08b4c0..4c1d8e254 100644
--- a/docs/en/rst/integrating/skins.rst
+++ b/docs/en/rst/integrating/skins.rst
@@ -8,7 +8,7 @@ its underlying structure. It ships with two - "Classic" and "Dusk". You can
 find some more listed
 `on the wiki <https://wiki.mozilla.org/Bugzilla:Addons#Skins>`_, and there
 are a couple more which are part of
-`bugzilla.mozilla.org <http://git.mozilla.org/?p=webtools/bmo/bugzilla.git>`_.
+`bugzilla.mozilla.org <https://github.com/mozilla-bteam/bmo>`_.
 However, in each
 case you may need to check that the skin supports the version of Bugzilla
 you have.