[SCM] wiki-content branch, master, updated. 5a9ba1dd97b68a24f169c5f1cc9560a3f9e9d16f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 5a9ba1dd97b68a24f169c5f1cc9560a3f9e9d16f
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jan 17 09:12:27 2012 +0100

    Restoring original user section on index page.
    
    There are some reasons why the user section was like it was:
    - it's alphabetically sorted.
    - just because image snasphots are currently not built doesn't
      mean we should remove the link to it entirely.
    - using the 'download' term rather than 'pre-build images'
      still makes more sense to me and seems to be more common.
    - having one link pointing to 'archive' rather than having
      split it out to several (packages, images, irc) seems
      better.

diff --git a/index.mdwn b/index.mdwn
index 2939836..c54a412 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,14 +4,14 @@
 	<a class="sl" id="sl_user" href="/user">User</a>
 
 	<ul>
+		<li><a href="archive">Archive</a></li>
+		<li><b>Download releases:</b> <a href="http://cdimage.debian.org/cdimage/release/current-live/">stable</a> <a href="http://live.debian.net/cdimage/release/current-oldstable/">oldstable</a></li>
+		<li><b>Download snapshots:</b> <a href="cdimage/daily-builds">daily</a> <a href="cdimage/weekly-builds">weekly</a> <a href="cdimage/monthly-builds">monthly</a></li>
+		<li><a href="http://www.debian.org/CD/live/">About release images</a>
 		<li><b>Manual</b>: <a href="/manual/index.en.html">en</a> <a href="/manual/index.es.html">es</a> <a href="/manual/index.de.html">de</a> <a href="/manual/index.fr.html">fr</a> <a href="/manual/index.it.html">it</a> <a href="/manual/index.pt_BR.html">pt_BR</a> <a href="/manual/index.ro.html">ro</a></li>
-		<li><b>Pre-built images</b>: <a href="http://www.debian.org/CD/live/">stable</a> <a href="cdimage">oldstable</a> <a href="archive/images">archived</a></li>
+		<li><a href="http://lists.debian.org/debian-live/">Mailinglist</a></li>
 		<li><b>Web Images Builder</b>: <a href="http://live-build.debian.net/">CGI</a> <a href="http://live-studio.debian.net/">Django</a></li>
-		<li><a href="http://lists.debian.org/debian-live/">Mailing list</a></li>
-		<li><b>IRC</b> <a href="archive/irc">log</a></li>
-		<li><a href="archives/packages">packages</a></li>
-		<li><a href="archive">meetings and talks</a></li>
-		<li><a href="http://wiki.debian.org/DebianLive/">old wiki</a></li>
+		<li><a href="http://wiki.debian.org/DebianLive/">Wiki</a></li>
 	</ul>
 </div>
 

-- 
wiki-content