From f9fb5909bbcb5f5ff727a2d8f0081a4185138414 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 20 Apr 2013 13:42:30 -0400
Subject: remove /mailman from the MAILMAN_BASE_URL, use it every time

---
 settings.py                      | 2 +-
 templates/base.html              | 2 +-
 templates/packages/flag.html     | 2 +-
 templates/packages/flaghelp.html | 2 +-
 templates/public/download.html   | 2 +-
 templates/public/index.html      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/settings.py b/settings.py
index ba9560f7..bc15b0ab 100644
--- a/settings.py
+++ b/settings.py
@@ -139,7 +139,7 @@ PXEBOOT_URL = 'http://releng.archlinux.org/pxeboot/'
 # community bit on the end, repo.svn_root is appended)
 SVN_BASE_URL = 'svn://svn.archlinux.org/'
 
-MAILMAN_BASE_URL = 'https://mailman.archlinux.org/mailman'
+MAILMAN_BASE_URL = 'https://mailman.archlinux.org/'
 
 BRANDING_APPNAME = 'archweb'
 BRANDING_DISTRONAME = 'Arch Linux'
diff --git a/templates/base.html b/templates/base.html
index bc4db84f..e6553449 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -39,7 +39,7 @@
                     <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="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li>
-                    <li><a href="{{ MAILMAN_BASE_URL }}/private/arch-dev/"
+                    <li><a href="{{ MAILMAN_BASE_URL }}/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="https://stats.archlinux.org/munin/"
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 2b492d45..6cd5bedf 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -23,7 +23,7 @@
     <p>The message box portion of the flag utility is optional, and meant
     for short messages only. If you need more than 200 characters for your
     message, then file a bug report, email the maintainer directly, or send
-    an email to the <a href="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
+    an email to the <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
         title="Visit the arch-general mailing list">arch-general mailing list</a>
     with your additional text.</p>
 
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index e2d67e06..01534d8f 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -24,7 +24,7 @@
         <p>The message box portion of the flag utility is optional, and meant
         for short messages only. If you need more than 200 characters for your
         message, then file a bug report, email the maintainer directly, or send
-        an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/listinfo/arch-general"
+        an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
             title="Visit the arch-general mailing list">arch-general mailing list</a>
         with your additional text.</p>
 
diff --git a/templates/public/download.html b/templates/public/download.html
index f473915a..70b27b73 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -27,7 +27,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="{{ MAILMAN_BASE_URL }}/listinfo/arch-releng"
+                <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-releng"
                     title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
             </ul>
         </li>
diff --git a/templates/public/index.html b/templates/public/index.html
index aeeff175..8856fd95 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -27,7 +27,7 @@
     <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="{{ MAILMAN_BASE_URL }}/listinfo/"
+    and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
         title="Arch Mailing Lists">mailing lists</a>
     to get your feet wet.  Also glance through our <a href="{% wiki_url %}"
         title="{{BRANDING_WIKINAME}}">wiki</a>
@@ -127,7 +127,7 @@
     <h4>Community</h4>
 
     <ul>
-        <li><a href="{{ MAILMAN_BASE_URL }}/listinfo/"
+        <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
         <li><a href="{% wiki_url 'IRC_Channels' %}"
             title="Official and regional IRC communities">IRC Channels</a></li>
-- 
cgit v1.2.3-2-g168b