Merge tag 'release_2014-10-28' into archweb-generic

Fix django_countries issues

1 files changed, 10 insertions, 13 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index a6ff7e9f..14b93427 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -109,7 +109,6 @@
 {% cache 115 main-page-right secure %}
 <div id="nav-sidebar" class="widget">
     <h4>Documentation</h4>
-
     <ul>
         <li><a href="{% wiki_url %}"
             title="Community documentation">Wiki</a></li>
@@ -120,7 +119,6 @@
     </ul>
 
     <h4>Community</h4>
-
     <ul>
         <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
             title="Community and developer mailing lists">Mailing Lists</a></li>
@@ -133,7 +131,6 @@
     </ul>
 
     <h4>Support</h4>
-
     <ul>
         <li><a href="{% url 'page-donate' %}"
             title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li>
@@ -146,7 +143,6 @@
     </ul>
 
     <h4>Tools</h4>
-
     <ul>
         <li><a href="{% url 'mirrorlist' %}"
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
@@ -154,12 +150,9 @@
             title="See a listing of all available mirrors">Mirror List</a></li>
         <li><a href="{% url 'mirror-status' %}"
             title="Check the status of all known mirrors">Mirror Status</a></li>
-        <li><a href="{% url 'packages-differences' %}"
-            title="See differences in packages between available architectures">Differences Reports</a></li>
     </ul>
 
     <h4>Development</h4>
-
     <ul>
         <li><a href="{{ PROJECTS_URL }}"
             title="Official {{BRANDING_SHORTNAME}} projects (git)">Projects in Git</a></li>
@@ -175,23 +168,27 @@
             title="Release Engineering ISO listing">ISO Release List</a></li>
         <li><a href="{% url 'visualize-index' %}"
             title="View visualizations">Visualizations</a></li>
+        <li><a href="{% url 'packages-differences' %}"
+            title="See differences in packages between available architectures">Differences Reports</a></li>
     </ul>
 
-    <h4>More Resources</h4>
-
+    <h4>People</h4>
     <ul>
+        <li><a href="{% url 'page-devs' %}" title="Active developers">Developers</a></li>
+        <li><a href="{% url 'page-tus' %}" title="Active Trusted Users (TUs)">Trusted Users</a></li>
+        <li><a href="{% url 'page-fellows' %}" title="Retired Developers">Fellows</a></li>
         <li><a href="{% url 'page-keys' %}"
             title="Package/Database signing master keys">Signing Master Keys</a></li>
+    </ul>
+
+    <h4>More Resources</h4>
+    <ul>
         <li><a href="{% wiki_url 'Arch_Linux_press_coverage %}"
             title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
         <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} 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>
         <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
-        <li><a href="{% url 'page-devs' %}" title="Active developers">Developer Profiles</a></li>
-        <li><a href="{% url 'page-tus' %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
-        <li><a href="{% url 'page-fellows' %}" title="Retired Developers">Fellows Profiles</a></li>
     </ul>
-
 </div>
 
 <div id="home-donate-button" class="widget">