Merge remote-tracking branch 'bmo/master'

5 files changed, 14 insertions, 14 deletions

diff --git a/docs/en/rst/integrating/extensions.rst b/docs/en/rst/integrating/extensions.rst
index 50f204746..e9ae48630 100644
--- a/docs/en/rst/integrating/extensions.rst
+++ b/docs/en/rst/integrating/extensions.rst
@@ -49,7 +49,7 @@ To add new fields to a bug, you need to do the following:
 
     my $field = new Bugzilla::Field({ name => $name });
     return if $field;
- 
+
     $field = Bugzilla::Field->create({
         name        => $name,
         description => $description,
@@ -67,12 +67,12 @@ To add new fields to a bug, you need to do the following:
 
   .. code-block:: perl
 
-    BEGIN { 
-       *Bugzilla::Bug::is_foopy = \&_bug_is_foopy; 
+    BEGIN {
+       *Bugzilla::Bug::is_foopy = \&_bug_is_foopy;
     }
- 
+
     ...
- 
+
     sub _bug_is_foopy {
         return $_[0]->{'is_foopy'};
     }
diff --git a/docs/en/rst/integrating/faq.rst b/docs/en/rst/integrating/faq.rst
index 19f8b59ff..f50453df5 100644
--- a/docs/en/rst/integrating/faq.rst
+++ b/docs/en/rst/integrating/faq.rst
@@ -18,10 +18,10 @@ How do I...
 ...use a word other than 'bug' to describe bugs?
   :ref:`Edit or override <templates>` the appropriate values in the template
   :file:`template/en/default/global/variables.none.tmpl`.
-  
+
 ...call the system something other than 'Bugzilla'?
   :ref:`Edit or override <templates>` the appropriate value in the template
   :file:`template/en/default/global/variables.none.tmpl`.
-  
+
 ...alter who can change what field when?
   See :ref:`who-can-change-what`.
diff --git a/docs/en/rst/integrating/languages.rst b/docs/en/rst/integrating/languages.rst
index 4d087a721..d76a82a82 100644
--- a/docs/en/rst/integrating/languages.rst
+++ b/docs/en/rst/integrating/languages.rst
@@ -3,7 +3,7 @@ Languages
 
 Bugzilla's templates can be localized, although it's a `big job
 <https://wiki.mozilla.org/Bugzilla:L10n:Guide>`_. If you have
-a localized set of templates for your version of Bugzilla, Bugzilla can 
+a localized set of templates for your version of Bugzilla, Bugzilla can
 support multiple languages at once. In that case, Bugzilla honours the user's
 ``Accept-Language`` HTTP header when deciding which language to serve. If
 multiple languages are installed, a menu will display in the header allowing
diff --git a/docs/en/rst/integrating/skins.rst b/docs/en/rst/integrating/skins.rst
index 2cd08b4c0..92bf60dfc 100644
--- a/docs/en/rst/integrating/skins.rst
+++ b/docs/en/rst/integrating/skins.rst
@@ -11,7 +11,7 @@ are a couple more which are part of
 `bugzilla.mozilla.org <http://git.mozilla.org/?p=webtools/bmo/bugzilla.git>`_.
 However, in each
 case you may need to check that the skin supports the version of Bugzilla
-you have. 
+you have.
 
 To create a new custom skin, make a directory that contains all the same CSS
 file names as :file:`skins/standard/`, and put your directory in
diff --git a/docs/en/rst/integrating/templates.rst b/docs/en/rst/integrating/templates.rst
index ee2c08e92..e563d8179 100644
--- a/docs/en/rst/integrating/templates.rst
+++ b/docs/en/rst/integrating/templates.rst
@@ -49,7 +49,7 @@ modifications, and the method you plan to use to upgrade Bugzilla.
 
 #. You can use the hooks built into many of the templates to add or modify
    the UI from an :ref:`extension <extensions>`. Hooks generally don't go away
-   and have a stable interface. 
+   and have a stable interface.
 
 The third method is the best if there are hooks in the appropriate places
 and the change you want to do is possible using hooks. It's not very easy
@@ -89,7 +89,7 @@ can't if you fork the file into the :file:`custom` directory.
 How To Edit Templates
 =====================
 
-.. note:: If you are making template changes that you intend on submitting 
+.. note:: If you are making template changes that you intend on submitting
    back for inclusion in standard Bugzilla, you should read the relevant
    sections of the
    `Developers' Guide <https://www.bugzilla.org/docs/developer.html>`_.
@@ -111,7 +111,7 @@ to cross-site scripting attacks.
 
 You should run :command:`./checksetup.pl` after editing any templates. Failure
 to do so may mean either that your changes are not picked up, or that the
-permissions on the edited files are wrong so the webserver can't read them. 
+permissions on the edited files are wrong so the webserver can't read them.
 
 .. _template-formats:
 
@@ -232,11 +232,11 @@ customizing for your installation.
     and have their values appear formatted in the initial comment.
 
     An example of this is the `guided bug submission form
-    <http://landfill.bugzilla.org/bugzilla-tip/enter_bug.cgi?product=WorldControl;format=guided>`_.
+    <https://bugzilla-dev.allizom.org/enter_bug.cgi?product=Firefox&format=guided>`_.
     The code for this comes with the Bugzilla distribution as an example for
     you to copy. It can be found in the files
     :file:`create-guided.html.tmpl` and :file:`comment-guided.html.tmpl`.
-        
+
     A hidden field that indicates the format should be added inside
     the form in order to make the template functional. Its value should
     be the suffix of the template filename. For example, if the file