From 736c40e85e5626ec44d97c56e856350853565cab Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 28 Oct 2010 19:16:16 -0500
Subject: Convert a bunch of links to HTTPS

Now that the wiki is HTTPS for the most part, we should skip the redirects
and link directly. Also switch some www links for mailman resources to the
mailman subdomain.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/base.html            |  8 ++++----
 templates/mirrors/index.html   |  2 +-
 templates/packages/search.html |  2 +-
 templates/public/art.html      |  2 +-
 templates/public/download.html |  6 +++---
 templates/public/feeds.html    |  4 ++--
 templates/public/index.html    | 22 +++++++++++-----------
 templates/public/svn.html      |  5 +++--
 8 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index bc3ada6a..c7b26a9e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -20,7 +20,7 @@
                 <li id="anb-home"><a href="/" title="Arch news, packages, projects and more">Home</a></li>
                 <li id="anb-packages"><a href="/packages/" title="Arch Package Database">Packages</a></li>
                 <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
-                <li id="anb-wiki"><a href="http://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+                <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
                 <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
                 <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
                 <li id="anb-download"><a href="{% url page-download as pdl %}{{ pdl }}" title="Get Arch Linux">Download</a></li>
@@ -33,14 +33,14 @@
             {% if user.is_authenticated %}
                 <ul>
                     <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li>
-                    <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+                    <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
                         title="Developer HOWTOs and documentation">DevWiki</a></li>
                     <li><a href="http://projects.archlinux.org/" title="Git Projects">Projects</a></li>
                     <li><a href="{% url news-list as newsl %}{{ newsl }}" title="Manage news articles">News</a></li>
                     <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li>
                     <li><a href="/todo/" title="Developer todo lists">Todos</a></li>
                     <li><a href="/packages/differences/" title="Package architecture differences">Arch Differences</a></li>
-                    <li><a href="http://www.archlinux.org/mailman/private/arch-dev/"
+                    <li><a href="https://mailman.archlinux.org/mailman/private/arch-dev/"
                         title="arch-dev mailing list archives">Archives</a></li>
                     <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
                     <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
@@ -75,7 +75,7 @@
                 title="Contact Aaron Griffin">Aaron Griffin</a>.</p>
 
             <p>The Arch Linux name and logo are recognized
-            <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+            <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
                 title="Arch Linux Trademark Policy">trademarks</a>. Some rights reserved.</p>
 
             <p>The registered trademark Linux® is used pursuant to a sublicense from LMI,
diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
index 1d620b14..49907b8f 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -28,7 +28,7 @@
     <h3>Customized by country mirrorlist</h3>
 
     <p>The following form can generate a custom up-to-date
-    <a href="http://wiki.archlinux.org/index.php/Pacman"
+    <a href="https://wiki.archlinux.org/index.php/Pacman"
         title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
     desired protocol(s).  Simply replace the contents of
     <code>/etc/pacman.d/mirrorlist</code> with your generated list.
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 38bd5664..c3f70fa6 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -155,7 +155,7 @@
 <div id="pkglist-about" class="box">
     <p>You are browsing the Arch Linux package database. From here you can find
     detailed information about packages located in the official supported repositories.
-    For unsupported packages, browse the <a href="http://aur.archlinux.org/"
+    For unsupported packages, browse the <a href="https://aur.archlinux.org/"
         title="AUR package database">Arch User Repository (AUR).</a></p>
 </div>
 
diff --git a/templates/public/art.html b/templates/public/art.html
index 86c7f589..1556b774 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -11,7 +11,7 @@
     <h3>Logos for Press Usage</h3>
 
     <p>The following Arch Linux logos are available for press and other use, subject to
-    the restrictions of our <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+    the restrictions of our <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
         title="Arch Linux Trademark Policy">trademark policy</a>.</p>
 
     <p><strong>Two-color standard version</strong><br />
diff --git a/templates/public/download.html b/templates/public/download.html
index d4a33db3..8a1a902e 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -24,7 +24,7 @@
             <ul>
                 <li><a href="https://bugs.archlinux.org/index.php?project=6"
                     title="Arch Linux Bugtracker:Release Engineering">Bug Tracker</a></li>
-                <li><a href="http://www.archlinux.org/mailman/listinfo/arch-releng"
+                <li><a href="http://mailman.archlinux.org/mailman/listinfo/arch-releng"
                     title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
             </ul>
         </li>
@@ -35,7 +35,7 @@
     <ul id="download-help">
         <li><a href="http://www.archlinux.org/iso/{{ version }}/README"
             title="Official download instructions">Readme and Instructions</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide" 
+        <li><a href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
             title="Official Installation Guide">Arch Linux Install Guide</a></li>
     </ul>
 
@@ -163,7 +163,7 @@
     {% endcache %}
 
     <p>If you want to become an Official Arch Linux Mirror please follow the
-    instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
+    instructions listed <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
 
 </div>
 {% endblock %}
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index de86f7eb..0f80e1c2 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -15,9 +15,9 @@
     <p>Grab the <a href="/feeds/news/" class="rss" title="Arch Linux News feed">news item feed</a>
     to keep up-to-date with the latest news from the Arch Linux development staff.</p>
 
-    <p>The <a href="http://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
+    <p>The <a href="https://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
     title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a>
-    is also available to track document changes from the <a href="http://wiki.archlinux.org/"
+    is also available to track document changes from the <a href="https://wiki.archlinux.org/"
     title="Arch Wiki community documentation">Arch Wiki</a>.</p>
 
     <h3>Package Feeds</h3>
diff --git a/templates/public/index.html b/templates/public/index.html
index d593e922..c060449c 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -27,8 +27,8 @@
     <p>Our strong community is diverse and helpful, and we pride ourselves
     on the range of skillsets and uses for Arch that stem from it. Please
     check out our <a href="https://bbs.archlinux.org" title="Arch Forums">forums</a>
-    and <a href="http://www.archlinux.org/mailman/listinfo/" title="Arch Mailing Lists">mailing lists</a>
-    to get your feet wet.  Also glance through our <a href="http://wiki.archlinux.org" title="Arch Wiki">wiki</a>
+    and <a href="http://mailman.archlinux.org/mailman/listinfo/" title="Arch Mailing Lists">mailing lists</a>
+    to get your feet wet.  Also glance through our <a href="https://wiki.archlinux.org" title="Arch Wiki">wiki</a>
     if you want to learn more about Arch.</p>
 
     <p class="readmore"><a href="{% url page-about %}"
@@ -96,11 +96,11 @@
     <h4>Documentation</h4>
 
     <ul>
-        <li><a href="http://wiki.archlinux.org/"
+        <li><a href="https://wiki.archlinux.org/"
             title="Community documentation">Wiki</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
+        <li><a href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
             title="Official installation guide">Official Installation Guide</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide"
+        <li><a href="https://wiki.archlinux.org/index.php/Beginners'_Guide"
             title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
     </ul>
 
@@ -109,15 +109,15 @@
     <ul>
         <li><a href="http://mailman.archlinux.org/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels"
+        <li><a href="https://wiki.archlinux.org/index.php/IRC_Channels"
             title="Official and regional IRC communities">IRC Channels</a></li>
         <li><a href="http://planet.archlinux.org/"
             title="Arch in the blogosphere">Planet Arch</a></li>
         <li><a href="http://rollingrelease.com/"
             title="Community online magazine">Rolling Release Ezine</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/International_Communities"
+        <li><a href="https://wiki.archlinux.org/index.php/International_Communities"
             title="Arch communities in your native language">International Communities</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Related_Projects"
+        <li><a href="https://wiki.archlinux.org/index.php/Related_Projects"
             title="Projects that are in some way related to Arch Linux">Related Projects</a></li>
     </ul>
 
@@ -159,7 +159,7 @@
             title="View SVN entries for packages">SVN Repositories</a></li>
         <li><a href="http://projects.archlinux.org/"
             title="Official Arch projects (git)">Projects in Git</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+        <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
             title="Developer Wiki articles">DeveloperWiki</a></li>
         <li><a href="/todolists/"
             title="Developer Todo Lists">Todo Lists</a></li>
@@ -168,10 +168,10 @@
     <h4>About</h4>
 
     <ul>
-        <li><a href="http://wiki.archlinux.org/index.php/ArchLinux:About"
+        <li><a href="https://wiki.archlinux.org/index.php/ArchLinux:About"
             title="Learn more about Arch Linux">About Arch</a></li>
         <li><a href="/download/" title="Get Arch Linux">Download Arch</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
+        <li><a href="https://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
             title="Arch Linux in the media">Press Coverage</a></li>
         <li><a href="{% url page-art %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
         <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 1f900c2c..90852b71 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -5,7 +5,7 @@
     <h2 class="title">SVN Repositories</h2>
     <p>
     The PKGBUILD files can be fetched via the ABS utility. To learn more
-    about ABS, see <a href="http://wiki.archlinux.org/index.php/ABS">the ABS wiki page</a>.
+    about ABS, see <a href="https://wiki.archlinux.org/index.php/ABS">the ABS wiki page</a>.
     </p>
     <p>
     You can view the history of all the PKGBUILD files from the Repository
@@ -29,7 +29,8 @@
         svn update &lt;your-package-name&gt;
     </pre>
     <p>
-    Visit <a href="http://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a> for more tips on checking out and updating svn PKGBUILDs.
+    Visit <a href="https://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a>
+    for more tips on checking out and updating svn PKGBUILDs.
     </p>
 
 </div>
-- 
cgit v1.2.3-55-g3dc8