Update manpage information of ip= param to correctly reflect what 9990-netbase.sh expects.

12 files changed, 38 insertions, 33 deletions

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 99f66cc..712bfee 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.12.2012 4.0~a2\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-12\-15 4.0~a2\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -110,7 +110,7 @@ LIVE_GENERATE_UUID=1 when building the initramfs.
 If specified, an MD5 sum is calculated on the live media during boot and
 compared to the value found in md5sum.txt found in the root directory of the
 live media.
-.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4
+.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP]]" 4
 Let you specify the name(s) and the options of the interface(s) that should
 be configured at boot time. Do not specify this if you want to use dhcp
 (default). It will be changed in a future release to mimick official kernel
diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index cb2450a..173cc56 100644
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.12.2012 4.0~a2\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-12\-15 4.0~a2\-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 1137f09..9d101e6 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-12\-10 4.0~a2-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-12\-15 4.0~a2-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -74,7 +74,7 @@ Allows to use a filesystem from within an iso image that's available on live-med
 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
 .IP "\fBverify\-checksums\fR" 4
 If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media.
-.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR]]" 4
+.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR]]" 4
 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp).
 .IP "\fBip\fR=[\fIfrommedia\fR]" 4
 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.
diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index b886cc2..a15b9af 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-12\-10 4.0~a2-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-12\-15 4.0~a2-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in
diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index 6d35b55..270a0c3 100644
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.12.2012 4.0~a2\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 2012\-12\-15 4.0~a2\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -116,7 +116,7 @@ configurando LIVE_GENERATE_UUID=1 en el momento de crear el initramfs.
 Si se especifica, se calcula una suma MD5 sobre los medios en vivo durante
 el arranque y se compara con el valor md5sum.txt que se encuentra en el
 directorio raíz de los medios en vivo.
-.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4
+.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP]]" 4
 Permite especificar el nombre(s) y las opciones de la interfaz(ces) que se
 debe configurar en el arranque. No especificar esta opción si se desea
 utilizar DHCP (opción por defecto). Esto cambiará en una futura versión para
diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index d5fd5e2..09e0143 100644
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.12.2012 4.0~a2\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 2012\-12\-15 4.0~a2\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 2f785f9..501f889 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 4.0~a2-1\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,9 +23,10 @@ msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+#, fuzzy, no-wrap
+#| msgid "2012-12-10"
+msgid "2012-12-15"
+msgstr "15.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -338,7 +339,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 0ccb9d2..11830bb 100644
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 4.0~a2-1\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -23,9 +23,10 @@ msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+#, fuzzy, no-wrap
+#| msgid "2012-12-10"
+msgid "2012-12-15"
+msgstr "15.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index 95fcaaa..7cd41c7 100644
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 4.0~a2-1\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,9 +23,10 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+#, fuzzy, no-wrap
+#| msgid "2012-12-10"
+msgid "2012-12-15"
+msgstr "15.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -405,8 +406,9 @@ msgstr ""
 
 #. type: IP
 #: en/live-boot.7:77
-#, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+#, fuzzy, no-wrap
+#| msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
 
 #. type: Plain text
diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index 81b897b..478eb62 100644
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 4.0~a2-1\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -22,9 +22,10 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+#, fuzzy, no-wrap
+#| msgid "2012-12-10"
+msgid "2012-12-15"
+msgstr "15.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 3e96638..144bd1f 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-15"
 msgstr ""
 
 #. type: TH
@@ -339,7 +339,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 4f76c9b..602c035 100644
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:04+0100\n"
+"POT-Creation-Date: 2012-12-15 20:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-15"
 msgstr ""
 
 #. type: TH