summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/en/rst/about/index.rst15
-rw-r--r--docs/en/rst/integrating/templates.rst10
-rw-r--r--docs/en/rst/using/creating-an-account.rst4
-rw-r--r--docs/en/rst/using/filing.rst13
-rw-r--r--docs/en/rst/using/finding.rst4
-rw-r--r--extensions/GuidedBugEntry/web/js/products.js4
-rw-r--r--qa/t/webservice_bug_get.t4
-rw-r--r--qa/t/webservice_bug_update.t4
-rw-r--r--qa/t/webservice_bug_update_see_also.t2
9 files changed, 32 insertions, 28 deletions
diff --git a/docs/en/rst/about/index.rst b/docs/en/rst/about/index.rst
index cdcea4d15..82e6830a0 100644
--- a/docs/en/rst/about/index.rst
+++ b/docs/en/rst/about/index.rst
@@ -17,11 +17,16 @@ The most current version of this document can always be found on the
Evaluating Bugzilla
###################
-If you want to try out Bugzilla to see if it meets your needs, you can do so
-on `Landfill <https://landfill.bugzilla.org/bugzilla-4.4-branch/>`_, our test
-server. The `Bugzilla FAQ <https://wiki.mozilla.org/Bugzilla:FAQ>`_ may also
-be helpful, as it answers a number of questions people sometimes have about
-whether Bugzilla is for them.
+If you want to try out Bugzilla to see if it meets your needs, you can do so on
+`Mozilla’s Bugzilla (BMO) test server <https://bugzilla-dev.allizom.org/>`_,
+though it comes with various Mozilla-specific customizations. The easiest way to
+explore the admin tools and more is `running a minimum local copy of BMO
+<https://github.com/mozilla-bteam/bmo/blob/master/README.rst>`_ using Vagrant or
+Docker. We are not offering any online vanilla test environment at this time.
+
+The `Bugzilla FAQ <https://wiki.mozilla.org/Bugzilla:FAQ>`_ may also be helpful,
+as it answers a number of questions people sometimes have about whether Bugzilla
+is for them.
.. _getting-help:
diff --git a/docs/en/rst/integrating/templates.rst b/docs/en/rst/integrating/templates.rst
index b477a9553..e631b7364 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
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/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/extensions/GuidedBugEntry/web/js/products.js b/extensions/GuidedBugEntry/web/js/products.js
index 8ef1ea0c0..65dc04393 100644
--- a/extensions/GuidedBugEntry/web/js/products.js
+++ b/extensions/GuidedBugEntry/web/js/products.js
@@ -122,12 +122,12 @@ var products = {
"Bugzilla": {
support:
- 'Please use <a href="https://landfill.bugzilla.org/">Bugzilla Landfill</a> to file "test bugs".'
+ 'Please use <a href="https://bugzilla-dev.allizom.org/">our test server</a> to file "test bugs".'
},
"bugzilla.mozilla.org": {
related: [ "Bugzilla" ],
support:
- 'Please use <a href="https://landfill.bugzilla.org/">Bugzilla Landfill</a> to file "test bugs".'
+ 'Please use <a href="https://bugzilla-dev.allizom.org/">our test server</a> to file "test bugs".'
}
};
diff --git a/qa/t/webservice_bug_get.t b/qa/t/webservice_bug_get.t
index 91de410c1..cad5c3893 100644
--- a/qa/t/webservice_bug_get.t
+++ b/qa/t/webservice_bug_get.t
@@ -38,7 +38,7 @@ $xmlrpc->bz_call_success('Bug.update', {
is_creator_accessible => 0,
keywords => { set => ['test-keyword-1', 'test-keyword-2'] },
see_also => { add => ["${base_url}show_bug.cgi?id=$public_id",
- "https://landfill.bugzilla.org/show_bug.cgi?id=123456"] },
+ "https://bugzilla-dev.allizom.org/show_bug.cgi?id=123456"] },
cf_qa_status => ['in progress', 'verified'],
cf_single_select => 'two',
}, 'Update the private bug');
@@ -53,7 +53,7 @@ $private_bug->{is_creator_accessible} = 0;
$private_bug->{is_cc_accessible} = 1;
$private_bug->{keywords} = ['test-keyword-1', 'test-keyword-2'];
$private_bug->{see_also} = ["${base_url}show_bug.cgi?id=$public_id",
- "https://landfill.bugzilla.org/show_bug.cgi?id=123456"];
+ "https://bugzilla-dev.allizom.org/show_bug.cgi?id=123456"];
$private_bug->{cf_qa_status} = ['in progress', 'verified'];
$private_bug->{cf_single_select} = 'two';
diff --git a/qa/t/webservice_bug_update.t b/qa/t/webservice_bug_update.t
index 4e3b9985b..95af809e0 100644
--- a/qa/t/webservice_bug_update.t
+++ b/qa/t/webservice_bug_update.t
@@ -222,7 +222,7 @@ sub valid_values {
{ value => { remove => [$bug_uri . $second_id] },
removed => $bug_uri . $second_id, added => '',
test => 'remove local bug URI' },
- { value => { remove => ['http://landfill.bugzilla.org/bugzilla-tip/show_bug.cgi?id=1'] },
+ { value => { remove => ['https://bugzilla-dev.allizom.org/show_bug.cgi?id=1'] },
no_changes => 1,
test => 'removing non-existent URI works' },
{ value => { add => [''] },
@@ -524,7 +524,7 @@ sub invalid_values {
{ value => { add => [random_string(20)] },
error => 'It does not seem like bug number nor an alias to a bug.',
test => 'random string fails in see_also' },
- { value => { add => ['http://landfill.bugzilla.org/'] },
+ { value => { add => ['https://bugzilla-dev.allizom.org/'] },
error => 'See Also URLs should point to one of',
test => 'no show_bug.cgi in see_also URI' },
],
diff --git a/qa/t/webservice_bug_update_see_also.t b/qa/t/webservice_bug_update_see_also.t
index 460cb13e1..0af0e78d5 100644
--- a/qa/t/webservice_bug_update_see_also.t
+++ b/qa/t/webservice_bug_update_see_also.t
@@ -17,7 +17,7 @@ use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
use Test::More tests => 117;
my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
-my $bug_url = 'http://landfill.bugzilla.org/bugzilla-tip/show_bug.cgi?id=100';
+my $bug_url = 'https://bugzilla-dev.allizom.org/show_bug.cgi?id=100';
# update_see_also doesn't support logged-out users.
my @tests = grep { $_->{user} } @{ STANDARD_BUG_TESTS() };