[SCM] live-config branch, upstream, updated. upstream/2.0_a13-1-gb1efeea

Daniel Baumann daniel at debian.org
Thu Jul 15 23:45:53 UTC 2010


The following commit has been merged in the upstream branch:
commit b1efeeafa7996f1bed7626c9268f59f4dbac6a31
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 16 01:45:30 2010 +0200

    Adding upstream version 2.0~a14.

diff --git a/VERSION b/VERSION
index eddafe4..349985c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a13
+2.0~a14
diff --git a/bin/update-live-config.sh b/bin/update-live-config.sh
index 78766ad..e10e9ea 100755
--- a/bin/update-live-config.sh
+++ b/bin/update-live-config.sh
@@ -2,39 +2,48 @@
 
 set -e
 
-DIRECTORY="${1:-/lib/live/config}"
+_DIRECTORY="${1:-/lib/live/config}"
 
-if [ ! -e "${DIRECTORY}" ]
+if [ ! -e "${_DIRECTORY}" ]
 then
-	echo "E: ${DIRECTORY} - not found."
+	echo "E: ${_DIRECTORY} - not found."
 	exit 1
 fi
 
-DISTRIBUTION="$(lsb_release -is | tr [A-Z] [a-z])"
-RELEASE="$(lsb_release -cs | tr [A-Z] [a-z])"
+if [ ! -x "$(which lsb_release 2>/dev/null)" ]
+	echo "E: lsb_release - command not found"
+	echo "I: lsb_release can be optained from:"
+	echo "I:   http://www.linux-foundation.org/en/LSB"
+	echo "I: On Debian systems, lsb_release can be installed with:"
+	echo "I:   apt-get install lsb-release"
+	exit 1
+fi
+
+_DISTRIBUTION="$(lsb_release -is | tr [A-Z] [a-z])"
+_RELEASE="$(lsb_release -cs | tr [A-Z] [a-z])"
 
 echo "Removing unused scripts..."
 
-case "${DISTRIBUTION}" in
+case "${_DISTRIBUTION}" in
 	debian)
 		# Removing ubuntu scripts
-		rm -f "${DIRECTORY}"/*-apport
+		rm -f "${_DIRECTORY}"/*-apport
 
-		case "${RELEASE}" in
+		case "${_RELEASE}" in
 		lenny)
 			# Removing squeeze and newer scripts
-			rm -f "${DIRECTORY}"/*-gdm3
-			rm -f "${DIRECTORY}"/*-kaboom
-			rm -f "${DIRECTORY}"/*-kde-services
-			rm -f "${DIRECTORY}"/*-keyboard-configuration
+			rm -f "${_DIRECTORY}"/*-gdm3
+			rm -f "${_DIRECTORY}"/*-kaboom
+			rm -f "${_DIRECTORY}"/*-kde-services
+			rm -f "${_DIRECTORY}"/*-keyboard-configuration
 			;;
 
 		*)
 			# Removing lenny legacy scripts
-			rm -f "${DIRECTORY}"/*-console-common
-			rm -f "${DIRECTORY}"/*-console-setup
-			#rm -f "${DIRECTORY}"/*-gdm
-			rm -f "${DIRECTORY}"/*-kpersonalizer
+			rm -f "${_DIRECTORY}"/*-console-common
+			rm -f "${_DIRECTORY}"/*-console-setup
+			#rm -f "${_DIRECTORY}"/*-gdm
+			rm -f "${_DIRECTORY}"/*-kpersonalizer
 			;;
 		esac
 		;;
diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000..75ef020
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,15 @@
+live-config-foobar Example
+--------------------------
+
+Best practise for downstream projects is to ship their custom live-config
+scripts in an own debian package.
+
+The following live-config-foobar example package should be used as a starting
+point. The following things should minimally be changed:
+
+  * Replace any mentioning of 'Joe Doe' with your own name.
+  * Replace any mentioning of 'example.org' with your own domain name.
+  * Replace any mentioning of 'foobar', 'Foobar' and 'FOOBAR' with the name of
+    your custom script.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 24 May 2010 09:14:49 +0200
diff --git a/examples/live-config-foobar/debian/control b/examples/live-config-foobar/debian/control
index 8c87c13..e1a05be 100644
--- a/examples/live-config-foobar/debian/control
+++ b/examples/live-config-foobar/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: John Doe <john at example.org>
 Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://www.example.org/foobar/
 Vcs-Browser: http://git.example.org/?p=live-config-foobar.git
 Vcs-Git: git://git.example.org/git/live-config-foobar.git
diff --git a/examples/live-config-foobar/debian/copyright b/examples/live-config-foobar/debian/copyright
index 9c1404c..d3c122a 100644
--- a/examples/live-config-foobar/debian/copyright
+++ b/examples/live-config-foobar/debian/copyright
@@ -1,3 +1,6 @@
+This package is based on the live-config-foobar example package included in
+live-config which can be optained from http://live.debian.net/.
+
 Files: *
 Copyright: (C) 2010 John Doe <john at example.org>
 License: GPL-3+
diff --git a/examples/live-config-foobar/scripts/900-foobar b/examples/live-config-foobar/scripts/900-foobar
index 3097f2f..189992a 100755
--- a/examples/live-config-foobar/scripts/900-foobar
+++ b/examples/live-config-foobar/scripts/900-foobar
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config-foobar(7) - Additional Configuration Scripts for Debian Live
-# Copyright (C) 2010 John Doe <john at example.org>
-#
-# live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config-foobar(7) - Additional Configuration Scripts for Debian Live
+## Copyright (C) 2010 John Doe <john at example.org>
+##
+## live-config-foobar comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Foobar ()
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 7d3e193..2fbb969 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 15.07.2010 2.0~a13 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 16.07.2010 2.0~a14 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-config\fP \- System Konfiguration Skripte
@@ -54,46 +54,46 @@ Alle Skripte werden ausgeführt, ausser die hier spezifizierten Ausnahmen.
 Manche einzelne Skripte können durch Boot Parameter in ihrem Verhalten
 beinflusst werden.
 
-.IP \fBlive\-config.hostname\fP=\fIRECHNERNAME\fP 4
+.IP "\fBlive\-config.hostname\fP=\fIRECHNERNAME\fP | \fBhostname\fP=\fIRECHNERNAME\fP" 4
 Ermöglicht den Rechnernamen des Systems zu wählen. Der Standardname ist
 \&'debian'.
-.IP \fBlive\-config.username\fP=\fIBENUTZERNAME\fP 4
+.IP "\fBlive\-config.username\fP=\fIBENUTZERNAME\fP | \fBusername\fP=\fIBENUTZERNAME\fP" 4
 Ermöglicht den Namen des Benutzers zu wählen, welcher für den automatischen
 Login angelegt wird. Der Standardname ist 'user'.
-.IP "\fBlive\-config.user\-fullname\fP=\(dq\fIVOLLER BENUTZERNAME\fP\(dq" 4
+.IP "\fBlive\-config.user\-fullname\fP=\(dq\fIVOLLER BENUTZERNAME\fP\(dq | \fBuser\-fullname\fP=\(dq\fIVOLLER BENUTZERNAME\fP\(dq" 4
 Ermöglicht den vollen Name für den Benutzer zu wählen, welcher für den
 automatischen Login angelegt wird. Der Standard ist 'Debian Live user'.
-.IP \fBlive\-config.locales\fP=\fIGEBIETSSCHEMA\fP 4
+.IP "\fBlive\-config.locales\fP=\fIGEBIETSSCHEMA\fP | \fBlocales\fP=\fIGEBIETSSCHEMA\fP" 4
 Ermöglicht das Gebietsschema des Systems zu wählen, zum Beispiel
 \&'de_CH.UTF\-8'. Der Standard ist 'en_US.UTF\-8'. Falls das gewünschte
 Gebietsschema nicht schon auf dem System verfügbar ist, wird es automatisch
 bei Bedarf generiert.
-.IP \fBlive\-config.timezone\fP=\fIZEITZONE\fP 4
+.IP "\fBlive\-config.timezone\fP=\fIZEITZONE\fP | \fBtimezone\fP=\fIZEITZONE\fP" 4
 Ermöglicht die Zeitzone des Systems einzustellen, zum Beispiel
 \&'Europe/Zurich'. Der Standard ist 'UTC'.
-.IP \fBlive\-config.utc\fP=\fByes\fP|no 4
+.IP "\fBlive\-config.utc\fP=\fByes\fP|no | \fButc\fP=\fByes\fP|no" 4
 Ermöglicht zu bestimmen, ob das System davon ausgehen soll, dass die
 Hardwareuhr auf UTC gestellt ist oder nicht. Der Standard ist 'yes'.
-.IP \fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP 4
+.IP "\fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP | \fBkeyboard\-model\fP=\fITASTATUR_MODELL\fP" 4
 Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert
 gesetzt.
-.IP "\fBlive\-config.keyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
+.IP "\fBlive\-config.keyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP | \fBkeyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
 Ermöglicht die Tastatur Layouts zu bestimmen. Wenn mehr als ein Layout
 angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
 X11. Es ist kein Standardwert gesetzt.
-.IP \fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP 4
+.IP "\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANT\fP | \fBkeyboard\-variant\fP=\fITASTATUR_VARIANT\fP" 4
 Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert
 gesetzt.
-.IP \fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP 4
+.IP "\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP | \fBkeyboard\-options\fP=\fITASTATUR_OPTIONEN\fP" 4
 Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
 gesetzt.
-.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
+.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP | \fBsysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
 Ermöglicht Services durch update\-rc.d abzuschalten.
-.IP \fBlive\-config.xorg\-driver\fP=\fIXORG_TREIBER\fP 4
+.IP "\fBlive\-config.xorg\-driver\fP=\fIXORG_TREIBER\fP | \fBxorg\-driver\fP=\fIXORG_TREIBER\fP" 4
 Ermöglicht den Xorg Treiber manuell statt automatisch zu bestimmen.
-.IP \fBlive\-config.xorg\-resolution\fP=\fIXORG_AUFLÖSUNG\fP 4
+.IP "\fBlive\-config.xorg\-resolution\fP=\fIXORG_AUFLÖSUNG\fP | \fBxorg\-resolution\fP=\fIXORG_AUFLÖSUNG\fP" 4
 Ermöglicht die Xorg Auflösung manuell statt automatisch zu bestimmen.
-.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
+.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP | \fBhooks\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
 Ermöglicht eine oder mehrere beliebige Dateien herunterzuladen und
 auszuführen. Die URLs müssen durch wget (http, ftp oder file://) aufösbar
 sein, die Dateien werden in /tmp des laufenden Live Systems ausgeführt und
@@ -113,20 +113,23 @@ Anwendungsfälle wo sonst verschiedene einzelne Parameter kombiniert werden
 müssten. Dies gewährleistet sowohl feine Kontrolle über alle Optionen, als
 einfache Benutzbarkeit.
 
-.IP \fBlive\-config.noroot\fP 4
+.IP "\fBlive\-config.noroot\fP | \fBnoroot\fP" 4
 Schaltet die sudo und policykit Skripte ab, ein Benutzer kann keine root
 Privilegien auf dem System mehr erlangen.
-.IP \fBlive\-config.nottyautologin\fP 4
+.IP "\fBlive\-config.nottyautologin\fP | \fBnoautologin\fP" 4
+Schaltet sowohl den den automatischen Login via TTY ab als auch den
+automatischen graphischen Login.
+.IP "\fBlive\-config.nottyautologin\fP | \fBnottyautologin\fP" 4
 Schaltet den automatischen Login via TTY ab, dies beeinflusst den
 automatisch graphischen Login nicht.
-.IP \fBlive\-config.nox11autologin\fP 4
+.IP "\fBlive\-config.nox11autologin\fP | \fBnox11autologin\fP" 4
 Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
 den automatischen tty Login nicht.
 
 .SS "Boot Parameter (Spezielle Optionen)"
 Für spezielle Anwendungsfälle gibt es ein paar spezielle Bootparameter.
 
-.IP \fBlive\-config.debug\fP 4
+.IP "\fBlive\-config.debug\fP | \fBdebug\fP" 4
 Schaltet debug Ausgaben in live\-config an.
 
 .SS Konfigurationsdateien
@@ -239,7 +242,7 @@ konfiguriert locales.
 .IP \fBtzdata\fP 4
 konfiguriert /etc/timezone.
 .IP \fBgdm\fP 4
-konfiguriert Autologin in gdm (lenny).
+konfiguriert Autologin in gdm.
 .IP \fBgdm3\fP 4
 konfiguriert Autologin in gdm3 (squeeze und neuer).
 .IP \fBkdm\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 0a9ad27..5865b2d 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-CONFIG 7 2010\-07\-15 2.0~a13 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-07\-16 2.0~a14 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts
@@ -32,33 +32,33 @@ All scripts are run, except the specified ones.
 .SS Boot Parameters (options)
 Some individual scripts can change their behaviour upon a boot parameter.
 
-.IP "\fBlive\-config.hostname\fR=\fIHOSTNAME\fR" 4
+.IP "\fBlive\-config.hostname\fR=\fIHOSTNAME\fR | \fBhostname\fR=\fIHOSTNAME\fR" 4
 Allows to set the hostname of the system. The default is 'debian'.
-.IP "\fBlive\-config.username\fR=\fIUSERNAME\fR" 4
+.IP "\fBlive\-config.username\fR=\fIUSERNAME\fR | \fBusername\fR=\fIUSERNAME\fR" 4
 Allows to set the username that gets created for autologin. The default is 'user'.
-.IP "\fBlive\-config.user\-fullname\fR=""\fIUSER FULLNAME\fR""" 4
+.IP "\fBlive\-config.user\-fullname\fR=""\fIUSER FULLNAME\fR"" | \fBuser\-fullname\fR=""\fIUSER FULLNAME\fR""" 4
 Allows to set the fullname of the users that gets created for autologin. The default is 'Debian Live user'.
-.IP "\fBlive\-config.locales\fR=\fILOCALE\fR" 4
+.IP "\fBlive\-config.locales\fR=\fILOCALE\fR | \fBlocales\fR=\fILOCALE\fR" 4
 Allows to set the locale of the system, e.g. 'de_CH.UTF\-8'. The default is 'en_US.UTF\-8'. In case the selected locale is not already available on the system, it is automatically generated on the fly.
-.IP "\fBlive\-config.timezone\fR=\fITIMEZONE\fR" 4
+.IP "\fBlive\-config.timezone\fR=\fITIMEZONE\fR | \fBtimezone\fR=\fITIMEZONE\fR" 4
 Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is 'UTC'.
-.IP "\fBlive\-config.utc\fR=\fByes\fR|no" 4
+.IP "\fBlive\-config.utc\fR=\fByes\fR|no | \fButc\fR=\fByes\fR|no" 4
 Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
-.IP "\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
+.IP "\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR | \fBkeyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
 Allows to change the keyboard model. There is no default value set.
-.IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
+.IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR | \fBkeyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
 Allows to change the keyboard layouts. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
-.IP "\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
+.IP "\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR | \fBkeyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
 Allows to change the keyboard variant. There is no default value set.
-.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
+.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR | \fBkeyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
 Allows to change the keyboard options. There are no default value set.
-.IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
+.IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR | \fBsysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
 Allows to disable sysv services through update-rc.d.
-.IP "\fBlive\-config.xorg\-driver\fR=\fIXORG_DRIVER\fR" 4
+.IP "\fBlive\-config.xorg\-driver\fR=\fIXORG_DRIVER\fR | \fBxorg\-driver\fR=\fIXORG_DRIVER\fR" 4
 Allows to set xorg driver instead of autodetecting it.
-.IP "\fBlive\-config.xorg\-resolution\fR=\fIXORG_RESOLUTION\fR" 4
+.IP "\fBlive\-config.xorg\-resolution\fR=\fIXORG_RESOLUTION\fR | \fBxorg\-resolution\fR=\fIXORG_RESOLUTION\fR" 4
 Allows to set xorg resolution instead of autodetecting it.
-.IP "\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
+.IP "\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR | \fBhooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
 Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget (http, ftp or file://), the files are executed in /tmp of the running live system, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed. Some hooks for some common use-cases are available at <\fIhttp://live.debian.net/other/hooks\fR>.
 .br
 If the file is placed on the live media, it can be fetched with file:///live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
@@ -66,17 +66,19 @@ If the file is placed on the live media, it can be fetched with file:///live/ima
 .SS Boot Parameters (shortcuts)
 For some common use cases where it would require to combine several individual parameters, \fBlive\-config\fR provides shortcuts. This allows both to have full granularity over all the options, as well keep things simple.
 
-.IP "\fBlive\-config.noroot\fR" 4
+.IP "\fBlive\-config.noroot\fR | \fBnoroot\fR" 4
 Disables the sudo and policykit, the user cannot gain root privileges on the system.
-.IP "\fBlive\-config.nottyautologin\fR" 4
-Disables the automatic login on the terminal, not affecting the graphical autologin.
-.IP "\fBlive\-config.nox11autologin\fR" 4
+.IP "\fBlive\-config.noautologin\fR | \fBnoautologin\fR" 4
+Disables both the automatic console login and the graphical autologin.
+.IP "\fBlive\-config.nottyautologin\fR | \fBnottyautologin\fR" 4
+Disables the automatic login on the console, not affecting the graphical autologin.
+.IP "\fBlive\-config.nox11autologin\fR | \fBnox11autologin\fR" 4
 Disables the automatic login with any display manager, not affecting tty autologin.
 
 .SS Boot Parameters (special options)
 For special use cases there are some special boot paramters.
 
-.IP "\fBlive\-config.debug\fR" 4
+.IP "\fBlive\-config.debug\fR | \fBdebug\fR" 4
 Enables debug output in live\-config.
 
 .SS Configuration Files
@@ -146,7 +148,7 @@ configures locales.
 .IP "\fBtzdata\fR" 4
 configures /etc/timezone.
 .IP "\fBgdm\fR" 4
-configures autologin in gdm (lenny).
+configures autologin in gdm.
 .IP "\fBgdm3\fR" 4
 configures autologin in gdm3 (squeeze and newer).
 .IP "\fBkdm\fR" 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 374ae2e..2e668d9 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 2010\-07\-15 2.0~a13 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 16.07.2010 2.0~a14 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système
@@ -54,49 +54,49 @@ Tous les scripts sont lancés, à l'exception de ceux spécifiés.
 Quelques scripts particuliers peuvent changer leur comportement sur un
 paramètre d'amorçage.
 
-.IP \fBlive\-config.hostname\fP=\fIHOSTNAME\fP 4
+.IP "\fBlive\-config.hostname\fP=\fIHOSTNAME\fP | \fBhostname\fP=\fIHOSTNAME\fP" 4
 Permet de spécifier un nom d'hôte (hostname) au système. Par défaut ce nom
 est 'debian'.
-.IP \fBlive\-config.username\fP=\fIUSERNAME\fP 4
+.IP "\fBlive\-config.username\fP=\fIUSERNAME\fP | \fBusername\fP=\fIUSERNAME\fP" 4
 Permet de spécifier le login du user créé pour l'auto\-login. Par défaut ce
 nom est 'user'.
-.IP "\fBlive\-config.user\-fullname\fP=\(dq\fIUSER FULLNAME\fP\(dq" 4
+.IP "\fBlive\-config.user\-fullname\fP=\(dq\fIUSER FULLNAME\fP\(dq | \fBuser\-fullname\fP=\(dq\fIUSER FULLNAME\fP\(dq" 4
 Permet de spécifier le nom complet des utilisateurs créés pour
 l'auto\-login. Par défaut il s'agit de 'Debian Live user'.
-.IP \fBlive\-config.locales\fP=\fILOCALE\fP 4
+.IP "\fBlive\-config.locales\fP=\fILOCALE\fP | \fBlocales\fP=\fILOCALE\fP" 4
 Permet de spécifier la localisation du système, par exemple 'fr_FR'. Par
 défaut il s'agit de 'en_US.UTF\-8'. Dans le cas où la locale spécifiée n'est
 pas nativement disponible sur le système, elle est automatiquement générée à
 la volée.
-.IP \fBlive\-config.timezone\fP=\fITIMEZONE\fP 4
+.IP "\fBlive\-config.timezone\fP=\fITIMEZONE\fP | \fBtimezone\fP=\fITIMEZONE\fP" 4
 Permet de spécifier la timezone du système, par exemple 'Europe/Zurich'. Par
 défaut il s'agit de 'UTC'.
-.IP \fBlive\-config.utc\fP=\fByes\fP|no 4
+.IP "\fBlive\-config.utc\fP=\fByes\fP|no | \fButc\fP=\fByes\fP|no" 4
 Permet de modifier si le système assume, ou non, que l'horloge hardware soit
 réglée sur UTC. Par défaut 'oui'.
-.IP \fBlive\-config.keyboard\-model\fP=\fIKEYBOARD_MODEL\fP 4
+.IP "\fBlive\-config.keyboard\-model\fP=\fIKEYBOARD_MODEL\fP | \fBkeyboard\-model\fP=\fIKEYBOARD_MODEL\fP" 4
 Permet de changer le modèle de clavier. Aucune valeur par défaut n'est
 indiquée.
-.IP "\fBlive\-config.keyboard\-layouts\fP=\fIKEYBOARD_LAYOUT1\fP,\fIKEYBOARD_LAYOUT2\fP ... \fIKEYBOARD_LAYOUTn\fP" 4
+.IP "\fBlive\-config.keyboard\-layouts\fP=\fIKEYBOARD_LAYOUT1\fP,\fIKEYBOARD_LAYOUT2\fP ... \fIKEYBOARD_LAYOUTn\fP | \fBkeyboard\-layouts\fP=\fIKEYBOARD_LAYOUT1\fP,\fIKEYBOARD_LAYOUT2\fP ... \fIKEYBOARD_LAYOUTn\fP" 4
 Permet de changer la configuration du clavier. Si plus d'une configuration
 est spécifiée, les utilitaires de l'environnement de bureau permettront de
 passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est
 spécifiée.
-.IP \fBlive\-config.keyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP 4
+.IP "\fBlive\-config.keyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP | \fBkeyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP" 4
 Permet de changer le type de clavier. Aucune valeur par défaut n'est
 spécifiée.
-.IP \fBlive\-config.keyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP 4
+.IP "\fBlive\-config.keyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP | \fBkeyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP" 4
 Permet de changer les options du clavier. Aucune valeur par défaut n'est
 spécifiée.
-.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
+.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP | \fBsysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
 Permet de désactiver des services du sysV via update\-rc.d.
-.IP \fBlive\-config.xorg\-driver\fP=\fIXORG_DRIVER\fP 4
+.IP "\fBlive\-config.xorg\-driver\fP=\fIXORG_DRIVER\fP | \fBxorg\-driver\fP=\fIXORG_DRIVER\fP" 4
 Permet de spécifier le driver utilisé par xorg plutôt que d'utiliser
 l'auto\-détection.
-.IP \fBlive\-config.xorg\-resolution\fP=\fIXORG_RESOLUTION\fP 4
+.IP "\fBlive\-config.xorg\-resolution\fP=\fIXORG_RESOLUTION\fP | \fBxorg\-resolution\fP=\fIXORG_RESOLUTION\fP" 4
 Permet de spécifier la résolution utilisée par xorg, plutôt que d'utiliser
 l'auto\-détection.
-.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
+.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP | \fBhooks\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
 Permet de soumettre et d'exécuter un ou plusieurs fichiers/scripts
 spécifiques. Notez que les URLs doivent pouvoir être utilisées par wget
 (http, ftp or file://), que les fichiers sont exécutés dans /tmp sur le
@@ -115,20 +115,22 @@ Dans le cas où il est nécessaire de combiner plusieurs paramètres
 individuels, \fBlive\-config\fP fournit des raccourcis. Il permet de mixer
 facilement plusieurs options.
 
-.IP \fBlive\-config.noroot\fP 4
+.IP "\fBlive\-config.noroot\fP | \fBnoroot\fP" 4
 Désactive les règles du sudo; dans ce cas l'utilisateur ne peut pas
 bénéficier des privilèges administrateur (root) sur le système.
-.IP \fBlive\-config.nottyautologin\fP 4
+.IP "\fBlive\-config.nottyautologin\fP | \fBnoautologin\fP" 4
+Désactive l'auto\-login sur la console et l'auto\-login graphique.
+.IP "\fBlive\-config.nottyautologin\fP | \fBnottyautologin\fP" 4
 Désactive l'auto\-login sur la console, mais ne concerne pas l'auto\-login
 graphique.
-.IP \fBlive\-config.nox11autologin\fP 4
+.IP "\fBlive\-config.nox11autologin\fP | \fBnox11autologin\fP" 4
 Désactive l'auto\-login avec les gestionnaires graphiques, sans affecter
 l'auto\-login en console (tty).
 
 .SS "Boot Parameters (special options)"
 For special use cases there are some special boot paramters.
 
-.IP \fBlive\-config.debug\fP 4
+.IP "\fBlive\-config.debug\fP | \fBdebug\fP" 4
 Enables debug output in live\-config.
 
 .SS "Fichiers de configuration"
@@ -235,7 +237,7 @@ cnofigure les locales.
 .IP \fBtzdata\fP 4
 configure /etc/timezone.
 .IP \fBgdm\fP 4
-configure l'auto\-login dans gdm (lenny).
+configure l'auto\-login dans gdm.
 .IP \fBgdm3\fP 4
 configure l'auto\-login dans gdm3 (squeeze et plus récent).
 .IP \fBkdm\fP 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index af35a90..e20b0cc 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0~a13\n"
-"POT-Creation-Date: 2010-07-15 19:24+0300\n"
+"Project-Id-Version: live-config 2.0~a14\n"
+"POT-Creation-Date: 2010-07-16 01:43+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,13 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-07-15"
-msgstr "15.07.2010"
+msgid "2010-07-16"
+msgstr "16.07.2010"
 
 #. type: TH
 #: en/live-config.7:9
-#, no-wrap
-msgid "2.0~a13"
-msgstr "2.0~a13"
+msgid "2.0~a14"
+msgstr "2.0~a14"
 
 #. type: TH
 #: en/live-config.7:9
@@ -184,8 +183,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:35
 #, no-wrap
-msgid "B<live-config.hostname>=I<HOSTNAME>"
-msgstr "B<live-config.hostname>=I<RECHNERNAME>"
+msgid "B<live-config.hostname>=I<HOSTNAME> | B<hostname>=I<HOSTNAME>"
+msgstr "B<live-config.hostname>=I<RECHNERNAME> | B<hostname>=I<RECHNERNAME>"
 
 #. type: Plain text
 #: en/live-config.7:37
@@ -197,8 +196,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:37
 #, no-wrap
-msgid "B<live-config.username>=I<USERNAME>"
-msgstr "B<live-config.username>=I<BENUTZERNAME>"
+msgid "B<live-config.username>=I<USERNAME> | B<username>=I<USERNAME>"
+msgstr "B<live-config.username>=I<BENUTZERNAME> | B<username>=I<BENUTZERNAME>"
 
 #. type: Plain text
 #: en/live-config.7:39
@@ -212,8 +211,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:39
 #, no-wrap
-msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\""
-msgstr "B<live-config.user-fullname>=\"I<VOLLER BENUTZERNAME>\""
+msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\" | B<user-fullname>=\"I<USER FULLNAME>\""
+msgstr "B<live-config.user-fullname>=\"I<VOLLER BENUTZERNAME>\" | B<user-fullname>=\"I<VOLLER BENUTZERNAME>\""
 
 #. type: Plain text
 #: en/live-config.7:41
@@ -227,8 +226,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:41
 #, no-wrap
-msgid "B<live-config.locales>=I<LOCALE>"
-msgstr "B<live-config.locales>=I<GEBIETSSCHEMA>"
+msgid "B<live-config.locales>=I<LOCALE> | B<locales>=I<LOCALE>"
+msgstr "B<live-config.locales>=I<GEBIETSSCHEMA> | B<locales>=I<GEBIETSSCHEMA>"
 
 #. type: Plain text
 #: en/live-config.7:43
@@ -245,8 +244,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:43
 #, no-wrap
-msgid "B<live-config.timezone>=I<TIMEZONE>"
-msgstr "B<live-config.timezone>=I<ZEITZONE>"
+msgid "B<live-config.timezone>=I<TIMEZONE> | B<timezone>=I<TIMEZONE>"
+msgstr "B<live-config.timezone>=I<ZEITZONE> | B<timezone>=I<ZEITZONE>"
 
 #. type: Plain text
 #: en/live-config.7:45
@@ -260,8 +259,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:45
 #, no-wrap
-msgid "B<live-config.utc>=B<yes>|no"
-msgstr "B<live-config.utc>=B<yes>|no"
+msgid "B<live-config.utc>=B<yes>|no | B<utc>=B<yes>|no"
+msgstr "B<live-config.utc>=B<yes>|no | B<utc>=B<yes>|no"
 
 #. type: Plain text
 #: en/live-config.7:47
@@ -275,8 +274,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:47
 #, no-wrap
-msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
-msgstr "B<live-config.keyboard-model>=I<TASTATUR_MODELL>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL> | B<keyboard-model>=I<KEYBOARD_MODEL>"
+msgstr "B<live-config.keyboard-model>=I<TASTATUR_MODELL> | B<keyboard-model>=I<TASTATUR_MODELL>"
 
 #. type: Plain text
 #: en/live-config.7:49
@@ -288,8 +287,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:49
 #, no-wrap
-msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
-msgstr "B<live-config.keyboard-layouts>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
+msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn> | B<keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgstr "B<live-config.keyboard-layouts>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn> | B<keyboard-layouts>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
 
 #. type: Plain text
 #: en/live-config.7:51
@@ -305,8 +304,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:51
 #, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<TASTATUR_VARIANTE>"
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgstr "B<live-config.keyboard-variant>=I<TASTATUR_VARIANT> | B<keyboard-variant>=I<TASTATUR_VARIANT>"
 
 #. type: Plain text
 #: en/live-config.7:53
@@ -318,8 +317,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:53
 #, no-wrap
-msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
-msgstr "B<live-config.keyboard-options>=I<TASTATUR_OPTIONEN>"
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS> | B<keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgstr "B<live-config.keyboard-options>=I<TASTATUR_OPTIONEN> | B<keyboard-options>=I<TASTATUR_OPTIONEN>"
 
 #. type: Plain text
 #: en/live-config.7:55
@@ -331,8 +330,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:55
 #, no-wrap
-msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
-msgstr "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn> | B<sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgstr "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn> | B<sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 
 #. type: Plain text
 #: en/live-config.7:57
@@ -342,8 +341,8 @@ msgstr "Ermöglicht Services durch update-rc.d abzuschalten."
 #. type: IP
 #: en/live-config.7:57
 #, no-wrap
-msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
-msgstr "B<live-config.xorg-driver>=I<XORG_TREIBER>"
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER> | B<xorg-driver>=I<XORG_DRIVER>"
+msgstr "B<live-config.xorg-driver>=I<XORG_TREIBER> | B<xorg-driver>=I<XORG_TREIBER>"
 
 #. type: Plain text
 #: en/live-config.7:59
@@ -353,8 +352,8 @@ msgstr "Ermöglicht den Xorg Treiber manuell statt automatisch zu bestimmen."
 #. type: IP
 #: en/live-config.7:59
 #, no-wrap
-msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
-msgstr "B<live-config.xorg-resolution>=I<XORG_AUFLÖSUNG>"
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION> | B<xorg-resolution>=I<XORG_RESOLUTION>"
+msgstr "B<live-config.xorg-resolution>=I<XORG_AUFLÖSUNG> | B<xorg-resolution>=I<XORG_AUFLÖSUNG>"
 
 #. type: Plain text
 #: en/live-config.7:61
@@ -364,8 +363,8 @@ msgstr "Ermöglicht die Xorg Auflösung manuell statt automatisch zu bestimmen."
 #. type: IP
 #: en/live-config.7:61
 #, no-wrap
-msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ...|I<URLn>"
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn> | B<hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn> | B<hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
 
 #. type: Plain text
 #: en/live-config.7:63
@@ -418,8 +417,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:69
 #, no-wrap
-msgid "B<live-config.noroot>"
-msgstr "B<live-config.noroot>"
+msgid "B<live-config.noroot> | B<noroot>"
+msgstr "B<live-config.noroot> | B<noroot>"
 
 #. type: Plain text
 #: en/live-config.7:71
@@ -433,26 +432,39 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
-msgstr "B<live-config.nottyautologin>"
+msgid "B<live-config.noautologin> | B<noautologin>"
+msgstr "B<live-config.nottyautologin> | B<noautologin>"
 
 #. type: Plain text
 #: en/live-config.7:73
+msgid "Disables both the automatic console login and the graphical autologin."
+msgstr ""
+"Schaltet sowohl den den automatischen Login via TTY ab als auch den "
+"automatischen graphischen Login."
+
+#. type: IP
+#: en/live-config.7:73
+#, no-wrap
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
+msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
+
+#. type: Plain text
+#: en/live-config.7:75
 msgid ""
-"Disables the automatic login on the terminal, not affecting the graphical "
+"Disables the automatic login on the console, not affecting the graphical "
 "autologin."
 msgstr ""
 "Schaltet den automatischen Login via TTY ab, dies beeinflusst den "
 "automatisch graphischen Login nicht."
 
 #. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
 #, no-wrap
-msgid "B<live-config.nox11autologin>"
-msgstr "B<live-config.nox11autologin>"
+msgid "B<live-config.nox11autologin> | B<nox11autologin>"
+msgstr "B<live-config.nox11autologin> | B<nox11autologin>"
 
 #. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
 msgid ""
 "Disables the automatic login with any display manager, not affecting tty "
 "autologin."
@@ -461,36 +473,36 @@ msgstr ""
 "den automatischen tty Login nicht."
 
 #. type: SS
-#: en/live-config.7:76
+#: en/live-config.7:78
 #, no-wrap
 msgid "Boot Parameters (special options)"
 msgstr "Boot Parameter (Spezielle Optionen)"
 
 #. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
 msgid "For special use cases there are some special boot paramters."
 msgstr ""
 "Für spezielle Anwendungsfälle gibt es ein paar spezielle Bootparameter."
 
 #. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
 #, no-wrap
-msgid "B<live-config.debug>"
-msgstr "B<live-config.debug>"
+msgid "B<live-config.debug> | B<debug>"
+msgstr "B<live-config.debug> | B<debug>"
 
 #. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
 msgid "Enables debug output in live-config."
 msgstr "Schaltet debug Ausgaben in live-config an."
 
 #. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
 #, no-wrap
 msgid "Configuration Files"
 msgstr "Konfigurationsdateien"
 
 #. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
 msgid ""
 "B<live-config> can be configured (but not activated) through configuration "
 "files. Everything but the shortcuts that can be configured with a boot "
@@ -506,7 +518,7 @@ msgstr ""
 "aktivieren."
 
 #. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:88
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
 "live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
@@ -521,7 +533,7 @@ msgstr ""
 "Live Medium dem der im Root Dateisystem enthaltenen vor."
 
 #. type: Plain text
-#: en/live-config.7:88
+#: en/live-config.7:90
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
 "require a particular name or suffix, it's suggest for consistency to either "
@@ -537,13 +549,13 @@ msgstr ""
 "'debian-eeepc.conf')."
 
 #. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
 #, no-wrap
 msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr "B<LIVE_CONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
 
 #. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
 msgid ""
 "This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
@@ -552,13 +564,13 @@ msgstr ""
 "I<SKRIPTn>' Parameter."
 
 #. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
 #, no-wrap
 msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr "B<LIVE_NOCONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
 
 #. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
 msgid ""
 "This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
@@ -567,13 +579,13 @@ msgstr ""
 "I<SKRIPTn>' Parameter."
 
 #. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
 #, no-wrap
 msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
 msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
 
 #. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
 msgid ""
 "This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
 msgstr ""
@@ -581,13 +593,13 @@ msgstr ""
 "Parameter."
 
 #. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
 #, no-wrap
 msgid "B<LIVE_USERNAME>=I<USERNAME>"
 msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
 
 #. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
 msgid ""
 "This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
 msgstr ""
@@ -595,13 +607,13 @@ msgstr ""
 "Parameter."
 
 #. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
 #, no-wrap
 msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
 msgstr "B<LIVE_USER_FULLNAME>=\"I<VOLLER BENUTZERNAME\">"
 
 #. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
 msgid ""
 "This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
 "parameter."
@@ -610,50 +622,50 @@ msgstr ""
 "BENUTZERNAME>\"' Parameter."
 
 #. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
 #, no-wrap
 msgid "B<LIVE_LOCALES>=I<LOCALE>"
 msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
 
 #. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
 msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
 msgstr ""
 "Diese Variable enspricht dem 'B<live-config.locales>=I<GEBIETSSCHEMA>' "
 "Parameter."
 
 #. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
 #, no-wrap
 msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
 msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
 
 #. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
 msgid ""
 "This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
 msgstr ""
 "Diese Variable enspricht dem 'B<live-config.timezone>=I<ZEITZONE>' Parameter."
 
 #. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
 #, no-wrap
 msgid "B<LIVE_UTC>=B<yes>|no"
 msgstr "B<LIVE_UTC>=B<yes>|no"
 
 #. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
 msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
 msgstr "Diese Variable enspricht dem 'B<live-config.utc>=B<yes>|no' Parameter."
 
 #. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
 msgstr "B<LIVE_KEYBOARD_MODEL>=I<TASTATUR_MODELL>"
 
 #. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
 msgid ""
 "This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
 "parameter."
@@ -662,13 +674,13 @@ msgstr ""
 "model>=I<TASTATUR_MODELL>' Parameter."
 
 #. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
 
 #. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -679,13 +691,13 @@ msgstr ""
 "Parameter."
 
 #. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
 msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TASTATUR_VARIANTE>"
 
 #. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -694,13 +706,13 @@ msgstr ""
 "variant>=I<TASTATUR_VARIANTE>' Parameter."
 
 #. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
 msgstr "B<LIVE_KEYBOARD_OPTIONS>=I<TASTATUR_OPTIONEN>"
 
 #. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -709,13 +721,13 @@ msgstr ""
 "options>=I<TASTATUR_OPTIONEN>' Parameter."
 
 #. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
 #, no-wrap
 msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 msgstr "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 
 #. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
 msgid ""
 "This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
 "I<SERVICEn>' parameter."
@@ -724,13 +736,13 @@ msgstr ""
 "I<SERVICE2> ... I<SERVICEn>' Parameter."
 
 #. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
 #, no-wrap
 msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
 msgstr "B<LIVE_XORG_DRIVER>=I<XORG_TREIBER>"
 
 #. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
 msgid ""
 "This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
 "parameter."
@@ -739,13 +751,13 @@ msgstr ""
 "Parameter."
 
 #. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
 #, no-wrap
 msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
 msgstr "B<LIVE_XORG_RESOLUTION>=I<XORG_AUFLÖSUNG>"
 
 #. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
 msgid ""
 "This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
 "parameter."
@@ -754,13 +766,13 @@ msgstr ""
 "resolution>=I<XORG_AUFLÖSUNG>' Parameter."
 
 #. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
 #, no-wrap
 msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 
 #. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
 msgid ""
 "This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
 "I<URLn>' parameter."
@@ -769,13 +781,13 @@ msgstr ""
 "I<URLn>' Parameter."
 
 #. type: SH
-#: en/live-config.7:122
+#: en/live-config.7:124
 #, no-wrap
 msgid "CUSTOMIZATION"
 msgstr "ANPASSUNG"
 
 #. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:126
 msgid ""
 "B<live-config> can be easily customized for downstream projects or local "
 "usage."
@@ -784,13 +796,13 @@ msgstr ""
 "oder lokale Verwendung."
 
 #. type: SS
-#: en/live-config.7:125
+#: en/live-config.7:127
 #, no-wrap
 msgid "Adding new config scripts"
 msgstr "Hinzufügen von neuen Konfigurationsskripten"
 
 #. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
 msgid ""
 "Downstream projects can put their scripts into /lib/live/config and don't "
 "need to do anything else, the scripts will be called automatically during "
@@ -801,7 +813,7 @@ msgstr ""
 "Startens ausgeführt."
 
 #. type: Plain text
-#: en/live-config.7:129
+#: en/live-config.7:131
 msgid ""
 "The scripts are best put into an own debian package. A sample package "
 "containing an example script can be found in /usr/share/doc/live-config/"
@@ -812,13 +824,13 @@ msgstr ""
 "examples."
 
 #. type: SS
-#: en/live-config.7:130
+#: en/live-config.7:132
 #, no-wrap
 msgid "Removing existing config scripts"
 msgstr "Entfernen von neuen Konfigurationsskripten"
 
 #. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:134
 msgid ""
 "It's not really possible to remove scripts itself in a sane way yet without "
 "requiring to ship a locally modified B<live-config> package. However, the "
@@ -836,7 +848,7 @@ msgstr ""
 "werden, siehe oben."
 
 #. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:136
 msgid ""
 "The configuration files for the live system itself are best put into an own "
 "debian package. A sample package containing an example configuration can be "
@@ -847,235 +859,235 @@ msgstr ""
 "konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
 
 #. type: SH
-#: en/live-config.7:135
+#: en/live-config.7:137
 #, no-wrap
 msgid "SCRIPTS"
 msgstr "SKRIPTE"
 
 #. type: Plain text
-#: en/live-config.7:137
+#: en/live-config.7:139
 msgid ""
 "B<live-config> currently features the following scripts in /lib/live/config."
 msgstr "B<live-config> enthält derzeit folgende Skripte in /lib/live/config."
 
 #. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:140
 #, no-wrap
 msgid "B<hostname>"
 msgstr "B<hostname>"
 
 #. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
 msgid "configures /etc/hostname and /etc/hosts."
 msgstr "konfiguriert /etc/hostname und /etc/hosts."
 
 #. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:142
 #, no-wrap
 msgid "B<user-setup>"
 msgstr "B<user-setup>"
 
 #. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:144
 msgid "adds an live user account."
 msgstr "fügt das Live Benutzerkonto hinzu."
 
 #. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:144
 #, no-wrap
 msgid "B<sudo>"
 msgstr "B<sudo>"
 
 #. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:146
 msgid "grants sudo privileges to the live user."
 msgstr "räumt dem Live Benutzer sudo Privilegien ein."
 
 #. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
 #, no-wrap
 msgid "B<locales>"
 msgstr "B<locales>"
 
 #. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
 msgid "configures locales."
 msgstr "konfiguriert locales."
 
 #. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
 #, no-wrap
 msgid "B<tzdata>"
 msgstr "B<tzdata>"
 
 #. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
 msgid "configures /etc/timezone."
 msgstr "konfiguriert /etc/timezone."
 
 #. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
 #, no-wrap
 msgid "B<gdm>"
 msgstr "B<gdm>"
 
 #. type: Plain text
-#: en/live-config.7:150
-msgid "configures autologin in gdm (lenny)."
-msgstr "konfiguriert Autologin in gdm (lenny)."
+#: en/live-config.7:152
+msgid "configures autologin in gdm."
+msgstr "konfiguriert Autologin in gdm."
 
 #. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
 #, no-wrap
 msgid "B<gdm3>"
 msgstr "B<gdm3>"
 
 #. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
 msgid "configures autologin in gdm3 (squeeze and newer)."
 msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
 
 #. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
 #, no-wrap
 msgid "B<kdm>"
 msgstr "B<kdm>"
 
 #. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
 msgid "configures autologin in kdm."
 msgstr "konfiguriert Autologin in kdm."
 
 #. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
 #, no-wrap
 msgid "B<lxdm>"
 msgstr "B<lxdm>"
 
 #. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
 msgid "configures autologin in lxdm."
 msgstr "konfiguriert Autologin in lxdm."
 
 #. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
 #, no-wrap
 msgid "B<nodm>"
 msgstr "B<nodm>"
 
 #. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
 msgid "configures autologin in nodm."
 msgstr "konfiguriert Autologin in nodm."
 
 #. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
 #, no-wrap
 msgid "B<slim>"
 msgstr "B<slim>"
 
 #. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
 msgid "configures autologin in slim."
 msgstr "konfiguriert Autologin in slim."
 
 #. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
 #, no-wrap
 msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
 msgstr "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze und neuer)"
 
 #. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
 msgid "configures the keyboard."
 msgstr "konfiguriert die Tastatur."
 
 #. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr "B<sysvinit>"
 
 #. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
 msgid "configures sysvinit."
 msgstr "konfiguriert sysvinit."
 
 #. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr "B<sysv-rc>"
 
 #. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
 msgid "configures sysv-rc by disabling listed services."
 msgstr "konfiguriert sysv-rc durch abschalten von angegebenen Services."
 
 #. type: IP
-#: en/live-config.7:166 en/live-config.7:198
+#: en/live-config.7:168 en/live-config.7:200
 #, no-wrap
 msgid "B<login>"
 msgstr "B<login>"
 
 #. type: Plain text
-#: en/live-config.7:168 en/live-config.7:200
+#: en/live-config.7:170 en/live-config.7:202
 msgid "disables lastlog."
 msgstr "schaltet lastlog ab."
 
 #. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
 #, no-wrap
 msgid "B<apport>"
 msgstr "B<apport>"
 
 #. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
 msgid "enables apport."
 msgstr "aktiviert apport."
 
 #. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr "B<gnome-panel-data>"
 
 #. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
 msgid "disables lock button for the screen."
 msgstr "entfernt den Sperrknopf für den Bildschirm."
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr "B<gnome-power-manager>"
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "disables hibernation."
 msgstr "verhindert Hibernation."
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr "B<gnome-screensaver>"
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "disables the screensaver locking the screen."
 msgstr ""
 "schaltet das Sperren des Bildschirmes während der Bildschirmschoner läuft ab."
 
 #. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr "B<initramfs-tools>"
 
 #. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
@@ -1083,134 +1095,134 @@ msgstr ""
 "benutzt wird."
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<kaboom>"
 msgstr "B<kaboom>"
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<kde-services>"
 msgstr "B<kde-services>"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr "B<kpersonalizer>"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables kde configuration wizard (lenny)."
 msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<live-installer-launcher>"
 msgstr "B<live-installer-launcher>"
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "adds live-installer-launcher on users desktop."
 msgstr "fügt live-installer-launcher auf dem Benutzer Desktop hinzu."
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr "B<module-init-tools>"
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid "automatically load some modules on some architectures."
 msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<policykit>"
 msgstr "B<policykit>"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "grant user privilegies through policykit."
 msgstr "räumt dem Benutzer Privilegien durch policykit ein."
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<sslcert>"
 msgstr "B<sslcert>"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "regenerating ssl snake-oil certificates."
 msgstr "erneuert SSL snake-oil Zertifikate."
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr "B<update-notifier>"
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables update-notifier."
 msgstr "schaltet update-notifier ab."
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<anacron>"
 msgstr "B<anacron>"
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "disables anacron."
 msgstr "schaltet anacron aus."
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<util-linux>"
 msgstr "B<util-linux>"
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "disables util-linux' hwclock."
 msgstr "schaltet hwclock von util-linux ab."
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr "B<xserver-xorg>"
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "configures xserver-xorg."
 msgstr "konfiguriert xserver-xorg."
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1219,77 +1231,77 @@ msgstr ""
 "einem HTTP/FTP Server auszuführen."
 
 #. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:207
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:207
+#: en/live-config.7:209
 #, no-wrap
 msgid "B</etc/live/config.conf.d/>"
 msgstr "B</etc/live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
 #, no-wrap
 msgid "B<live/config.conf.d/>"
 msgstr "B<live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
 msgid "I<live-helper>(7)"
 msgstr "I<live-helper>(7)"
 
 #. type: SH
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-config.7:221
+#: en/live-config.7:223
 msgid ""
 "More information about live-config and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1300,13 +1312,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-config package "
 "in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1320,13 +1332,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-config.7:225
+#: en/live-config.7:227
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
 msgid ""
 "live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
 "the Debian project."
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 28339ad..ca8072b 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0~a11\n"
-"POT-Creation-Date: 2010-07-15 19:24+0300\n"
+"Project-Id-Version: live-config 2.0~a14\n"
+"POT-Creation-Date: 2010-07-16 01:43+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
 "Language-Team: none\n"
@@ -23,17 +23,14 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2010-06-20"
-msgid "2010-07-15"
-msgstr "20.06.2010"
+#, no-wrap
+msgid "2010-07-16"
+msgstr "16.07.2010"
 
 #. type: TH
 #: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2.0~a11"
-msgid "2.0~a13"
-msgstr "2.0~a11"
+msgid "2.0~a14"
+msgstr "2.0~a14"
 
 #. type: TH
 #: en/live-config.7:9
@@ -186,7 +183,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:35
 #, no-wrap
-msgid "B<live-config.hostname>=I<HOSTNAME>"
+msgid "B<live-config.hostname>=I<HOSTNAME> | B<hostname>=I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
@@ -199,7 +196,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:37
 #, no-wrap
-msgid "B<live-config.username>=I<USERNAME>"
+msgid "B<live-config.username>=I<USERNAME> | B<username>=I<USERNAME>"
 msgstr ""
 
 #. type: Plain text
@@ -214,7 +211,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:39
 #, no-wrap
-msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\""
+msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\" | B<user-fullname>=\"I<USER FULLNAME>\""
 msgstr ""
 
 #. type: Plain text
@@ -229,7 +226,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:41
 #, no-wrap
-msgid "B<live-config.locales>=I<LOCALE>"
+msgid "B<live-config.locales>=I<LOCALE> | B<locales>=I<LOCALE>"
 msgstr ""
 
 #. type: Plain text
@@ -247,7 +244,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:43
 #, no-wrap
-msgid "B<live-config.timezone>=I<TIMEZONE>"
+msgid "B<live-config.timezone>=I<TIMEZONE> | B<timezone>=I<TIMEZONE>"
 msgstr ""
 
 #. type: Plain text
@@ -262,8 +259,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:45
 #, no-wrap
-msgid "B<live-config.utc>=B<yes>|no"
-msgstr "B<live-config.utc>=B<yes>|no"
+msgid "B<live-config.utc>=B<yes>|no | B<utc>=B<yes>|no"
+msgstr "B<live-config.utc>=B<yes>|no | B<utc>=B<yes>|no"
 
 #. type: Plain text
 #: en/live-config.7:47
@@ -277,7 +274,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:47
 #, no-wrap
-msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL> | B<keyboard-model>=I<KEYBOARD_MODEL>"
 msgstr ""
 
 #. type: Plain text
@@ -290,7 +287,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:49
 #, no-wrap
-msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn> | B<keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr ""
 
 #. type: Plain text
@@ -307,7 +304,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:51
 #, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
 msgstr ""
 
 #. type: Plain text
@@ -320,7 +317,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:53
 #, no-wrap
-msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS> | B<keyboard-options>=I<KEYBOARD_OPTIONS>"
 msgstr ""
 
 #. type: Plain text
@@ -333,7 +330,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:55
 #, no-wrap
-msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn> | B<sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 msgstr ""
 
 #. type: Plain text
@@ -344,7 +341,7 @@ msgstr "Permet de désactiver des services du sysV via update-rc.d."
 #. type: IP
 #: en/live-config.7:57
 #, no-wrap
-msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER> | B<xorg-driver>=I<XORG_DRIVER>"
 msgstr ""
 
 #. type: Plain text
@@ -357,7 +354,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:59
 #, no-wrap
-msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION> | B<xorg-resolution>=I<XORG_RESOLUTION>"
 msgstr ""
 
 #. type: Plain text
@@ -370,8 +367,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:61
 #, no-wrap
-msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn> | B<hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn> | B<hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
 
 #. type: Plain text
 #: en/live-config.7:63
@@ -423,8 +420,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:69
 #, no-wrap
-msgid "B<live-config.noroot>"
-msgstr "B<live-config.noroot>"
+msgid "B<live-config.noroot> | B<noroot>"
+msgstr "B<live-config.noroot> | B<noroot>"
 
 #. type: Plain text
 #: en/live-config.7:71
@@ -438,26 +435,37 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
-msgstr "B<live-config.nottyautologin>"
+msgid "B<live-config.noautologin> | B<noautologin>"
+msgstr "B<live-config.nottyautologin> | B<noautologin>"
 
 #. type: Plain text
 #: en/live-config.7:73
+msgid "Disables both the automatic console login and the graphical autologin."
+msgstr "Désactive l'auto-login sur la console et l'auto-login graphique."
+
+#. type: IP
+#: en/live-config.7:73
+#, no-wrap
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
+msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
+
+#. type: Plain text
+#: en/live-config.7:75
 msgid ""
-"Disables the automatic login on the terminal, not affecting the graphical "
+"Disables the automatic login on the console, not affecting the graphical "
 "autologin."
 msgstr ""
 "Désactive l'auto-login sur la console, mais ne concerne pas l'auto-login "
 "graphique."
 
 #. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
 #, no-wrap
-msgid "B<live-config.nox11autologin>"
-msgstr "B<live-config.nox11autologin>"
+msgid "B<live-config.nox11autologin> | B<nox11autologin>"
+msgstr "B<live-config.nox11autologin> | B<nox11autologin>"
 
 #. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
 msgid ""
 "Disables the automatic login with any display manager, not affecting tty "
 "autologin."
@@ -466,35 +474,35 @@ msgstr ""
 "l'auto-login en console (tty)."
 
 #. type: SS
-#: en/live-config.7:76
+#: en/live-config.7:78
 #, no-wrap
 msgid "Boot Parameters (special options)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
 msgid "For special use cases there are some special boot paramters."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
 #, no-wrap
-msgid "B<live-config.debug>"
-msgstr "B<live-config.debug>"
+msgid "B<live-config.debug> | B<debug>"
+msgstr "B<live-config.debug> | B<debug>"
 
 #. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
 msgid "Enables debug output in live-config."
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
 #, no-wrap
 msgid "Configuration Files"
 msgstr "Fichiers de configuration"
 
 #. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
 msgid ""
 "B<live-config> can be configured (but not activated) through configuration "
 "files. Everything but the shortcuts that can be configured with a boot "
@@ -504,7 +512,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:88
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
 "live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
@@ -519,7 +527,7 @@ msgstr ""
 "ont la préséance sur ceux placés dans la racine du système."
 
 #. type: Plain text
-#: en/live-config.7:88
+#: en/live-config.7:90
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
 "require a particular name or suffix, it's suggest for consistency to either "
@@ -534,123 +542,123 @@ msgstr ""
 "de fichier comme 'debian-eeepc.conf')."
 
 #. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
 #, no-wrap
 msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
 msgid ""
 "This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
 #, no-wrap
 msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
 msgid ""
 "This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
 #, no-wrap
 msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
 msgid ""
 "This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
 #, no-wrap
 msgid "B<LIVE_USERNAME>=I<USERNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
 msgid ""
 "This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
 #, no-wrap
 msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
 msgid ""
 "This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
 #, no-wrap
 msgid "B<LIVE_LOCALES>=I<LOCALE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
 msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
 #, no-wrap
 msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
 msgid ""
 "This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
 #, no-wrap
 msgid "B<LIVE_UTC>=B<yes>|no"
 msgstr "B<LIVE_UTC>=B<yes>|no"
 
 #. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
 msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
 msgstr "Cette variable correspond au paramètre 'B<live-config.utc>=B<yes>|no'."
 
 #. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
 msgid ""
 "This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -658,78 +666,78 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "variant>=I<KEYBOARD_VARIANT>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "options>=I<KEYBOARD_OPTIONS>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
 #, no-wrap
 msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
 msgid ""
 "This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
 "I<SERVICEn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
 #, no-wrap
 msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
 msgid ""
 "This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
 #, no-wrap
 msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
 msgid ""
 "This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
 #, no-wrap
 msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 
 #. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
 msgid ""
 "This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
 "I<URLn>' parameter."
@@ -738,26 +746,26 @@ msgstr ""
 "I<URL2>| ... |I<URLn>'."
 
 #. type: SH
-#: en/live-config.7:122
+#: en/live-config.7:124
 #, no-wrap
 msgid "CUSTOMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:126
 msgid ""
 "B<live-config> can be easily customized for downstream projects or local "
 "usage."
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:125
+#: en/live-config.7:127
 #, no-wrap
 msgid "Adding new config scripts"
 msgstr "Ajout de nouveaux scripts de configuration"
 
 #. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
 msgid ""
 "Downstream projects can put their scripts into /lib/live/config and don't "
 "need to do anything else, the scripts will be called automatically during "
@@ -765,7 +773,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:129
+#: en/live-config.7:131
 msgid ""
 "The scripts are best put into an own debian package. A sample package "
 "containing an example script can be found in /usr/share/doc/live-config/"
@@ -776,13 +784,13 @@ msgstr ""
 "doc/live-config/examples."
 
 #. type: SS
-#: en/live-config.7:130
+#: en/live-config.7:132
 #, no-wrap
 msgid "Removing existing config scripts"
 msgstr "Enlevant des scripts de configuration existant"
 
 #. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:134
 msgid ""
 "It's not really possible to remove scripts itself in a sane way yet without "
 "requiring to ship a locally modified B<live-config> package. However, the "
@@ -793,7 +801,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:136
 msgid ""
 "The configuration files for the live system itself are best put into an own "
 "debian package. A sample package containing an example configuration can be "
@@ -805,234 +813,234 @@ msgstr ""
 "examples."
 
 #. type: SH
-#: en/live-config.7:135
+#: en/live-config.7:137
 #, no-wrap
 msgid "SCRIPTS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:137
+#: en/live-config.7:139
 msgid ""
 "B<live-config> currently features the following scripts in /lib/live/config."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:140
 #, no-wrap
 msgid "B<hostname>"
 msgstr "B<hostname>"
 
 #. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
 msgid "configures /etc/hostname and /etc/hosts."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:142
 #, no-wrap
 msgid "B<user-setup>"
 msgstr "B<user-setup>"
 
 #. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:144
 msgid "adds an live user account."
 msgstr "ajoute un compte live d'utilisateur."
 
 #. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:144
 #, no-wrap
 msgid "B<sudo>"
 msgstr "B<sudo>"
 
 #. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:146
 msgid "grants sudo privileges to the live user."
 msgstr "offre les privilèges sudo à l'utilisateur live."
 
 #. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
 #, no-wrap
 msgid "B<locales>"
 msgstr "B<locales>"
 
 #. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
 msgid "configures locales."
 msgstr "cnofigure les locales."
 
 #. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
 #, no-wrap
 msgid "B<tzdata>"
 msgstr "B<tzdata>"
 
 #. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
 msgid "configures /etc/timezone."
 msgstr "configure /etc/timezone."
 
 #. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
 #, no-wrap
 msgid "B<gdm>"
 msgstr "B<gdm>"
 
 #. type: Plain text
-#: en/live-config.7:150
-msgid "configures autologin in gdm (lenny)."
-msgstr "configure l'auto-login dans gdm (lenny)."
+#: en/live-config.7:152
+msgid "configures autologin in gdm."
+msgstr "configure l'auto-login dans gdm."
 
 #. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
 #, no-wrap
 msgid "B<gdm3>"
 msgstr "B<gdm3>"
 
 #. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
 msgid "configures autologin in gdm3 (squeeze and newer)."
 msgstr "configure l'auto-login dans gdm3 (squeeze et plus récent)."
 
 #. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
 #, no-wrap
 msgid "B<kdm>"
 msgstr "B<kdm>"
 
 #. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
 msgid "configures autologin in kdm."
 msgstr "configure l'auto-login dans kdm."
 
 #. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
 #, no-wrap
 msgid "B<lxdm>"
 msgstr "B<lxdm>"
 
 #. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
 msgid "configures autologin in lxdm."
 msgstr "configure l'auto-login dans lxdm."
 
 #. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
 #, no-wrap
 msgid "B<nodm>"
 msgstr "B<nodm>"
 
 #. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
 msgid "configures autologin in nodm."
 msgstr "configure l'auto-login dans nodm."
 
 #. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
 #, no-wrap
 msgid "B<slim>"
 msgstr "B<slim>"
 
 #. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
 msgid "configures autologin in slim."
 msgstr "configure l'auto-login dans slim."
 
 #. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
 #, no-wrap
 msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
 msgstr "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze et plus récent)"
 
 #. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
 msgid "configures the keyboard."
 msgstr "configure le clavier."
 
 #. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr "B<sysvinit>"
 
 #. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
 msgid "configures sysvinit."
 msgstr "configure sysvinit."
 
 #. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr "B<sysv-rc>"
 
 #. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
 msgid "configures sysv-rc by disabling listed services."
 msgstr "configure sysv-rc en désactivant les services listés."
 
 #. type: IP
-#: en/live-config.7:166 en/live-config.7:198
+#: en/live-config.7:168 en/live-config.7:200
 #, no-wrap
 msgid "B<login>"
 msgstr "B<login>"
 
 #. type: Plain text
-#: en/live-config.7:168 en/live-config.7:200
+#: en/live-config.7:170 en/live-config.7:202
 msgid "disables lastlog."
 msgstr "désactive lastlog."
 
 #. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
 #, no-wrap
 msgid "B<apport>"
 msgstr "B<apport>"
 
 #. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
 msgid "enables apport."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr "B<gnome-panel-data>"
 
 #. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
 msgid "disables lock button for the screen."
 msgstr "désactive le bouton de verrouillage de l'écran."
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr "B<gnome-power-manager>"
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "disables hibernation."
 msgstr "désactive l'hibernation."
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr "B<gnome-screensaver>"
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "disables the screensaver locking the screen."
 msgstr "désactive le verrouillage de session par l'économiseur d'écran."
 
 #. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr "B<initramfs-tools>"
 
 #. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
@@ -1040,135 +1048,135 @@ msgstr ""
 "persistance."
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<kaboom>"
 msgstr "B<kaboom>"
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr "désactive l'assistant de migration de kde (squeeze et plus récent)."
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<kde-services>"
 msgstr "B<kde-services>"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr "désactive des services de KDE non souhaités (squeeze et plus récent)."
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr "B<kerpsonalizer>"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables kde configuration wizard (lenny)."
 msgstr "désactive le lancement du paramétrage de configuration de kde (lenny)."
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<live-installer-launcher>"
 msgstr "B<live-installer-launcher>"
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "adds live-installer-launcher on users desktop."
 msgstr ""
 "ajoute l'installeur (live-installer-launcher) sur le bureau des utilisateurs."
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr "B<module-init-tools>"
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid "automatically load some modules on some architectures."
 msgstr "charge automatiquement certains modules sur certaines architectures."
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<policykit>"
 msgstr "B<policykit>"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "grant user privilegies through policykit."
 msgstr "accorde à l'utilisateur des privilèges via le policykit."
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<sslcert>"
 msgstr "B<sslcert>"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "regenerating ssl snake-oil certificates."
 msgstr "regénère les certificats ssl."
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr "B<update-notifier>"
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables update-notifier."
 msgstr "désactive update-notifier."
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<anacron>"
 msgstr "B<anacron>"
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "disables anacron."
 msgstr "désactive anacron."
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<util-linux>"
 msgstr "B<util-linux>"
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "disables util-linux' hwclock."
 msgstr "désactive util-linux' heure hardware."
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr "B<xserver-xorg>"
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "configures xserver-xorg."
 msgstr "configure xserver-xorg."
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1177,77 +1185,77 @@ msgstr ""
 "média live, ou sur un serveur http/ftp."
 
 #. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:207
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:207
+#: en/live-config.7:209
 #, no-wrap
 msgid "B</etc/live/config.conf.d/>"
 msgstr "B</etc/live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
 #, no-wrap
 msgid "B<live/config.conf.d/>"
 msgstr "B<live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
 msgid "I<live-helper>(7)"
 msgstr "I<live-helper>(7)"
 
 #. type: SH
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:221
+#: en/live-config.7:223
 msgid ""
 "More information about live-config and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1258,13 +1266,13 @@ msgstr ""
 "sur E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-config package "
 "in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1277,13 +1285,13 @@ msgstr ""
 "E<lt>I<debian-live at lists.debian.org>E<gt>"
 
 #. type: SH
-#: en/live-config.7:225
+#: en/live-config.7:227
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
 msgid ""
 "live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
 "the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 3fce14e..9137093 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-07-15 19:24+0300\n"
+"POT-Creation-Date: 2010-07-16 01:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-07-15"
+msgid "2010-07-16"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0~a13"
+msgid "2.0~a14"
 msgstr ""
 
 #. type: TH
@@ -160,7 +160,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:35
 #, no-wrap
-msgid "B<live-config.hostname>=I<HOSTNAME>"
+msgid "B<live-config.hostname>=I<HOSTNAME> | B<hostname>=I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
@@ -171,7 +171,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:37
 #, no-wrap
-msgid "B<live-config.username>=I<USERNAME>"
+msgid "B<live-config.username>=I<USERNAME> | B<username>=I<USERNAME>"
 msgstr ""
 
 #. type: Plain text
@@ -184,7 +184,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:39
 #, no-wrap
-msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\""
+msgid "B<live-config.user-fullname>=\"I<USER FULLNAME>\" | B<user-fullname>=\"I<USER FULLNAME>\""
 msgstr ""
 
 #. type: Plain text
@@ -197,7 +197,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:41
 #, no-wrap
-msgid "B<live-config.locales>=I<LOCALE>"
+msgid "B<live-config.locales>=I<LOCALE> | B<locales>=I<LOCALE>"
 msgstr ""
 
 #. type: Plain text
@@ -211,7 +211,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:43
 #, no-wrap
-msgid "B<live-config.timezone>=I<TIMEZONE>"
+msgid "B<live-config.timezone>=I<TIMEZONE> | B<timezone>=I<TIMEZONE>"
 msgstr ""
 
 #. type: Plain text
@@ -224,7 +224,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:45
 #, no-wrap
-msgid "B<live-config.utc>=B<yes>|no"
+msgid "B<live-config.utc>=B<yes>|no | B<utc>=B<yes>|no"
 msgstr ""
 
 #. type: Plain text
@@ -237,7 +237,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:47
 #, no-wrap
-msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL> | B<keyboard-model>=I<KEYBOARD_MODEL>"
 msgstr ""
 
 #. type: Plain text
@@ -248,7 +248,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:49
 #, no-wrap
-msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn> | B<keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr ""
 
 #. type: Plain text
@@ -262,7 +262,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:51
 #, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
 msgstr ""
 
 #. type: Plain text
@@ -273,7 +273,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:53
 #, no-wrap
-msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS> | B<keyboard-options>=I<KEYBOARD_OPTIONS>"
 msgstr ""
 
 #. type: Plain text
@@ -284,7 +284,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:55
 #, no-wrap
-msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn> | B<sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +295,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:57
 #, no-wrap
-msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER> | B<xorg-driver>=I<XORG_DRIVER>"
 msgstr ""
 
 #. type: Plain text
@@ -306,7 +306,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:59
 #, no-wrap
-msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION> | B<xorg-resolution>=I<XORG_RESOLUTION>"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +317,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:61
 #, no-wrap
-msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn> | B<hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr ""
 
 #. type: Plain text
@@ -356,7 +356,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:69
 #, no-wrap
-msgid "B<live-config.noroot>"
+msgid "B<live-config.noroot> | B<noroot>"
 msgstr ""
 
 #. type: Plain text
@@ -369,59 +369,70 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
+msgid "B<live-config.noautologin> | B<noautologin>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:73
-msgid ""
-"Disables the automatic login on the terminal, not affecting the graphical "
-"autologin."
+msgid "Disables both the automatic console login and the graphical autologin."
 msgstr ""
 
 #. type: IP
 #: en/live-config.7:73
 #, no-wrap
-msgid "B<live-config.nox11autologin>"
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:75
 msgid ""
+"Disables the automatic login on the console, not affecting the graphical "
+"autologin."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:75
+#, no-wrap
+msgid "B<live-config.nox11autologin> | B<nox11autologin>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:77
+msgid ""
 "Disables the automatic login with any display manager, not affecting tty "
 "autologin."
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:76
+#: en/live-config.7:78
 #, no-wrap
 msgid "Boot Parameters (special options)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
 msgid "For special use cases there are some special boot paramters."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
 #, no-wrap
-msgid "B<live-config.debug>"
+msgid "B<live-config.debug> | B<debug>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
 msgid "Enables debug output in live-config."
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
 #, no-wrap
 msgid "Configuration Files"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
 msgid ""
 "B<live-config> can be configured (but not activated) through configuration "
 "files. Everything but the shortcuts that can be configured with a boot "
@@ -431,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:88
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
 "live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
@@ -441,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:88
+#: en/live-config.7:90
 msgid ""
 "Although the configuration files placed in the conf.d directories do not "
 "require a particular name or suffix, it's suggest for consistency to either "
@@ -451,123 +462,123 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
 #, no-wrap
 msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
 msgid ""
 "This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
 #, no-wrap
 msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
 msgid ""
 "This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
 "I<SCRIPTn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
 #, no-wrap
 msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
 msgid ""
 "This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
 #, no-wrap
 msgid "B<LIVE_USERNAME>=I<USERNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
 msgid ""
 "This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
 #, no-wrap
 msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
 msgid ""
 "This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
 #, no-wrap
 msgid "B<LIVE_LOCALES>=I<LOCALE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
 msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
 #, no-wrap
 msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
 msgid ""
 "This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
 #, no-wrap
 msgid "B<LIVE_UTC>=B<yes>|no"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
 msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
 msgid ""
 "This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -575,104 +586,104 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "variant>=I<KEYBOARD_VARIANT>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
 #, no-wrap
 msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
 msgid ""
 "This variable equals the 'B<live-config.keyboard-"
 "options>=I<KEYBOARD_OPTIONS>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
 #, no-wrap
 msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
 msgid ""
 "This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
 "I<SERVICEn>' parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
 #, no-wrap
 msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
 msgid ""
 "This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
 #, no-wrap
 msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
 msgid ""
 "This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
 "parameter."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
 #, no-wrap
 msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
 msgid ""
 "This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
 "I<URLn>' parameter."
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:122
+#: en/live-config.7:124
 #, no-wrap
 msgid "CUSTOMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:126
 msgid ""
 "B<live-config> can be easily customized for downstream projects or local "
 "usage."
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:125
+#: en/live-config.7:127
 #, no-wrap
 msgid "Adding new config scripts"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
 msgid ""
 "Downstream projects can put their scripts into /lib/live/config and don't "
 "need to do anything else, the scripts will be called automatically during "
@@ -680,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:129
+#: en/live-config.7:131
 msgid ""
 "The scripts are best put into an own debian package. A sample package "
 "containing an example script can be found in /usr/share/doc/live-config/"
@@ -688,13 +699,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: en/live-config.7:130
+#: en/live-config.7:132
 #, no-wrap
 msgid "Removing existing config scripts"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:134
 msgid ""
 "It's not really possible to remove scripts itself in a sane way yet without "
 "requiring to ship a locally modified B<live-config> package. However, the "
@@ -705,7 +716,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:136
 msgid ""
 "The configuration files for the live system itself are best put into an own "
 "debian package. A sample package containing an example configuration can be "
@@ -713,444 +724,444 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:135
+#: en/live-config.7:137
 #, no-wrap
 msgid "SCRIPTS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:137
+#: en/live-config.7:139
 msgid ""
 "B<live-config> currently features the following scripts in /lib/live/config."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:140
 #, no-wrap
 msgid "B<hostname>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
 msgid "configures /etc/hostname and /etc/hosts."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:142
 #, no-wrap
 msgid "B<user-setup>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:144
 msgid "adds an live user account."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:144
 #, no-wrap
 msgid "B<sudo>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:146
 msgid "grants sudo privileges to the live user."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
 #, no-wrap
 msgid "B<locales>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
 msgid "configures locales."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
 #, no-wrap
 msgid "B<tzdata>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
 msgid "configures /etc/timezone."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
 #, no-wrap
 msgid "B<gdm>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:150
-msgid "configures autologin in gdm (lenny)."
+#: en/live-config.7:152
+msgid "configures autologin in gdm."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
 #, no-wrap
 msgid "B<gdm3>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
 msgid "configures autologin in gdm3 (squeeze and newer)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
 #, no-wrap
 msgid "B<kdm>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
 msgid "configures autologin in kdm."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
 #, no-wrap
 msgid "B<lxdm>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
 msgid "configures autologin in lxdm."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
 #, no-wrap
 msgid "B<nodm>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
 msgid "configures autologin in nodm."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
 #, no-wrap
 msgid "B<slim>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
 msgid "configures autologin in slim."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
 #, no-wrap
 msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
 msgid "configures the keyboard."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
 msgid "configures sysvinit."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
 msgid "configures sysv-rc by disabling listed services."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:166 en/live-config.7:198
+#: en/live-config.7:168 en/live-config.7:200
 #, no-wrap
 msgid "B<login>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:168 en/live-config.7:200
+#: en/live-config.7:170 en/live-config.7:202
 msgid "disables lastlog."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
 #, no-wrap
 msgid "B<apport>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
 msgid "enables apport."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
 msgid "disables lock button for the screen."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "disables hibernation."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "disables the screensaver locking the screen."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<kaboom>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<kde-services>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables kde configuration wizard (lenny)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<live-installer-launcher>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "adds live-installer-launcher on users desktop."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid "automatically load some modules on some architectures."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<policykit>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "grant user privilegies through policykit."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<sslcert>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "regenerating ssl snake-oil certificates."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables update-notifier."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<anacron>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "disables anacron."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<util-linux>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "disables util-linux' hwclock."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "configures xserver-xorg."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<hooks>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:207
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:207
+#: en/live-config.7:209
 #, no-wrap
 msgid "B</etc/live/config.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:209
+#: en/live-config.7:211
 #, no-wrap
 msgid "B<live/config.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:211
+#: en/live-config.7:213
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:218
+#: en/live-config.7:220
 msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:221
+#: en/live-config.7:223
 msgid ""
 "More information about live-config and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1158,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-config package "
 "in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1173,13 +1184,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:225
+#: en/live-config.7:227
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
 msgid ""
 "live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
 "the Debian project."
diff --git a/scripts/config.sh b/scripts/config.sh
index dc00229..667d4ad 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -1,23 +1,23 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL-3 file.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see <http://www.gnu.org/licenses/>.
+##
+## On Debian systems, the complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
 
 
 set -e
@@ -54,82 +54,89 @@ Cmdline ()
 				;;
 
 			# 001-hostname
-			live-config.hostname=*)
-				LIVE_HOSTNAME="${_PARAMETER#live-config.hostname=}"
+			live-config.hostname=*|hostname=*)
+				LIVE_HOSTNAME="${_PARAMETER#*hostname=}"
 				;;
 
 			# 002-user-setup
-			live-config.username=*)
-				LIVE_USERNAME="${_PARAMETER#live-config.username=}"
+			live-config.username=*|username=*)
+				LIVE_USERNAME="${_PARAMETER#*username=}"
 				;;
 
-			live-config.user-fullname=*)
-				LIVE_USER_FULLNAME="${_PARAMETER#live-config.user-fullname=}"
+			live-config.user-fullname=*|user-fullname=*)
+				LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}"
 				;;
 
 			# 004-locales
-			live-config.locales=*)
-				LIVE_LOCALES="${_PARAMETER#live-config.locales=}"
+			live-config.locales=*|locales=*)
+				LIVE_LOCALES="${_PARAMETER#*locales=}"
 				;;
 
 			# 005-tzdata
-			live-config.timezone=*)
-				LIVE_TIMEZONE="${_PARAMETER#live-config.timezone=}"
+			live-config.timezone=*|timezone=*)
+				LIVE_TIMEZONE="${_PARAMETER#*timezone=}"
 				;;
 
-			live-config.utc=*)
-				LIVE_UTC="${_PARAMETER#live-config.utc=}"
+			live-config.utc=*|utc=*)
+				LIVE_UTC="${_PARAMETER#*utc=}"
 				;;
 
 			# 012-console-setup, 013-keyboard-configuration
-			live-config.keyboard-model=*)
-				LIVE_KEYBOARD_MODEL="${_PARAMETER#live-config.keyboard-model=}"
+			live-config.keyboard-model=*|keyboard-model=*)
+				LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
 				;;
 
-			live-config.keyboard-layouts=*)
-				LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#live-config.keyboard-layouts=}"
+			live-config.keyboard-layouts=*|keyboard-layouts=*)
+				LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
 				;;
 
-			live-config.keyboard-variant=*)
-				LIVE_KEYBOARD_VARIANT="${_PARAMETER#live-config.keyboard-variant=}"
+			live-config.keyboard-variant=*|keyboard-variant=*)
+				LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
 				;;
 
-			live-config.keyboard-options=*)
-				LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
+			live-config.keyboard-options=*|keyboard-options=*)
+				LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
 				;;
 
 			# 014-sysv-rc
-			live-config.sysv-rc=*)
-				LIVE_SYSV_RC="${_PARAMETER#live-config.sysv-rc=}"
+			live-config.sysv-rc=*|sysv-rc=*)
+				LIVE_SYSV_RC="${_PARAMETER#*sysv-rc=}"
 				;;
 
 			# 116-xserver-xorg
-			live-config.xorg-driver=*)
-				LIVE_XORG_DRIVER="${_PARAMETER#live-config.xorg-driver=}"
+			live-config.xorg-driver=*|xorg-driver=*)
+				LIVE_XORG_DRIVER="${_PARAMETER#*xorg-driver=}"
 				;;
 
-			live-config.xorg-resolution=*)
-				LIVE_XORG_RESOLUTION="${_PARAMETER#live-config.xorg-resolution=}"
+			live-config.xorg-resolution=*|xorg-resolution=*)
+				LIVE_XORG_RESOLUTION="${_PARAMETER#*xorg-resolution=}"
 				;;
 
 			# 999-hooks
-			live-config.hooks=*)
-				LIVE_HOOKS="${_PARAMETER#live-config.hooks=}"
+			live-config.hooks=*|hooks=*)
+				LIVE_HOOKS="${_PARAMETER#*hooks=}"
 				;;
 
 			# Shortcuts
-			live-config.noroot)
+			live-config.noroot|noroot)
 				# Disable root access, no matter what mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
 				;;
 
-			live-config.nottyautologin)
+			live-config.noautologin|noautologin)
+				# Disables both console and graphical autologin.
+				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim"
+				;;
+
+			live-config.nottyautologin|nottyautologin)
+				# Disables console autologin.
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
 				;;
 
-			live-config.nox11autologin)
+			live-config.nox11autologin|nox11autologin)
 				# Disables graphical autologin, no matter what
 				# mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
@@ -137,7 +144,7 @@ Cmdline ()
 				;;
 
 			# Special options
-			live-config.debug)
+			live-config.debug|debug)
 				LIVE_DEBUG="true"
 				;;
 		esac
@@ -146,18 +153,18 @@ Cmdline ()
 	# Include requested scripts
 	if [ -n "${LIVE_CONFIGS}" ]
 	then
-		for LIVE_CONFIG in $(echo ${LIVE_CONFIGS} | sed -e 's|,| |g')
+		for _CONFIG in $(echo ${LIVE_CONFIGS} | sed -e 's|,| |g')
 		do
-			_SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${LIVE_CONFIG})"
+			_SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${_CONFIG})"
 		done
 	fi
 
 	# Exclude requested scripts
 	if [ -n "${LIVE_NOCONFIGS}" ]
 	then
-		for LIVE_NOCONFIG in $(echo ${LIVE_NOCONFIGS} | sed -e 's|,| |g')
+		for _NOCONFIG in $(echo ${LIVE_NOCONFIGS} | sed -e 's|,| |g')
 		do
-			_SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${LIVE_NOCONFIG})||")"
+			_SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${_NOCONFIG})||")"
 		done
 	fi
 }
diff --git a/scripts/config/001-hostname b/scripts/config/001-hostname
index fd973c7..80f41cb 100755
--- a/scripts/config/001-hostname
+++ b/scripts/config/001-hostname
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Hostname ()
diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index aa934d3..7e0fd63 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 User_setup ()
diff --git a/scripts/config/003-sudo b/scripts/config/003-sudo
index a35ff16..1a3f86d 100755
--- a/scripts/config/003-sudo
+++ b/scripts/config/003-sudo
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Sudo ()
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index 895b470..57d9dd6 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Locales ()
diff --git a/scripts/config/005-tzdata b/scripts/config/005-tzdata
index 90219e0..6c3879f 100755
--- a/scripts/config/005-tzdata
+++ b/scripts/config/005-tzdata
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Tzdata ()
diff --git a/scripts/config/006-gdm b/scripts/config/006-gdm
index 099cf2f..c5abfdf 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/006-gdm
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Gdm ()
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index 92c2623..978c113 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Gdm3 ()
diff --git a/scripts/config/008-kdm b/scripts/config/008-kdm
index 2d9ca94..d887996 100755
--- a/scripts/config/008-kdm
+++ b/scripts/config/008-kdm
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Kdm ()
diff --git a/scripts/config/009-lxdm b/scripts/config/009-lxdm
index 43926c6..7ed37de 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/009-lxdm
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Lxdm ()
diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index 599ab4b..ed0bfea 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Nodm ()
diff --git a/scripts/config/010-slim b/scripts/config/010-slim
index 122db8d..7b72edc 100755
--- a/scripts/config/010-slim
+++ b/scripts/config/010-slim
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Slim ()
diff --git a/scripts/config/011-console-common b/scripts/config/011-console-common
index d708db6..5748d4f 100755
--- a/scripts/config/011-console-common
+++ b/scripts/config/011-console-common
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Console_common ()
diff --git a/scripts/config/012-console-setup b/scripts/config/012-console-setup
index 0d70e17..f2dc273 100755
--- a/scripts/config/012-console-setup
+++ b/scripts/config/012-console-setup
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Console_setup ()
diff --git a/scripts/config/013-keyboard-configuration b/scripts/config/013-keyboard-configuration
index a837ef8..06279b7 100755
--- a/scripts/config/013-keyboard-configuration
+++ b/scripts/config/013-keyboard-configuration
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Keyboard_configuration ()
diff --git a/scripts/config/014-sysv-rc b/scripts/config/014-sysv-rc
index 780e1da..2038c52 100755
--- a/scripts/config/014-sysv-rc
+++ b/scripts/config/014-sysv-rc
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Sysv_rc ()
diff --git a/scripts/config/014-sysvinit b/scripts/config/014-sysvinit
index 98b40d3..b453f08 100755
--- a/scripts/config/014-sysvinit
+++ b/scripts/config/014-sysvinit
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Sysvinit ()
diff --git a/scripts/config/100-apport b/scripts/config/100-apport
index 4f0617c..60ac506 100755
--- a/scripts/config/100-apport
+++ b/scripts/config/100-apport
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Apport ()
diff --git a/scripts/config/101-gnome-panel-data b/scripts/config/101-gnome-panel-data
index 3631967..410f6f0 100755
--- a/scripts/config/101-gnome-panel-data
+++ b/scripts/config/101-gnome-panel-data
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Gnome_panel_data ()
diff --git a/scripts/config/102-gnome-power-manager b/scripts/config/102-gnome-power-manager
index d394d2b..214de5c 100755
--- a/scripts/config/102-gnome-power-manager
+++ b/scripts/config/102-gnome-power-manager
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Gnome_power_manager ()
diff --git a/scripts/config/103-gnome-screensaver b/scripts/config/103-gnome-screensaver
index ac2a09e..56aa0bc 100755
--- a/scripts/config/103-gnome-screensaver
+++ b/scripts/config/103-gnome-screensaver
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Gnome_screensaver ()
diff --git a/scripts/config/104-initramfs-tools b/scripts/config/104-initramfs-tools
index 4f663ba..dfb8a49 100755
--- a/scripts/config/104-initramfs-tools
+++ b/scripts/config/104-initramfs-tools
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Initramfs_tools ()
diff --git a/scripts/config/105-kaboom b/scripts/config/105-kaboom
index 7f0681a..4ddde63 100755
--- a/scripts/config/105-kaboom
+++ b/scripts/config/105-kaboom
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Kaboom ()
diff --git a/scripts/config/106-kde-services b/scripts/config/106-kde-services
index ccfdcc3..2b777b5 100755
--- a/scripts/config/106-kde-services
+++ b/scripts/config/106-kde-services
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Kde_services ()
diff --git a/scripts/config/107-kpersonalizer b/scripts/config/107-kpersonalizer
index b6e3b5a..6dcd7d9 100755
--- a/scripts/config/107-kpersonalizer
+++ b/scripts/config/107-kpersonalizer
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Kpersonalizer ()
diff --git a/scripts/config/108-live-installer-launcher b/scripts/config/108-live-installer-launcher
index dfd5c1a..87c5aae 100755
--- a/scripts/config/108-live-installer-launcher
+++ b/scripts/config/108-live-installer-launcher
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Live_installer_launcher ()
diff --git a/scripts/config/109-module-init-tools b/scripts/config/109-module-init-tools
index bf13cb2..39e5bee 100755
--- a/scripts/config/109-module-init-tools
+++ b/scripts/config/109-module-init-tools
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Module_init_tools ()
diff --git a/scripts/config/110-policykit b/scripts/config/110-policykit
index dbf43b1..311add3 100755
--- a/scripts/config/110-policykit
+++ b/scripts/config/110-policykit
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Policykit ()
diff --git a/scripts/config/111-sslcert b/scripts/config/111-sslcert
index 76e2b62..aee1f41 100755
--- a/scripts/config/111-sslcert
+++ b/scripts/config/111-sslcert
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Sslcert ()
diff --git a/scripts/config/112-update-notifier b/scripts/config/112-update-notifier
index 7a7ce70..d88b9ec 100755
--- a/scripts/config/112-update-notifier
+++ b/scripts/config/112-update-notifier
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Update_notifier ()
diff --git a/scripts/config/113-anacron b/scripts/config/113-anacron
index 5fa92d0..39a9e87 100755
--- a/scripts/config/113-anacron
+++ b/scripts/config/113-anacron
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Anacron ()
diff --git a/scripts/config/114-util-linux b/scripts/config/114-util-linux
index 3f5c87a..1cc11ac 100755
--- a/scripts/config/114-util-linux
+++ b/scripts/config/114-util-linux
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Util_linux ()
diff --git a/scripts/config/115-login b/scripts/config/115-login
index 3957960..a16ba1c 100755
--- a/scripts/config/115-login
+++ b/scripts/config/115-login
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Login ()
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 4b8e6b6..c7d4384 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Xserver_xorg ()
diff --git a/scripts/config/999-hooks b/scripts/config/999-hooks
index d4b0450..ac42189 100755
--- a/scripts/config/999-hooks
+++ b/scripts/config/999-hooks
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# live-config(7) - System Configuration Scripts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-config(7) - System Configuration Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+##
+## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
 
 
 Hooks ()

-- 
live-config



More information about the debian-live-changes mailing list