[SCM] wiki-content branch, master, updated. d1853b2af27196ea81e105b943c4468eaf4b5e5a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d1853b2af27196ea81e105b943c4468eaf4b5e5a
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Oct 22 00:21:30 2010 +0200

    Shortening user links a bit on index page.

diff --git a/index.mdwn b/index.mdwn
index cf5ff67..71a2e1a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -7,10 +7,9 @@
 		<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://cdimage.debian.org/cdimage/squeeze_live_alpha2/">testing</a></li>
 		<li><b>Download snapshots:</b> <a href="cdimage/daily-builds">daily-builds</a> <a href="cdimage/weekly-builds">weekly-builds</a> <a href="cdimage/monthly-builds">monthly-builds</a></li>
-		<li>Manual: <a href="/manual/en">English</a> <a href="/manual/de">German</a> <a href="/manual/fr">French</a></li>
+		<li><b>Manual</b>: <a href="/manual/en">English</a> <a href="/manual/de">German</a> <a href="/manual/fr">French</a></li>
 		<li><a href="http://lists.debian.org/debian-live/">Mailinglist</a></li>
-		<li><a href="http://live-build.debian.net/"><b>Web Images Builder</b> (CGI)</a></li>
-		<li><a href="http://live-studio.debian.net/"><b>Web images Builder</b> (App)</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://wiki.debian.org/DebianLive/">Wiki</a></li>
 	</ul>
 </div>

-- 
wiki-content