[SCM] live-config branch, debian-next, updated. debian/2.0_a13-1-9-ga8354bb

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

The following commit has been merged in the debian-next branch:
commit a8354bb55a5e5a0b709693572d5ff9583b1b2d44
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 16 01:16:42 2010 +0200

    Updating manpages to reflect that short options are enabled now.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index f6b89b6..a439043 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -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,20 @@ 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 | \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
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 70507a9..6cda25b 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -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,17 @@ 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
+.IP "\fBlive\-config.nottyautologin\fR | \fBnottyautologin\fR" 4
 Disables the automatic login on the terminal, not affecting the graphical autologin.
-.IP "\fBlive\-config.nox11autologin\fR" 4
+.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
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 9d1e5f8..f0d7359 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -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,20 @@ 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 | \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"
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 3552d38..0e24702 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 2.0~a13\n"
-"POT-Creation-Date: 2010-07-16 00:57+0300\n"
+"POT-Creation-Date: 2010-07-16 01:06+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"
@@ -184,8 +184,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 +197,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 +212,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 +227,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 +245,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 +260,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 +275,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 +288,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 +305,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 +318,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 +331,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 +342,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 +353,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 +364,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 +418,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,8 +433,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
-msgstr "B<live-config.nottyautologin>"
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
+msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
 
 #. type: Plain text
 #: en/live-config.7:73
@@ -448,8 +448,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:73
 #, 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
@@ -475,8 +475,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:79
 #, 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
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index c3b819f..7f33233 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 2.0~a13\n"
-"POT-Creation-Date: 2010-07-16 00:57+0300\n"
+"POT-Creation-Date: 2010-07-16 01:06+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"
@@ -184,7 +184,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
@@ -197,7 +197,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
@@ -212,7 +212,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
@@ -227,7 +227,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
@@ -245,7 +245,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
@@ -260,8 +260,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,7 +275,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
@@ -288,7 +288,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
@@ -305,7 +305,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
@@ -318,7 +318,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
@@ -331,7 +331,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
@@ -342,7 +342,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
@@ -355,7 +355,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
@@ -368,8 +368,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
@@ -421,8 +421,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
@@ -436,8 +436,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
-msgstr "B<live-config.nottyautologin>"
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
+msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
 
 #. type: Plain text
 #: en/live-config.7:73
@@ -451,8 +451,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:73
 #, 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
@@ -477,8 +477,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:79
 #, 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
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 9b46706..c389752 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-16 00:57+0300\n"
+"POT-Creation-Date: 2010-07-16 01:06+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"
@@ -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,7 +369,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:71
 #, no-wrap
-msgid "B<live-config.nottyautologin>"
+msgid "B<live-config.nottyautologin> | B<nottyautologin>"
 msgstr ""
 
 #. type: Plain text
@@ -382,7 +382,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:73
 #, no-wrap
-msgid "B<live-config.nox11autologin>"
+msgid "B<live-config.nox11autologin> | B<nox11autologin>"
 msgstr ""
 
 #. type: Plain text
@@ -406,7 +406,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:79
 #, no-wrap
-msgid "B<live-config.debug>"
+msgid "B<live-config.debug> | B<debug>"
 msgstr ""
 
 #. type: Plain text

-- 
live-config

More information about the debian-live-changes mailing list