Merge remote-tracking branch 'bmo/master'

5 files changed, 12 insertions, 13 deletions

diff --git a/docs/en/rst/using/creating-an-account.rst b/docs/en/rst/using/creating-an-account.rst
index 0ea42ee5d..3d70096f5 100644
--- a/docs/en/rst/using/creating-an-account.rst
+++ b/docs/en/rst/using/creating-an-account.rst
@@ -6,8 +6,8 @@ Creating an Account
 If you want to use a particular installation of Bugzilla, first you need to
 create an account. Ask the administrator responsible for your installation
 for the URL you should use to access it. If you're test-driving Bugzilla,
-you can use one of the installations on
-`Landfill <http://landfill.bugzilla.org/>`_.
+you can use one of the installations on `Mozilla’s Bugzilla (BMO) test server
+<https://bugzilla-dev.allizom.org/>`_.
 
 The process of creating an account is similar to many other websites.
 
diff --git a/docs/en/rst/using/extensions.rst b/docs/en/rst/using/extensions.rst
index 752b50b9a..28bae5be5 100644
--- a/docs/en/rst/using/extensions.rst
+++ b/docs/en/rst/using/extensions.rst
@@ -14,5 +14,5 @@ last time you compiled the documentation):
 .. toctree::
    :maxdepth: 1
    :glob:
-   
+
    ../extensions/*/index-user
diff --git a/docs/en/rst/using/filing.rst b/docs/en/rst/using/filing.rst
index 788cebbd5..a76e3faed 100644
--- a/docs/en/rst/using/filing.rst
+++ b/docs/en/rst/using/filing.rst
@@ -7,18 +7,17 @@ Reporting a New Bug
 ===================
 
 Years of bug writing experience has been distilled for your
-reading pleasure into the
-`Bug Writing Guidelines <http://landfill.bugzilla.org/bugzilla-tip/page.cgi?id=bug-writing.html>`_.
+reading pleasure into the `Bug report writing guidelines
+<https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines>`_.
 While some of the advice is Mozilla-specific, the basic principles of
 reporting Reproducible, Specific bugs and isolating the Product you are
 using, the Version of the Product, the Component which failed, the Hardware
 Platform, and Operating System you were using at the time of the failure go a
 long way toward ensuring accurate, responsible fixes for the bug that bit you.
 
-.. note:: If you want to file a test bug to see how Bugzilla works,
-   you can do it on one of our test installations on
-   `Landfill <http://landfill.bugzilla.org/>`_. Please don't do it on anyone's
-   production Bugzilla installation.
+.. note:: If you want to file a test bug to see how Bugzilla works, you can do
+   so on `Mozilla’s Bugzilla (BMO) test server <https://bugzilla-dev.allizom.org/>`_.
+   Please don’t do it on any production Bugzilla installation.
 
 The procedure for filing a bug is as follows:
 
@@ -46,7 +45,7 @@ The procedure for filing a bug is as follows:
    developers easier, and the probability that they consider your bug in
    a reasonable timeframe will be much higher.
 
-   .. note:: Try to make sure that everything in the Summary is also in the 
+   .. note:: Try to make sure that everything in the Summary is also in the
       Description. Summaries are often updated and this will ensure your original
       information is easily accessible.
 
diff --git a/docs/en/rst/using/finding.rst b/docs/en/rst/using/finding.rst
index 44d4003dc..baf2d9076 100644
--- a/docs/en/rst/using/finding.rst
+++ b/docs/en/rst/using/finding.rst
@@ -43,8 +43,8 @@ Advanced Search
 ===============
 
 The Advanced Search page is used to produce a list of all bugs fitting
-exact criteria. `You can play with it on
-Landfill <http://landfill.bugzilla.org/bugzilla-tip/query.cgi?format=advanced>`_.
+exact criteria. You can play with it on `Mozilla’s Bugzilla (BMO) test server
+<https://bugzilla-dev.allizom.org/query.cgi?format=advanced>`_.
 
 Advanced Search has controls for selecting different possible
 values for all of the fields in a bug, as described above. For some
diff --git a/docs/en/rst/using/understanding.rst b/docs/en/rst/using/understanding.rst
index c52bd2167..958d4baae 100644
--- a/docs/en/rst/using/understanding.rst
+++ b/docs/en/rst/using/understanding.rst
@@ -26,7 +26,7 @@ installation of Bugzilla.
 
 *Product and Component*:
    Bugs are divided up by Product and Component, with a Product
-   having one or more Components in it. 
+   having one or more Components in it.
 
 *Version:*
    The "Version" field usually contains the numbers or names of released