[SCM] wiki-content branch, master, updated. 095e229fb8133a8edd03b2b30a2db885dece2b1a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 095e229fb8133a8edd03b2b30a2db885dece2b1a
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jan 17 09:05:02 2012 +0100

    Restoring original project section on index page.
    
    There are some reasons why the project section was like it was:
    - it's alphabetically sorted.
    - 'about' is the common name for an about page, not 'overview',
      the real overview can be found in live-manual.
    - 'links' is supposed to contain random links, not just media,
      having these on two independent pages wouldn't make much sense.
    - 'lifespan' is a term used on debian.org and was chosen here
      on purpose.
    - using the term 'User' to group deploments and downstreams is
      ugly at best when there's already a user section on the page.

diff --git a/index.mdwn b/index.mdwn
index 6f58829..2939836 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -34,16 +34,17 @@
 	<a class="sl" id="sl_project" href="/project">Project</a>
 
 	<ul>
-		<li><a href="project/about">Overview</a></li>
-		<li><a href="project/news">News</a></li>
-		<li><a href="project/contact">Contact</a></li>
+		<li><a href="/project/about">About</a></li>
+		<li><a href="/project/contact">Contact</a></li>
+		<li><a href="/project/deployment">Deployment</a></li>
+		<li><a href="/project/downstream">Downstream</a></li>
+		<li><a href="/project/lifespan">Lifespan</a></li>
+		<li><a href="/project/links">Links</a></li>
+		<li><a href="/project/news">News</a></li>
+		<li><a href="/project/releases">Releases</a></li>
+		<li><a href="/project/roadmap">Roadmap</a></li>
+		<li><a href="/project/status">Status</a></li>
 		<li><a href="/project/team">Team</a></li>
-		<li><b>Users</b>: <a href="project/deployment">Deployment</a> <a href="project/downstream">Downstream</a></li>
-		<li><a href="project/status">Status</a></li>
-		<li><a href="project/roadmap">Roadmap</a></li>
-		<li><a href="project/lifespan">Support policy</a></li>
-		<li><a href="project/links">Media</a></li>
-		<li><a href="project/releases">Releases</a></li>
 	</ul>
 </div>
 

-- 
wiki-content