[SCM] live-config branch, debian-next, updated. debian/2.0_a5-1-11-g80e3ec7

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 80e3ec78f6d091697235676ff302b538353bb1ee
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 7 13:48:42 2010 +0200

    Renaming noxlogin parameter to noxautologin for consistency.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index d4d0a7d..78ecae0 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -102,7 +102,7 @@ einfache Benutzbarkeit.
 .IP \fBlive\-config.noroot\fP 4
 Schaltet die sudo und policykit Skripte ab, ein Benutzer kann keine root
 Privilegien auf dem System mehr erlangen.
-.IP \fBlive\-config.noxlogin\fP 4
+.IP \fBlive\-config.noxautologin\fP 4
 Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
 den automatischen tty Login.
 
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index d321678..068d882 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -60,7 +60,7 @@ For some common use cases where it would require to combine several individual p
 
 .IP "\fBlive\-config.noroot\fR" 4
 Disables the sudo and policykit, the user cannot gain root privileges on the system.
-.IP "\fBlive\-config.noxlogin\fR" 4
+.IP "\fBlive\-config.noxautologin\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 4292bca..53f327c 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~a5\n"
-"POT-Creation-Date: 2010-06-07 13:40+0300\n"
+"POT-Creation-Date: 2010-06-07 13:47+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"
@@ -380,8 +380,8 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:63
 #, no-wrap
-msgid "B<live-config.noxlogin>"
-msgstr "B<live-config.noxlogin>"
+msgid "B<live-config.noxautologin>"
+msgstr "B<live-config.noxautologin>"
 
 #. type: Plain text
 #: en/live-config.7:65
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 982da85..7dd1ca2 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-07 13:40+0300\n"
+"POT-Creation-Date: 2010-06-07 13:47+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"
@@ -323,7 +323,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:63
 #, no-wrap
-msgid "B<live-config.noxlogin>"
+msgid "B<live-config.noxautologin>"
 msgstr ""
 
 #. type: Plain text
diff --git a/scripts/config.sh b/scripts/config.sh
index b467382..c12c316 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -110,7 +110,7 @@ Cmdline ()
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
 				;;
 
-			live-config.noxlogin)
+			live-config.noxautologin)
 				# Disables graphical autologin, no matter what
 				# mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"

-- 
live-config