Index: links.tags.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/links.tags.wml,v
retrieving revision 1.132
diff -u -r1.132 links.tags.wml
--- links.tags.wml	8 Jan 2012 19:16:37 -0000	1.132
+++ links.tags.wml	7 Nov 2012 07:55:07 -0000
@@ -24,6 +24,9 @@
 <define-tag debianpackages whitespace=delete>
   <gettext>Debian Packages</gettext>
 </define-tag>
+<define-tag mirror whitespace=delete>
+  <gettext>mirror</gettext>
+</define-tag>
 <define-tag download whitespace=delete>
   <gettext>Download</gettext>
 </define-tag>
@@ -45,6 +48,27 @@
 <define-tag socialcontract whitespace=delete>
   <gettext>Social Contract</gettext>
 </define-tag>
+<define-tag constitution whitespace=delete>
+  <gettext>Debian constitution</gettext>
+</define-tag>
+<define-tag legal whitespace=delete>
+  <gettext>legal</gettext>
+</define-tag>
+<define-tag consultants whitespace=delete>
+  <gettext>consultants</gettext>
+</define-tag>
+<define-tag users whitespace=delete>
+  <gettext>users</gettext>
+</define-tag>
+<define-tag vote whitespace=delete>
+  <gettext>vote</gettext>
+</define-tag>
+<define-tag planet whitespace=delete>
+  <gettext>follow debian on planet.debian.org!</gettext>
+</define-tag>
+<define-tag identica whitespace=delete>
+  <gettext>follow debian on identi.ca!</gettext>
+</define-tag>
 <define-tag visitsponsor whitespace=delete>
   <gettext>Visit the site sponsor</gettext>
 </define-tag>
Index: mainpage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mainpage.wml,v
retrieving revision 1.71
diff -u -r1.71 mainpage.wml
--- mainpage.wml	27 Jul 2012 19:08:53 -0000	1.71
+++ mainpage.wml	7 Nov 2012 08:03:36 -0000
@@ -34,12 +34,13 @@
   <li><a href="$(INTRO)/about"><about/></a>
     <ul>
       <li><a href="$(HOME)/social_contract"><socialcontract/></a></li>
+      <li><a href="$(HOME)/devel/constitution"><constitution/></a></li>
       <li><a href="$(HOME)/intro/free"><freesoftware/></a></li>
       <li><a href="$(HOME)/partners/"><partners/></a></li>
-      <li><a href="$(HOME)/donations"><donations/></a></li>
       <li><a href="$(HOME)/contact"><contactus/></a></li>
     </ul>
   </li>
+  <li><a href="$(HOME)/legal/"><legal/></a></li>
   <li><a href="$(HOME)/intro/help"><helpdebian/></a></li>
 </ul>
 
@@ -52,50 +53,58 @@
       <li><a href="$(DISTRIB)/pre-installed"><pre-installed/></a></li>
     </ul>
   </li>
-  <li><a href="$(HOME)/devel/"><develcorner/></a></li>
   <li><a href="$(DISTRIB)/packages"><debianpackages/></a></li>
+  <li><a href="$(HOME)/releases/"><releaseinfo/></a>
+    <ul>
+      <li><a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a></li>
+    </ul>
+  </li>
 </ul>
 
 <ul id="hometoc-colc">
-  <li><a href="$(HOME)/News/"><news/></a>
-  <ul>
-    <li><a href="$(HOME)/News/weekly/"><projectnews/></a></li>
-    <li><a href="$(HOME)/events/"><events/></a></li>
-  </ul>
+  <li><a href="$(HOME)/MailingLists/"><mailinglists/></a>
+    <ul>
+      <li><a href="http://lists.debian.org/"><mailarchives/></a></li>
+    </ul>
   </li>
+  <li><a href="$(HOME)/support"><support/></a></li>
+  <li><a href="$(HOME)/News/"><news/></a></li>
+  <li><a href="$(HOME)/security/"><security/></a></li>
   <li><a href="$(DOC)/"><documentation/></a>
     <ul>
-      <li><a href="$(HOME)/releases/"><releaseinfo/></a></li>
-      <li><a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a></li>
       <li><a href="$(DOC)/books"><debianbooks/></a></li>
     </ul>
   </li>
+  <li><a href="$(HOME)/mirror"><mirror/></a></li>
 </ul>
 
 <ul id="hometoc-cold">
-  <li><a href="$(HOME)/support"><support/></a>
+  <li><a href="$(HOME)/devel/"><develcorner/></a>
     <ul>
-      <li><a href="$(HOME)/international/"><debinternational/></a></li>
-      <li><a href="$(HOME)/security/"><security/></a></li>
-      <li><a href="$(BUGS)/"><bugreports/></a></li>
-      <li><a href="$(HOME)/MailingLists/"><mailinglists/></a></li>
-      <li><a href="http://lists.debian.org/"><mailarchives/></a></li>
       <li><a href="$(HOME)/ports/"><portsarchitectures/></a></li>
+      <li><a href="$(BUGS)/"><bugreports/></a></li>
+      <li><a href="$(HOME)/News/weekly/"><projectnews/></a></li>
     </ul>
   </li>
+  <li><a href="$(HOME)/vote/"><vote/></a></li>
+  <li><a href="$(HOME)/events/"><events/></a></li>
+  <li><a href="$(HOME)/international/"><debinternational/></a></li>
+  <li><a href="http://planet.debian.org"><img src="Pics/planet.png"
+	alt="<planet/>" /></a></li>
 </ul>
 
 <ul id="hometoc-cole">
   <li><a href="$(MISC)/"><misc/></a></li>
   <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li>
   <li><a href="$(SEARCH)"><search/></a></li>
+  <li><a href="$(HOME)/donations"><donations/></a></li>
+  <li><a href="$(HOME)/consultants"><consultants/></a></li>
+  <li><a href="$(HOME)/users"><users/></a></li>
 #  <li class="sponsorbutton"><a href="$(HOME)/sponsor.html"><img src="sponsor_img.jpg" alt="<visitsponsor/>" /></a></li>
 #  <li class="sponsorbutton"><a href="http://debconf12.debconf.org/"><img  src="$(HOME)/Pics/debconf12.png" alt="Debconf 12" /></a></li>
 #  <li><a href="http://debconf12.debconf.org/watch.xhtml">DebConf12 video streaming</a></li>
   <li><a href="http://identi.ca/debian"><img src="Pics/identica.png"
-  alt="follow debian on identi.ca!" /></a></li>
-  <li><a href="http://planet.debian.org"><img src="Pics/planet.png"
-  alt="follow debian on planet.debian.org!" /></a></li>
+	alt="<identica/>" /></a></li>
   </ul>
 
 <!--/UdmComment-->