Bug 1417980 - Fix non-HTTPS links and outdated links where possible

15 files changed, 22 insertions, 34 deletions

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."
   %]
   </table>
@@ -125,7 +113,7 @@ function onSubmit() {
     <ol>
     <li>
       Please read our
-      <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">[% terms.Bug %] Writing Guidelines</a>.
+      <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines" target="_blank">[% terms.Bug %] Writing Guidelines</a>.
     </li>
     <li>
       [% 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
-    <a href="https://developer.mozilla.org/en-US/docs/Mozilla/QA">here</a>.
+    <a href="https://developer.mozilla.org/docs/Mozilla/QA">here</a>.
   </div>
   <textarea required id="comment" name="comment" cols="80" rows="5"></textarea>
 </div>
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
      %]
      <br>
-     <a href="https://developer.mozilla.org/en-US/docs/Project:Subject-matter_experts"
+     <a href="https://developer.mozilla.org/docs/Project:Subject-matter_experts"
         target="_blank" id="common_topic_experts">
        List of common topic experts</a>
   </td>
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() {
     </div>
 
     <p>
-    If you would like your snippet to include a link, please tag it by using the URL builder <a href="http://bit.ly/1JOgDr1">(http://bit.ly/1JOgDr1)</a> and following the steps below:
+    If you would like your snippet to include a link, please tag it by using the URL builder <a href="https://bit.ly/1JOgDr1">(https://bit.ly/1JOgDr1)</a> and following the steps below:
     </p>
     <img src="extensions/BMO/web/images/ipc_form_buildscreen.png" style = "width:50%"><br><br>
     <div class="row">
@@ -180,7 +180,7 @@ $(document).ready(function() {
     </div>
 
     <p>
-    Please reference the Mozilla In-Product Messaging Calendar for available dates. <a href="http://bit.ly/2aZ3w9c"> http://bit.ly/2aZ3w9c</a>
+    Please reference the Mozilla In-Product Messaging Calendar for available dates. <a href="https://bit.ly/2aZ3w9c"> https://bit.ly/2aZ3w9c</a>
     </p>
 
     <div class="row">
@@ -207,7 +207,7 @@ $(document).ready(function() {
       <div class="row_desc">
         <strong>Will you be able to provide the following assets for your snippet? Check all that apply.</strong><br>
         Feel free to look at our existing icon library:
-        <a href="http://bit.ly/2efXaFo">http://bit.ly/2efXaFo</a>
+        <a href="https://bit.ly/2efXaFo">https://bit.ly/2efXaFo</a>
       </div>
       <input type="checkbox" name="snippet_assets" id="copy" value="Copy">
       <label for="copy">Copy</label><br>
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 %]
 
-<p>If you are interested in using the <a href="http://www.mozilla.org/poweredby">Powered by Mozilla logo</a>,
+<p>If you are interested in using the <a href="https://www.mozilla.org/about/powered-by/">Powered by Mozilla logo</a>,
 please provide some information about your application or product.</p>
 
 <p><strong>Please use this form for Powered by Mozilla logo requests only.</strong></p>
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 @@
 
 <p>
   If, after reading 
-  <a href="http://www.mozilla.org/foundation/trademarks/">the trademark policy
+  <a href="https://www.mozilla.org/foundation/trademarks/">the trademark policy
   documents</a>, you know you need permission to use a certain trademark, this
   is the place to be.
 </p>
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() {
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <div class="head_desc">
-  <a href="https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines?redirectlocale=en-US&redirectslug=Bug_writing_guidelines">
+  <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines">
     [% terms.Bug %] writing guidelines</a>
 </div>
 
@@ -106,7 +106,7 @@ function validateAndSubmit() {
   <div class="field_desc">
     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 <a href="https://developer.mozilla.org/en-US/docs/Mozilla/QA">here</a>.
+    be found <a href="https://developer.mozilla.org/docs/Mozilla/QA">here</a>.
   </div>
   <textarea id="comment" name="comment" cols="80" rows="5"></textarea>
 </div>
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
-    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines">
+    <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines">
     [% terms.bug %] writing guidelines</a> and double checked that your [% terms.bug %] hasn't already
     been reported. Consult our list of <a href="https://bugzilla.mozilla.org/duplicates.cgi">
     most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
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 @@
 <hr>
 <p>
   Looking for technical support or help getting your site to work with Mozilla?
-  <a href="http://www.mozilla.org/support/">Visit the mozilla.org support page</a>
+  <a href="https://support.mozilla.org/">Visit the mozilla.org support page</a>
   before filing [% terms.bugs %].
 </p>
 <hr>
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 @@
-<em>You can <a href="http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree">read about the patch submission and approval process</a>.</em><br>
+<em>You can <a href="https://developer.mozilla.org/docs/Mozilla/Developer_guide/How_to_Submit_a_Patch">read about the patch submission and approval process</a>.</em><br>
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 %]
   <p>
     If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %],
-    <a href="http://www.gerv.net/hacking/before-you-mail-gerv.html#bugzilla-permissions">find
+    <a href="page.cgi?id=get_permissions.html">find
     out how to get the necessary permissions</a>.
   </p>
 [% 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 @@
 <h2>See Also</h2>
 
 <p>
-  <a href="page.cgi?id=bug-writing.html">The [% terms.Bug %] Writing Guidelines</a>.
+  <a href="https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines">The [% terms.Bug %] Writing Guidelines</a>.
 </p>
 
 [% 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 @@
   <li>New attachment details UI.</li>
   <li>New icons for the front page.</li>
   <li>Removal of unused "Patches" column from buglist.</li>
-  <li>Initial support for <a href="http://en.wikipedia.org/wiki/Strict_Transport_Security">Strict-Transport-Security</a> (STS) header.</li>
+  <li>Initial support for <a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">Strict-Transport-Security</a> (STS) header.</li>
 </ul>
 
 <h4>General Usability Improvements</h4>
@@ -121,7 +121,7 @@
   <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Server/JSONRPC.html">jsonrpc.cgi</a>.
   The JSON-RPC interface is experimental in this release--if you want any
   fundamental changes in how it works,
-  <a href="http://www.bugzilla.org/developers/reporting_bugs.html">let us
+  <a href="https://www.bugzilla.org/developers/reporting_bugs.html">let us
   know</a>, for the next release of [% terms.Bugzilla %].</p>
 
 <h3>New Features</h3>
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 %]
   <p>
-    There used to be an issue in <a href="http://www.bugzilla.org/">Bugzilla</a>
+    There used to be an issue in <a href="https://www.bugzilla.org/">Bugzilla</a>
     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