[SCM] live-config branch, debian, updated. debian/2.0_a7-1-12-gab82ffb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 80b24aaa25d9557b492f8bdb30dcdd31cd94b53e
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 9 10:30:32 2010 +0200

    Renaming noxautologin parameter to nox11autologin for consistency.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 29b30e1..f2e63cb 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 08.06.2010 2.0~a7 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 2010\-06\-09 2.0~a7 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-config\fP \- System Konfiguration Skripte
@@ -109,7 +109,7 @@ Privilegien auf dem System mehr erlangen.
 .IP \fBlive\-config.nottyautologin\fP 4
 Schaltet den automatischen Login via TTY ab, dies beeinflusst den
 automatisch graphischen Login nicht.
-.IP \fBlive\-config.noxautologin\fP 4
+.IP \fBlive\-config.nox11autologin\fP 4
 Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
 den automatischen tty Login nicht.
 
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index b943c2e..7ff3bdb 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\-06\-08 2.0~a7 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-09 2.0~a7 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts
@@ -66,7 +66,7 @@ For some common use cases where it would require to combine several individual p
 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.noxautologin\fR" 4
+.IP "\fBlive\-config.nox11autologin\fR" 4
 Disables the automatic login with any display manager, not affecting tty autologin.
 
 .SS Configuration Files
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index e9cb351..87a6adc 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~a7\n"
-"POT-Creation-Date: 2010-06-08 20:21+0300\n"
+"POT-Creation-Date: 2010-06-09 10:29+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"
@@ -23,9 +23,8 @@ msgstr "LIVE-CONFIG"
 
 #. type: TH
 #: en/live-config.7:9
-#, no-wrap
-msgid "2010-06-08"
-msgstr "08.06.2010"
+msgid "2010-06-09"
+msgstr "09.06.2010"
 
 #. type: TH
 #: en/live-config.7:9
@@ -417,8 +416,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:69
 #, no-wrap
-msgid "B<live-config.noxautologin>"
-msgstr "B<live-config.noxautologin>"
+msgid "B<live-config.nox11autologin>"
+msgstr "B<live-config.nox11autologin>"
 
 #. type: Plain text
 #: en/live-config.7:71
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index c2c2e56..391da88 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-06-08 20:21+0300\n"
+"POT-Creation-Date: 2010-06-09 10:29+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,7 +24,7 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-06-08"
+msgid "2010-06-09"
 msgstr ""
 
 #. type: TH
@@ -358,7 +358,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:69
 #, no-wrap
-msgid "B<live-config.noxautologin>"
+msgid "B<live-config.nox11autologin>"
 msgstr ""
 
 #. type: Plain text
diff --git a/scripts/config.sh b/scripts/config.sh
index f98071c..f4da885 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -124,7 +124,7 @@ Cmdline ()
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
 				;;
 
-			live-config.noxautologin)
+			live-config.nox11autologin)
 				# Disables graphical autologin, no matter what
 				# mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"

-- 
live-config