From 46bcb831b9e32f825fef459b52bc12ceb3d7a7b3 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Sat, 2 Dec 2017 10:43:46 -0500 Subject: Bug 1417980 - Fix non-HTTPS links and outdated links where possible --- Bugzilla/Constants.pm | 2 +- Bugzilla/DB/Schema.pm | 4 +- Bugzilla/Extension.pm | 8 +-- Bugzilla/Template/Plugin/Hook.pm | 2 +- Bugzilla/WebService/Server/JSONRPC.pm | 2 +- Bugzilla/WebService/Server/XMLRPC.pm | 2 +- checksetup.pl | 2 +- docs/en/rst/about/index.rst | 4 +- docs/en/rst/integrating/apis.rst | 4 +- docs/en/rst/integrating/auth-delegation.rst | 2 +- docs/en/rst/integrating/extensions.rst | 4 +- docs/en/rst/integrating/languages.rst | 2 +- docs/en/rst/integrating/templates.rst | 2 +- docs/en/rst/using/tips.rst | 4 +- .../template/en/default/account/create.html.tmpl | 20 ++----- .../bug/create/create-client-bounty.html.tmpl | 2 +- .../en/default/bug/create/create-doc.html.tmpl | 2 +- .../en/default/bug/create/create-ipc.html.tmpl | 6 +- .../default/bug/create/create-poweredby.html.tmpl | 2 +- .../default/bug/create/create-trademark.html.tmpl | 2 +- .../default/bug/create/create-web-bounty.html.tmpl | 4 +- .../en/default/bug/create/user-message.html.tmpl | 2 +- .../en/default/global/choose-product.html.tmpl | 2 +- .../createformcontents-patch_notes.html.tmpl | 2 +- .../auth_failure/permissions.html.tmpl | 2 +- .../en/default/pages/bug-writing.html.tmpl | 2 +- .../template/en/default/pages/etiquette.html.tmpl | 2 +- .../en/default/pages/upgrade-3.6.html.tmpl | 4 +- .../en/default/pages/user_activity.html.tmpl | 2 +- .../template/en/default/guided/guided.html.tmpl | 14 ++--- extensions/GuidedBugEntry/web/js/products.js | 8 +-- .../hook/attachment/create-before_form.html.tmpl | 2 +- .../en/default/bug/create/create-mozreps.html.tmpl | 2 +- .../en/default/pages/securemail/help.html.tmpl | 4 +- .../template/en/default/pages/splinter.html.tmpl | 2 +- .../en/default/pages/splinter/help.html.tmpl | 2 +- .../en/default/pages/user_profile.html.tmpl | 2 +- qa/t/lib/QA/Tests.pm | 2 +- qa/t/webservice_bug_get.t | 4 +- qa/t/webservice_group_create.t | 2 +- .../en/default/admin/params/advanced.html.tmpl | 2 +- .../default/admin/params/dependencygraph.html.tmpl | 2 +- .../en/default/admin/params/editparams.html.tmpl | 2 +- .../en/default/admin/params/patchviewer.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 2 +- .../en/default/bug/create/create-guided.html.tmpl | 4 +- .../en/default/bug/create/user-message.html.tmpl | 2 +- template/en/default/bug/new_bug.html.tmpl | 2 +- template/en/default/index.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 38 ++++++------- template/en/default/pages/release-notes3.html.tmpl | 66 +++++++++++----------- template/en/default/search/search-google.html.tmpl | 2 +- template/en/default/setup/strings.txt.pl | 2 +- 53 files changed, 131 insertions(+), 143 deletions(-) diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 9c8f39b4a..37917d305 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -213,7 +213,7 @@ sub BUGZILLA_VERSION { # A base link to the current REST Documentation. We place it here # as it will need to be updated to whatever the current release is. -use constant REST_DOC => "http://www.bugzilla.org/docs/tip/en/html/api/"; +use constant REST_DOC => "https://bugzilla.readthedocs.io/en/latest/api/"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 7448d8878..0464466af 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -79,7 +79,7 @@ Bugzilla::DB. If this is your first time looking at Schema.pm, especially if you are making changes to the database, please take a look at -L to learn +L to learn more about how this integrates into the rest of Bugzilla. =cut @@ -3179,6 +3179,6 @@ database-specific basis: L -L +L =cut diff --git a/Bugzilla/Extension.pm b/Bugzilla/Extension.pm index 7e53d87f3..baf2286e1 100644 --- a/Bugzilla/Extension.pm +++ b/Bugzilla/Extension.pm @@ -325,7 +325,7 @@ L. If you need a new hook for your extension and you want that hook to be added to Bugzilla itself, see our development process at -L. +L. In order for a new hook to be accepted into Bugzilla, it has to work, it must have documentation in L, and it must have example @@ -618,7 +618,7 @@ return C<0> or some false value. If you've made an extension and you want to publish it, the first thing you'll want to do is package up your extension's code and then put a link to it in the appropriate section of -L. +L. =head2 Distributing on CPAN @@ -628,7 +628,7 @@ distribute your Bugzilla Extension through CPAN. The details of making a standard CPAN module are too much to go into here, but a lot of it is covered in L -and on L among other places. +and on L among other places. When you distribute your extension via CPAN, your F should simply install itself as F, @@ -659,7 +659,7 @@ uses extensions. If you are an extension author and you'd like some assistance from other extension authors or the Bugzilla development team, you can use the -normal support channels described at L. +normal support channels described at L. =head1 ADDITIONAL CONSTANTS diff --git a/Bugzilla/Template/Plugin/Hook.pm b/Bugzilla/Template/Plugin/Hook.pm index 981a1ab53..a2b76a80f 100644 --- a/Bugzilla/Template/Plugin/Hook.pm +++ b/Bugzilla/Template/Plugin/Hook.pm @@ -149,4 +149,4 @@ Output from processing template extension. L -L +L diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm index 0fb8b4299..0bd7b4648 100644 --- a/Bugzilla/WebService/Server/JSONRPC.pm +++ b/Bugzilla/WebService/Server/JSONRPC.pm @@ -527,7 +527,7 @@ JSON-RPC response. When calling the JSON-RPC WebService over GET, you can use the "JSONP" method of doing cross-domain requests, if you want to access the WebService directly on a web page from another site. JSONP is described at -L. +L. To use JSONP with Bugzilla's JSON-RPC WebService, simply specify a C parameter to jsonrpc.cgi when using it via GET as described above. diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm index f5a31b30e..fce865e88 100644 --- a/Bugzilla/WebService/Server/XMLRPC.pm +++ b/Bugzilla/WebService/Server/XMLRPC.pm @@ -422,7 +422,7 @@ returned>. nil is implemented by XMLRPC::Lite, in XMLRPC::Deserializer::decode_value in the CPAN SVN since 14th Dec 2008 -L and in Fedora's +L and in Fedora's perl-SOAP-Lite package in versions 0.68-1 and above. =end private diff --git a/checksetup.pl b/checksetup.pl index 1b4df3c2f..cd973f5c7 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -500,7 +500,7 @@ format. If you'd like to know how to make changes to the datbase, see the information in the Bugzilla Developer's Guide, at: -L +L Also see L and L. diff --git a/docs/en/rst/about/index.rst b/docs/en/rst/about/index.rst index 239c6ecea..cdcea4d15 100644 --- a/docs/en/rst/about/index.rst +++ b/docs/en/rst/about/index.rst @@ -10,7 +10,7 @@ that tracks millions of bugs and issues for thousands of organizations around the world. The most current version of this document can always be found on the -`Bugzilla website `_. +`Bugzilla website `_. .. _evaluating: @@ -36,7 +36,7 @@ Google Group. Please first, and then ask your question there. If you need a guaranteed response, commercial support is -`available `_ for Bugzilla +`available `_ for Bugzilla from a number of people and organizations. .. _conventions: diff --git a/docs/en/rst/integrating/apis.rst b/docs/en/rst/integrating/apis.rst index 6067c12df..a02bc1a21 100644 --- a/docs/en/rst/integrating/apis.rst +++ b/docs/en/rst/integrating/apis.rst @@ -24,7 +24,7 @@ XML-RPC ======= Bugzilla has an `XML-RPC API -`_. +`_. This will receive no further updates and will be removed in a future version of Bugzilla. @@ -34,7 +34,7 @@ JSON-RPC ======== Bugzilla has a `JSON-RPC API -`_. +`_. This will receive no further updates and will be removed in a future version of Bugzilla. diff --git a/docs/en/rst/integrating/auth-delegation.rst b/docs/en/rst/integrating/auth-delegation.rst index bff460e4a..325f802a8 100644 --- a/docs/en/rst/integrating/auth-delegation.rst +++ b/docs/en/rst/integrating/auth-delegation.rst @@ -14,7 +14,7 @@ The authentication process begins by directing the user to th the Bugzilla site' For the sake of this example, our application's URL is `http://app.example.org` and the Bugzilla site is `http://bugzilla.mozilla.org`. -1. Provide a link or redirect the user to `http://bugzilla.mozilla.org/auth.cgi?callback=http://app.example.org/callback&description=app%description` +1. Provide a link or redirect the user to `https://bugzilla.mozilla.org/auth.cgi?callback=http://app.example.org/callback&description=app%description` 2. Assuming the user is agreeable, the following will happen: 1. Bugzilla will issue a POST request to `http://app.example.org/callback` with a the request body data being a JSON object with keys `client_api_key` and `client_api_login`. diff --git a/docs/en/rst/integrating/extensions.rst b/docs/en/rst/integrating/extensions.rst index 18c5341d3..50f204746 100644 --- a/docs/en/rst/integrating/extensions.rst +++ b/docs/en/rst/integrating/extensions.rst @@ -12,7 +12,7 @@ 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 `_ +documentation `_ 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 @@ -184,7 +184,7 @@ 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 `_. +documentation `_. Checking Syntax =============== diff --git a/docs/en/rst/integrating/languages.rst b/docs/en/rst/integrating/languages.rst index 01586d3fe..4d087a721 100644 --- a/docs/en/rst/integrating/languages.rst +++ b/docs/en/rst/integrating/languages.rst @@ -12,7 +12,7 @@ choice will override the ``Accept-Language`` header. Many language templates can be obtained from `the localization section of the Bugzilla website -`_. Instructions +`_. Instructions for submitting new languages are also available from that location. There's also a `list of localization teams `_; you might diff --git a/docs/en/rst/integrating/templates.rst b/docs/en/rst/integrating/templates.rst index f30b4a848..b477a9553 100644 --- a/docs/en/rst/integrating/templates.rst +++ b/docs/en/rst/integrating/templates.rst @@ -92,7 +92,7 @@ How To Edit Templates .. 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 `_. + `Developers' Guide `_. Bugzilla uses a templating system called Template Toolkit. The syntax of the language is beyond the scope of this guide. It's reasonably easy to pick up by diff --git a/docs/en/rst/using/tips.rst b/docs/en/rst/using/tips.rst index 34274f728..53516a854 100644 --- a/docs/en/rst/using/tips.rst +++ b/docs/en/rst/using/tips.rst @@ -13,8 +13,8 @@ Bugzilla comments are plain text - so typing will produce less-than, U, greater-than rather than underlined text. However, Bugzilla will automatically make hyperlinks out of certain sorts of text in comments. For example, the text -``http://www.bugzilla.org`` will be turned into a link: -``_. +``https://www.bugzilla.org`` will be turned into a link: +``_. Other strings which get linkified in the obvious manner are: + bug 12345 diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index 0c742c7f1..29eb40244 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -83,31 +83,19 @@ function onSubmit() { [% INCLUDE product icon = "firefox" name = "Firefox Support" - url = "http://support.mozilla.com/" + url = "https://support.mozilla.org/" desc = "Support for the Firefox web browser." %] - [% INCLUDE product - icon = "firefox" - name = "Firefox for Mobile Support" - url = "http://support.mozilla.com/mobile" - desc = "Support for the Firefox Mobile web browser." - %] [% INCLUDE product icon = "thunderbird" name = "Thunderbird Support" - url = "http://www.mozillamessaging.com/support/" + url = "https://support.mozilla.org/products/thunderbird" desc = "Support for Thunderbird email client." %] - [% INCLUDE product - icon = "other" - name = "Support for other products" - url = "http://www.mozilla.org/projects/" - desc = "Support for products not listed here." - %] [% INCLUDE product icon = "input" name = "Feedback" - url = "http://input.mozilla.com/feedback" + url = "https://input.mozilla.org/feedback" desc = "Report issues with a web site that you use, or provide quick feedback for Firefox." %] @@ -125,7 +113,7 @@ function onSubmit() {
  1. Please read our - [% terms.Bug %] Writing Guidelines. + [% terms.Bug %] Writing Guidelines.
  2. [% terms.Bugzilla %] is a public place. Your comments and other activities diff --git a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl index 333bf634a..5d9d20be8 100644 --- a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl @@ -157,7 +157,7 @@ function validateAndSubmit() { How was this issue discovered, include the steps, tools, Firefox version, operating system version, or other information that will help reproduce and diagnose the issue. A good primer on what to include can be found - here. + here. diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl index 0ee909005..ed4b795b7 100644 --- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl @@ -155,7 +155,7 @@ function validateAndSubmit() { multiple => 5 %]
    - List of common topic experts diff --git a/extensions/BMO/template/en/default/bug/create/create-ipc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-ipc.html.tmpl index 7be2214b2..e32ba62dc 100644 --- a/extensions/BMO/template/en/default/bug/create/create-ipc.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-ipc.html.tmpl @@ -167,7 +167,7 @@ $(document).ready(function() {

    - If you would like your snippet to include a link, please tag it by using the URL builder (http://bit.ly/1JOgDr1) and following the steps below: + If you would like your snippet to include a link, please tag it by using the URL builder (https://bit.ly/1JOgDr1) and following the steps below:



    @@ -180,7 +180,7 @@ $(document).ready(function() {

    - Please reference the Mozilla In-Product Messaging Calendar for available dates. http://bit.ly/2aZ3w9c + Please reference the Mozilla In-Product Messaging Calendar for available dates. https://bit.ly/2aZ3w9c

    @@ -207,7 +207,7 @@ $(document).ready(function() {
    Will you be able to provide the following assets for your snippet? Check all that apply.
    Feel free to look at our existing icon library: - http://bit.ly/2efXaFo + https://bit.ly/2efXaFo

    diff --git a/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl index f4dcede93..d6243c73b 100644 --- a/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-poweredby.html.tmpl @@ -29,7 +29,7 @@ [% USE Bugzilla %] -

    If you are interested in using the Powered by Mozilla logo, +

    If you are interested in using the Powered by Mozilla logo, please provide some information about your application or product.

    Please use this form for Powered by Mozilla logo requests only.

    diff --git a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl index 977ad00d4..90da895b2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl @@ -31,7 +31,7 @@

    If, after reading - the trademark policy + the trademark policy documents, you know you need permission to use a certain trademark, this is the place to be.

    diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl index 0be58f813..2446bbd2b 100644 --- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl @@ -88,7 +88,7 @@ function validateAndSubmit() {
    - + [% terms.Bug %] writing guidelines
    @@ -106,7 +106,7 @@ function validateAndSubmit() {
    How was this issue discovered, include the steps, tools or other information that will help reproduce and diagnose the issue. A good primer on what to include can - be found here. + be found here.
    diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl index e01ac4845..6ecd0bc75 100644 --- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl @@ -17,7 +17,7 @@ [% END +%] [% UNLESS no_bug_guidelines %] Before reporting a [% terms.bug %], make sure you've read our - + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already been reported. Consult our list of most frequently reported [% terms.bugs %] and diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl index ac545d14e..5f46c31e1 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -50,7 +50,7 @@

    Looking for technical support or help getting your site to work with Mozilla? - Visit the mozilla.org support page + Visit the mozilla.org support page before filing [% terms.bugs %].

    diff --git a/extensions/BMO/template/en/default/hook/attachment/createformcontents-patch_notes.html.tmpl b/extensions/BMO/template/en/default/hook/attachment/createformcontents-patch_notes.html.tmpl index ea80fdc5e..92b29667b 100644 --- a/extensions/BMO/template/en/default/hook/attachment/createformcontents-patch_notes.html.tmpl +++ b/extensions/BMO/template/en/default/hook/attachment/createformcontents-patch_notes.html.tmpl @@ -1 +1 @@ -You can read about the patch submission and approval process.
    +You can read about the patch submission and approval process.
    diff --git a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl index 346e02373..d527f76a4 100644 --- a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl @@ -23,7 +23,7 @@ [% IF (group == "canconfirm" OR group == "editbugs") AND !reason %]

    If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %], - find + find out how to get the necessary permissions.

    [% END %] diff --git a/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl b/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl index 21ed3b040..e1c67605f 100644 --- a/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl +++ b/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl @@ -7,5 +7,5 @@ #%] [% PROCESS global/redirect.html.tmpl - url = "https://developer.mozilla.org/en/Bug_writing_guidelines" + url = "https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines" %] diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl index 2c25cb5e9..6e62f4762 100644 --- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl +++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl @@ -173,7 +173,7 @@

    See Also

    - The [% terms.Bug %] Writing Guidelines. + The [% terms.Bug %] Writing Guidelines.

    [% INCLUDE global/footer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl b/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl index 8fa944ae6..9e6d72d66 100644 --- a/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl +++ b/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl @@ -52,7 +52,7 @@
  3. New attachment details UI.
  4. New icons for the front page.
  5. Removal of unused "Patches" column from buglist.
    6. -
  6. Initial support for Strict-Transport-Security (STS) header.
    7. +
  7. Initial support for Strict-Transport-Security (STS) header.

    8. General Usability Improvements

    @@ -121,7 +121,7 @@ jsonrpc.cgi. The JSON-RPC interface is experimental in this release--if you want any fundamental changes in how it works, - let us + let us know, for the next release of [% terms.Bugzilla %].

    New Features

    diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index d850c91b2..c0a8674a8 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -96,7 +96,7 @@ [% IF incomplete_data %]

    - There used to be an issue in Bugzilla + There used to be an issue in Bugzilla which caused activity data to be lost if there were a large number of cc's or dependencies. That has been fixed, but some data was already lost in your activity table that could not be regenerated. The changes that diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl index e4b0b44a8..6d3d6ddd8 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl @@ -236,27 +236,27 @@ Other Mozilla products which aren't listed here

    -
    - I need technical support
    + I need technical support
    For technical support or help getting your site to work with Mozilla.
    -
    - Offer us ideas on how to make Firefox better
    - Provide feedback about Firefox
    + Offer us ideas on how to make Firefox better
    + Provide feedback about Firefox
    @@ -268,7 +268,7 @@ Other Mozilla products which aren't listed here Report an issue with Firefox on a site that I've developed
    - Report an issue with a web site that I use
    + Report an issue with a web site that I use
    @@ -357,7 +357,7 @@ Product: ?:
    • Please fill out this form clearly, precisely and in as much detail as you can manage.
    • Please report only a single problem at a time.
      • -
    • These guidelines +
    • These guidelines explain how to write effective [% terms.bug %] reports.
    diff --git a/extensions/GuidedBugEntry/web/js/products.js b/extensions/GuidedBugEntry/web/js/products.js index 19ff01fec..8ef1ea0c0 100644 --- a/extensions/GuidedBugEntry/web/js/products.js +++ b/extensions/GuidedBugEntry/web/js/products.js @@ -46,7 +46,7 @@ var products = { l10n: true, support: 'If you are new to Firefox or Bugzilla, please consider checking ' + - '' + + '' + '' + ' Firefox Help instead of creating a bug.' }, @@ -57,7 +57,7 @@ var products = { l10n: true, support: 'If you are new to Firefox or Bugzilla, please consider checking ' + - '' + + '' + '' + ' Firefox Help instead of creating a bug.' }, @@ -122,12 +122,12 @@ var products = { "Bugzilla": { support: - 'Please use Bugzilla Landfill to file "test bugs".' + 'Please use Bugzilla Landfill to file "test bugs".' }, "bugzilla.mozilla.org": { related: [ "Bugzilla" ], support: - 'Please use Bugzilla Landfill to file "test bugs".' + 'Please use Bugzilla Landfill to file "test bugs".' } }; diff --git a/extensions/MozReview/template/en/default/hook/attachment/create-before_form.html.tmpl b/extensions/MozReview/template/en/default/hook/attachment/create-before_form.html.tmpl index 0bf6fe543..bfa842c89 100644 --- a/extensions/MozReview/template/en/default/hook/attachment/create-before_form.html.tmpl +++ b/extensions/MozReview/template/en/default/hook/attachment/create-before_form.html.tmpl @@ -12,6 +12,6 @@ Are you attaching a patch? Consider trying out MozReview, Mozilla's new repository-based code-review tool. - Read + Read the docs to get started. diff --git a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl index 9cc72e717..c0f382e93 100644 --- a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl +++ b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl @@ -219,7 +219,7 @@ diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl index e6ef02927..380d1c04e 100644 --- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl +++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl @@ -95,7 +95,7 @@ If you already have your own PGP key in a keyring, skip straight to step 3. Othe
      -
    1. Install the GPG suite of utilities for your operating system, either using your package manager or downloaded from gnupg.org.

      +
    2. Install the GPG suite of utilities for your operating system, either using your package manager or downloaded from gnupg.org.

    3. Generate a private key.

      @@ -123,7 +123,7 @@ You’ll have to answer several questions:

    -Further reading: GPG Quickstart. +Further reading: GPG Quickstart. [% PROCESS global/footer.html.tmpl %] diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl index df5dd75ce..f42c579e4 100644 --- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl +++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl @@ -108,7 +108,7 @@ diff --git a/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl index dac513e56..267366d5a 100644 --- a/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl +++ b/extensions/Splinter/template/en/default/pages/splinter/help.html.tmpl @@ -125,7 +125,7 @@ [%+ terms.Bugzilla %], as long as they are well-formatted patches. If you are using Git for version control, you can either format changes as patches - using 'git + using 'git format-patch and attach them manually to the [% terms.bug %], or you can use git-bz. diff --git a/extensions/UserProfile/template/en/default/pages/user_profile.html.tmpl b/extensions/UserProfile/template/en/default/pages/user_profile.html.tmpl index ef0605725..27cb825ed 100644 --- a/extensions/UserProfile/template/en/default/pages/user_profile.html.tmpl +++ b/extensions/UserProfile/template/en/default/pages/user_profile.html.tmpl @@ -51,7 +51,7 @@ [% IF user.gravatar %]
    [% IF target.id == user.id %] - Change my image + Change my image [% END %] [% ELSE %]   diff --git a/qa/t/lib/QA/Tests.pm b/qa/t/lib/QA/Tests.pm index 0bd0942fa..89d382050 100644 --- a/qa/t/lib/QA/Tests.pm +++ b/qa/t/lib/QA/Tests.pm @@ -39,7 +39,7 @@ use constant CREATE_BUG => { 'severity' => 'normal', 'qa_contact' => 'canconfirm', version => 'Another1', - url => 'http://www.bugzilla.org/', + url => 'https://www.bugzilla.org/', target_milestone => 'AnotherMS1', }; diff --git a/qa/t/webservice_bug_get.t b/qa/t/webservice_bug_get.t index 88cc42989..91de410c1 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", - "http://landfill.bugzilla.org/show_bug.cgi?id=123456"] }, + "https://landfill.bugzilla.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", - "http://landfill.bugzilla.org/show_bug.cgi?id=123456"]; + "https://landfill.bugzilla.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_group_create.t b/qa/t/webservice_group_create.t index 9ddf43d86..e2c0a725d 100644 --- a/qa/t/webservice_group_create.t +++ b/qa/t/webservice_group_create.t @@ -88,7 +88,7 @@ foreach my $rpc ($xmlrpc, $jsonrpc) { { user => 'admin', args => { name => random_string(20), description => DESCRIPTION, user_regexp => '\@foo.com$', is_active => 1, - icon_url => 'http://www.bugzilla.org/favicon.ico' }, + icon_url => 'https://www.bugzilla.org/favicon.ico' }, test => 'Passing all arguments works', }, ); diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 6cd13a49d..a23c602ae 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -26,7 +26,7 @@ [% sts_desc = BLOCK %] Enables the sending of the - Strict-Transport-Security + Strict-Transport-Security header along with HTTP responses on SSL connections. This adds greater security to your SSL connections by forcing the browser to always access your domain over SSL and never accept an invalid certificate. diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl index 4cf22d508..d5e9df7f5 100644 --- a/template/en/default/admin/params/dependencygraph.html.tmpl +++ b/template/en/default/admin/params/dependencygraph.html.tmpl @@ -29,7 +29,7 @@

    • A complete file path to 'dot' (part of - GraphViz) will + GraphViz) will generate the graphs locally.
    • diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 14fba5866..838bff7ef 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -95,7 +95,7 @@
      Note: B[% %]ugzilla is developed entirely by volunteers. The best way to give back to the B[% %]ugzilla project is to - contribute + contribute yourself! You don't have to be a programmer to contribute, there are lots of things that we need. diff --git a/template/en/default/admin/params/patchviewer.html.tmpl b/template/en/default/admin/params/patchviewer.html.tmpl index 389acc1b5..41f7f9e6b 100644 --- a/template/en/default/admin/params/patchviewer.html.tmpl +++ b/template/en/default/admin/params/patchviewer.html.tmpl @@ -43,14 +43,14 @@ "faster). Make this the same as cvsroot if you don't " _ "understand what this is (if cvsroot is blank, make this blank too).", - bonsai_url => "The URL to a Bonsai " _ + bonsai_url => "The URL to a Bonsai " _ "server containing information about your CVS repository. " _ "Patch Viewer will use this information to create links to " _ "bonsai's blame for each section of a patch (it will append " _ "'/cvsblame.cgi?...' to this url). Leave this blank if you " _ "don't understand what this is.", - lxr_url => "The URL to an LXR server " _ + lxr_url => "The URL to an LXR server " _ "that indexes your CVS repository. Patch Viewer will use this " _ "information to create links to LXR for each file in a patch. " _ "Leave this blank if you don't understand what this is.", diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 8098d89b2..50193f894 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -40,7 +40,7 @@ [% IF incomplete_data %]

      - There used to be an issue in Bugzilla + There used to be an issue in Bugzilla which caused activity data to be lost if there were a large number of cc's or dependencies. That has been fixed, but some data was already lost in your activity table that could not be regenerated. The changes that the diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 43437bcd7..ee40890cb 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -265,7 +265,7 @@ function PutDescription() { URL that demonstrates the problem you are seeing (optional).
      IMPORTANT: if the problem is with a broken web page, you need to report it - a different way. + a different way.

      @@ -418,7 +418,7 @@ function PutDescription() { into your URL bar.

      - If you are reporting a crash, please try and get a stack trace, which tells us exactly where things went wrong.

      diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index ac2cc29df..fa42ace81 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -30,7 +30,7 @@ [% PROCESS global/variables.none.tmpl %] Before reporting [% terms.abug %], please read the - + [% terms.bug %] writing guidelines, please look at the list of most frequently reported [% terms.bugs %], and please search for the [% terms.bug %]. diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index fc75d4a3d..f508cba31 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -27,7 +27,7 @@

      Create New [% terms.Bug %]

      Before reporting a [% terms.bug %], make sure you've read our - + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already been reported. Consult our list of most frequently reported [% terms.bugs %] and diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 4e56caa7f..f7a0e900b 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -75,7 +75,7 @@ [%- terms.Bugzilla %] Etiquette

    • - | [%- terms.Bug %] Writing Guidelines + | [%- terms.Bug %] Writing Guidelines
      • [% Hook.process('additional_links') %]
    diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 7e1ba15d9..6e639d86d 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -56,13 +56,13 @@

    4.2.11

    This release fixes several security issues. See the - Security Advisory + Security Advisory for details.

    4.2.10

    This release fixes one security issue. See the - Security Advisory + Security Advisory for details.

    4.2.9

    @@ -75,7 +75,7 @@

    4.2.8

    This release fixes one minor security issue. See the - Security Advisory + Security Advisory for details.

    In addition, the following [% terms.bugs %] have been fixed in this release:

    @@ -106,7 +106,7 @@

    4.2.7

    This release fixes several security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following [% terms.bugs %] have been fixed in this release:

    @@ -161,7 +161,7 @@

    4.2.5

    This release fixes one security issue. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -194,7 +194,7 @@

    4.2.4

    This release fixes several security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -241,7 +241,7 @@

    4.2.3

    This release fixes two security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -279,7 +279,7 @@

    4.2.2

    This release fixes two security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -321,7 +321,7 @@

    4.2.1

    This release fixes two security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -714,9 +714,9 @@ version's release notes.

    We would like to thank - ITA Software, - the IBM Linux Technology Center, - and Red Hat for funding the development + ITA Software, + the IBM Linux Technology Center, + and Red Hat for funding the development of certain features and improvements in this release of [%+ terms.Bugzilla %].

    @@ -725,7 +725,7 @@

    4.0.2

    This release fixes several security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in this @@ -1090,7 +1090,7 @@

    New Advanced Search UI

    -

    Thanks to the UI work of Guy +

    Thanks to the UI work of Guy Pyrzak, the Advanced Search UI has been completely redesigned. It is now much simpler, and far more approachable for new users, while still retaining all of the features that power users are used to.

    @@ -1103,7 +1103,7 @@ width to be used when doing code reviews or editing an attachment as a comment.

    -

    Thanks to Guy Pyrzak for +

    Thanks to Guy Pyrzak for his excellent work on this UI redesign.

    Autocomplete for Users and Keywords

    @@ -1157,7 +1157,7 @@

    For more information about the workflow and our rationale for changing it, see the - blog + blog post about it and the [% terms.bug %] where the change was made.

    @@ -1181,7 +1181,7 @@

    [% terms.Bugzilla %] now supports making WebService calls from another domain, inside of a web browser, thanks to support for - JSONP. + JSONP. This will allow for web "mash-ups" to use [% terms.Bugzilla %] data. When using JSONP, you may only call functions that get data, you may not call functions that change data.

    @@ -1398,7 +1398,7 @@
  8. When you are using SSL with [% terms.Bugzilla %], you can now turn on the strict_transport_security parameter to send the - Strict-Transport-Security + Strict-Transport-Security header with every HTTPS connection, for additional security.
  9. New code hooks (see their documentation in Bugzilla::Hook): @@ -1417,7 +1417,7 @@ You can see more information about running this test by doing perldoc xt/search.t at the command line.
  10. [% terms.Bugzilla %] now sends the - X-Frame-Options: SAMEORIGIN header + X-Frame-Options: SAMEORIGIN header with every page request in order to prevent "clickjacking" attacks. Note that this prevents other domains from displaying [% terms.Bugzilla %] in an HTML frame.
    11. diff --git a/template/en/default/pages/release-notes3.html.tmpl b/template/en/default/pages/release-notes3.html.tmpl index 79f0528ed..2f37f8017 100644 --- a/template/en/default/pages/release-notes3.html.tmpl +++ b/template/en/default/pages/release-notes3.html.tmpl @@ -57,11 +57,11 @@ and this one, particularly the Upgrading section of each version's release notes.

    -

    We would like to thank Canonical - Ltd., ITA Software, - the IBM Linux Technology Center, - Red Hat, and - Novell for funding the development +

    We would like to thank Canonical + Ltd., ITA Software, + the IBM Linux Technology Center, + Red Hat, and + Novell for funding the development of various features and improvements in this release of [%+ terms.Bugzilla %].

    @@ -70,7 +70,7 @@

    3.6.2

    This release fixes various security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in @@ -128,7 +128,7 @@

    3.6.1

    This release fixes two security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in @@ -563,7 +563,7 @@ jsonrpc.cgi. The JSON-RPC interface is experimental in this release--if you want any fundamental changes in how it works, - let us + let us know, for the next release of [% terms.Bugzilla %].

    Migration From Other [% terms.Bug %]-Trackers

    @@ -592,10 +592,10 @@

    The first migrator that has been implemented is for the GNATS [%+ terms.bug %]-tracking system. We'd love to see migrators for other systems! If you want to contribute a new migrator, see our - development + development process for details on how to get code into [% terms.Bugzilla %].

    -

    Thanks to Lambda Research for +

    Thanks to Lambda Research for funding the initial development of this feature.

    Other Enhancements and Changes

    @@ -935,10 +935,10 @@ and this one, particularly the Upgrading section of each version's release notes.

    -

    We would like to thank Canonical +

    We would like to thank Canonical Ltd. for funding development of one new feature, and NASA for funding development of several new features through the - San Jose State University + San Jose State University Foundation.

    Updates In This 3.4.x Release

    @@ -992,7 +992,7 @@

    3.4.5

    This release contains fixes for multiple security issues. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in @@ -1027,7 +1027,7 @@

    3.4.4

    This release contains a fix for a security issue. See the - Security Advisory + Security Advisory for details.

    Additionally, this release fixes a few minor [% terms.bugs %].

    @@ -1070,7 +1070,7 @@

    This release contains fixes for multiple security issues, one of which is highly critical. See the - Security Advisory + Security Advisory for details.

    In addition, the following important fixes/changes have been made in @@ -1121,7 +1121,7 @@

    3.4.1

    This release contains an important security fix. See the - Security Advisory + Security Advisory for details.

    Minimum Requirements

    @@ -1468,7 +1468,7 @@ [%+ terms.bugs %] in any [% terms.Bugzilla %] installation, to indicate that those [% terms.bugs %] are related to this one. It also supports adding URLs to [% terms.bugs %] in - Launchpad.

    + Launchpad.

    Right now, the field just validates the URLs and then displays them, but in the future, it will grab information from the other installation about @@ -1749,7 +1749,7 @@ releases of [% terms.Bugzilla %] after 3.2. We only list the most important fixes in each release. If you want a detailed list of everything that's changed in each version, you should use our - Change Log + Change Log Page.

    3.2.3

    @@ -1785,7 +1785,7 @@

    This release fixes one security issue that is critical for installations running 3.2.1 under mod_perl. See the - Security Advisory + Security Advisory for details.

    3.2.1

    @@ -1827,14 +1827,14 @@

    3.2.3

    This release fixes one security issue related to attachments. See the - Security Advisory + Security Advisory for details.

    3.2.2

    This release fixes one security issue that is critical for installations running 3.2.1 under mod_perl. See the - Security Advisory + Security Advisory for details.

    3.2.1

    @@ -1842,7 +1842,7 @@

    This release contains several security fixes. One fix may break any automated scripts you have that are loading process_bug.cgi directly. We recommend that you read the entire - Security Advisory + Security Advisory for this release.

    Minimum Requirements

    @@ -2035,7 +2035,7 @@

    [% terms.Bugzilla %] 3.2 has had some UI assistance from the NASA Human-Computer Interaction department and the new - [% terms.Bugzilla %] + [% terms.Bugzilla %] User Interface Team.

    In particular, you will notice a massively redesigned [% terms.bug %] @@ -2053,7 +2053,7 @@

    The changes that [% terms.Bugzilla %] required for Dusk made [%+ terms.Bugzilla %] much easier to skin. See the - Addons page + Addons page for additional skins, or try making your own!

    Custom Status Workflow

    @@ -2436,7 +2436,7 @@ releases of [% terms.Bugzilla %] after 3.0. We only list the most important fixes in each release. If you want a detailed list of everything that's changed in each version, you should use our - Change Log Page.

    + Change Log Page.

    3.0.6

    @@ -3203,20 +3203,20 @@

    3.0.6

    [% terms.Bugzilla %] contains a minor security fix. For details, see the - Security Advisory.

    + Security Advisory.

    3.0.5

    [% terms.Bugzilla %] contains one security fix for importxml.pl. For details, see the - Security Advisory.

    + Security Advisory.

    3.0.4

    [% terms.Bugzilla %] 3.0.4 contains three security fixes. For details, see the - Security Advisory.

    + Security Advisory.

    3.0.3

    @@ -3227,7 +3227,7 @@

    [% terms.Bugzilla %] 3.0.1 had an important security fix that is critical for public installations with "requirelogin" turned on. For details, see the - Security Advisory

    + Security Advisory

    3.0.1

    @@ -3235,7 +3235,7 @@ fixed in this release: one minor information leak, one hole only exploitable by an admin or using email_in.pl, and one in an uncommonly-used template. For details, see the - Security Advisory.

    + Security Advisory.

    How to Upgrade From An Older Version

    @@ -3312,11 +3312,11 @@

    This gives [% terms.Bugzilla %] very advanced plugin support. You can hook templates, hook code, add new parameters, and use the XML-RPC interface. So we'd like to see some [% terms.Bugzilla %] plugins - written! Let us know on the developers@bugzilla.org + written! Let us know on the developers@bugzilla.org mailing list if you write a plugin.

    If you need more hooks, please - File a bug!

    + File a bug!

    API Documentation

    @@ -3357,7 +3357,7 @@ sub y { $var++ }

    For more information about how to use DBI with [%+ terms.Bugzilla %], see the - Developer's + Developer's Guide Section About DBI

    Auth Re-write

    diff --git a/template/en/default/search/search-google.html.tmpl b/template/en/default/search/search-google.html.tmpl index f363248a5..ad45cce94 100644 --- a/template/en/default/search/search-google.html.tmpl +++ b/template/en/default/search/search-google.html.tmpl @@ -15,7 +15,7 @@ [% WRAPPER search/tabs.html.tmpl %]

    - Use the Google search engine to search + Use the Google search engine to search for [% terms.Bugzilla +%] [%+ terms.bugs %]. Find the [% terms.bugs %] you are looking for by entering words that best describe it.

    diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 2e1a18f00..9a8e3b9d1 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -343,7 +343,7 @@ END

    For more information on how to install Bugzilla, please - read the documentation + read the documentation available on the official Bugzilla website.

    -- cgit v1.2.3-24-g4f1b