From 0534ce38c1f85efcc6e5865f67d1c9e5bb3fbe21 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Sat, 15 Dec 2012 21:02:54 -0600 Subject: [PATCH] Update manpage information of ip= param to correctly reflect what 9990-netbase.sh expects. --- manpages/de/live-boot.de.7 | 4 ++-- manpages/de/persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 4 ++-- manpages/en/persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 4 ++-- manpages/es/persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 10 +++++----- manpages/po/de/persistence.conf.5.po | 8 ++++---- manpages/po/es/live-boot.7.po | 13 +++++++------ manpages/po/es/persistence.conf.5.po | 8 ++++---- manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/persistence.conf.5.pot | 4 ++-- 12 files changed, 34 insertions(+), 33 deletions(-) diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index c0003ac..9cd05dd 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 3.0~b9\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-12\-16 3.0~b9\-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 3e4205e..38a24e4 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 3.0~b9\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-12\-16 3.0~b9\-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 78b7f2b..d7310d0 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-12\-10 3.0~b9-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-12\-16 3.0~b9-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 4d5f99d..d507284 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2012\-12\-10 3.0~b9-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-12\-16 3.0~b9-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 9a3856a..34ab67e 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 3.0~b9\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 2012\-12\-16 3.0~b9\-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 93ed483..614126a 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 3.0~b9\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 2012\-12\-16 3.0~b9\-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 c0b98ec..a558878 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 3.0~b9-1\n" -"POT-Creation-Date: 2012-12-10 20:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -23,9 +23,9 @@ 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-16" +msgstr "16.12.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -338,7 +338,7 @@ msgstr "" #. type: IP #: en/live-boot.7:77 #, no-wrap -msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" +msgid "B=[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]]" msgstr "" #. type: Plain text diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index e419aa4..52cffba 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 3.0~b9-1\n" -"POT-Creation-Date: 2012-12-10 20:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -23,9 +23,9 @@ 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-16" +msgstr "16.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 28e9b65..1f173bf 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 3.0~b9-1\n" -"POT-Creation-Date: 2012-12-10 20:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" "Language-Team: none\n" @@ -23,9 +23,9 @@ 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-16" +msgstr "16.12.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -405,8 +405,9 @@ msgstr "" #. type: IP #: en/live-boot.7:77 -#, no-wrap -msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" +#, fuzzy, no-wrap +#| msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" +msgid "B=[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]]" msgstr "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" #. type: Plain text diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 3a55172..bc2d59b 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 3.0~b9-1\n" -"POT-Creation-Date: 2012-12-10 20:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" "Language-Team: none\n" @@ -22,9 +22,9 @@ 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-16" +msgstr "16.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 330ac4b..6556767 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:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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-16" msgstr "" #. type: TH @@ -339,7 +339,7 @@ msgstr "" #. type: IP #: en/live-boot.7:77 #, no-wrap -msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" +msgid "B=[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]]" msgstr "" #. type: Plain text diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 395efe3..9c0b3d6 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:00+0100\n" +"POT-Creation-Date: 2012-12-16 20:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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-16" msgstr "" #. type: TH