[SCM] wiki-content branch, master, updated. 41c905a01845e468e8830a163b0a1a87ad38a65c

[chals]

The following commit has been merged in the master branch:
commit 41c905a01845e468e8830a163b0a1a87ad38a65c
Author: chals <chals at altorricon.com>
Date:   Fri May 25 14:13:05 2012 +0200

    Fixing broken links 'Why Debian Live?' and 'various media'.

diff --git a/project/about.mdwn b/project/about.mdwn
index 53fd9c2..4797834 100644
--- a/project/about.mdwn
+++ b/project/about.mdwn
@@ -1,5 +1,5 @@
 # About
 
-A Debian Live system is a [Debian](http://www.debian.org/) operating system that does not require a classical installer to use it. It comes on [various media](http://live.debian.net/manual/en/html/the-basics.html), including CD-ROM, USB sticks, or via netboot. [Why Debian Live?](http://live.debian.net/manual/en/html/about-project.html)
+A Debian Live system is a [Debian](http://www.debian.org/) operating system that does not require a classical installer to use it. It comes on [various media](http://live.debian.net/manual-2.x/html/live-manual.en.html#the-basics), including CD-ROM, USB sticks, or via netboot. [Why Debian Live?](http://live.debian.net/manual-2.x/html/live-manual.en.html#about-project)
 
 Although the Debian Live project is about the framework to create your own customized Live system, we offer some prebuilt images. Currently, builds for four desktop environments ([GNOME](http://www.gnome.org/), [KDE](http://www.kde.org/), [LXDE](http://www.lxde.org/), and [Xfce](http://www.xfce.org/)) as well as the standard system and for rescue purposes are available.

-- 
wiki-content