[SCM] live-config branch, debian, updated. debian/3.0_a37-1

Daniel Baumann daniel at debian.org
Mon Apr 9 17:06:58 UTC 2012 

The following commit has been merged in the debian branch:
commit 30c55a0f449f83ded89ed91e4a8ec255df8fcfd4
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 6 10:30:39 2012 +0200

    Only looking at config.d files if they have the .conf suffix to allow putting other files into these places that do not necessarily need to be used by live-config (e.g. documentation).

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 6047356..69c7464 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -161,10 +161,10 @@ ist der 'boot=live' Parameter trotzdem noch notwendig um \fBlive\-config\fP zu
 aktivieren.
 .PP
 Die Konfigurationsdateien können entweder im Root Dateisystem selbst
-plaziert werden (/etc/live/config.conf, /etc/live/config.d/) oder auf dem
-Live Medium (live/config.conf, live/config.d/). Wenn beide Orte für eine
-bestimmte Option verwendet werden, geht die Konfigurationsdatei auf dem Live
-Medium dem der im Root Dateisystem enthaltenen vor.
+plaziert werden (/etc/live/config.conf, /etc/live/config.d/*.conf) oder auf
+dem Live Medium (live/config.conf, live/config.d/*.conf). Wenn beide Orte
+für eine bestimmte Option verwendet werden, geht die Konfigurationsdatei auf
+dem Live Medium dem der im Root Dateisystem enthaltenen vor.
 .PP
 Obwohl die Konfigurationsdateien welche in die conf.d Verzeichnisse abgelegt
 werden können keinen bestimmten Namen oder Endung brauchen, ist es aus
@@ -339,9 +339,9 @@ einem HTTP/FTP Server auszuführen.
 
 .SH DATEIEN
 .IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/\fP 4
+.IP \fB/etc/live/config.d/*.conf\fP 4
 .IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/\fP 4
+.IP \fBlive/config.d/*.conf\fP 4
 .IP \fB/lib/live/config.sh\fP 4
 .IP \fB/lib/live/config/\fP 4
 .IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 1ca270a..a8941e6 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -96,7 +96,7 @@ Enables debug output in live\-config.
 .SS Configuration Files
 \fBlive\-config\fR can be configured (but not activated) through configuration files. Everything but the shortcuts that can be configured with a boot parameter can be alternatively also be configured through one or more files. If configuration files are used, the 'boot=live' parameter is still required to activate \fBlive\-config\fR.
 .PP
-Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.d/), or on the live media (live/config.conf, live/config.d/). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
+Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/config.conf, live/config.d/*.conf). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
 .PP
 Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it is suggested for consistency reasons to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
 .PP
@@ -230,9 +230,9 @@ allows to run arbitrary commands from a script placed on the live media or an ht
 
 .SH FILES
 .IP "\fB/etc/live/config.conf\fR" 4
-.IP "\fB/etc/live/config.d/\fR" 4
+.IP "\fB/etc/live/config.d/*.conf\fR" 4
 .IP "\fBlive/config.conf\fR" 4
-.IP "\fBlive/config.d/\fR" 4
+.IP "\fBlive/config.d/*.conf\fR" 4
 .IP "\fB/lib/live/config.sh\fR" 4
 .IP "\fB/lib/live/config/\fR" 4
 .IP "\fB/var/lib/live/config/\fR" 4
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 136ad95..1a717af 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -159,10 +159,10 @@ uno o más ficheros. Aunque se utilicen los ficheros de configuración, el
 parámetro «boot =live» es necesario para activar \fBlive\-config\fP.
 .PP
 Los ficheros de configuración se pueden colocar en el sistema de ficheros
-raíz (/etc/live/config.conf, /etc/live/config.d/), o en el medio en vivo
-(live/config.conf, live/config.d/). Si ambos directorios se utilizan para
-una determinada opción, la del medio en vivo tienen prioridad sobre la del
-sistema de ficheros raíz.
+raíz (/etc/live/config.conf, /etc/live/config.d/*.conf), o en el medio en
+vivo (live/config.conf, live/config.d/*.conf). Si ambos directorios se
+utilizan para una determinada opción, la del medio en vivo tienen prioridad
+sobre la del sistema de ficheros raíz.
 .PP
 Aunque los ficheros de configuración situados en los directorios conf.d no
 requieren un nombre o sufijo en concreto, se sugiere por unificación usar
@@ -330,9 +330,9 @@ el medio en vivo o en un servidor http/ftp.
 
 .SH FICHEROS
 .IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/\fP 4
+.IP \fB/etc/live/config.d/*.conf\fP 4
 .IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/\fP 4
+.IP \fBlive/config.d/*.conf\fP 4
 .IP \fB/lib/live/config.sh\fP 4
 .IP \fB/lib/live/config/\fP 4
 .IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 96c99ca..6e07df6 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -164,10 +164,10 @@ sont utilisés, le paramètre 'boot=live' est toujours requis pour activer
 \fBlive\-config\fP.
 .PP
 Les fichiers de configuration peuvent être placés soit dans la racine du
-système de fichiers (/etc/live/config.conf, /etc/live/config.d/), soit sur
-le média live (live/config.conf, live/config.d/). Si ces deux endroits sont
-utilisés pour une même option, ceux placés dans le média live ont la
-préséance sur ceux placés dans la racine du système.
+système de fichiers (/etc/live/config.conf, /etc/live/config.d/*.conf), soit
+sur le média live (live/config.conf, live/config.d/*.conf). Si ces deux
+endroits sont utilisés pour une même option, ceux placés dans le média live
+ont la préséance sur ceux placés dans la racine du système.
 .PP
 Bien que les fichiers de configuration placés dans les répertoires conf.d ne
 requièrent pas de nom ou suffixe particulier, il est suggéré, par souci de
@@ -341,9 +341,9 @@ média live, ou sur un serveur http/ftp.
 
 .SH FICHIERS
 .IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/\fP 4
+.IP \fB/etc/live/config.d/*.conf\fP 4
 .IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/\fP 4
+.IP \fBlive/config.d/*.conf\fP 4
 .IP \fB/lib/live/config.sh\fP 4
 .IP \fB/lib/live/config/\fP 4
 .IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index d2b9700..be64d4d 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -156,9 +156,9 @@ o più file. Se vengono usati questi file, è ancora richiesto il parametro
 "boot=live" per attivare \fBlive\-config\fP.
 .PP
 I file di configurazione sono collocabili sia nello stesso filesystem di
-root (/etc/live/config.conf, /etc/live/config.d/), sia nel supporto live
-(live/config.conf, live/config.d/). Se per una certa opzione si usano
-entrambe le destinazioni, avrà la precedenza quello del supporto live.
+root (/etc/live/config.conf, /etc/live/config.d/*.conf), sia nel supporto
+live (live/config.conf, live/config.d/*.conf). Se per una certa opzione si
+usano entrambe le destinazioni, avrà la precedenza quello del supporto live.
 .PP
 Anche se i file di configurazione messi nelle directory conf.d non
 richiedono un nome o suffisso particolari, per coerenza è suggerito di usare
@@ -328,9 +328,9 @@ live o su un server http/ftp.
 
 .SH FILE
 .IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/\fP 4
+.IP \fB/etc/live/config.d/*.conf\fP 4
 .IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/\fP 4
+.IP \fBlive/config.d/*.conf\fP 4
 .IP \fB/lib/live/config.sh\fP 4
 .IP \fB/lib/live/config/\fP 4
 .IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 4ccd070..552f98b 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 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+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"
@@ -590,16 +590,16 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 "Die Konfigurationsdateien können entweder im Root Dateisystem selbst "
-"plaziert werden (/etc/live/config.conf, /etc/live/config.d/) oder auf dem "
-"Live Medium (live/config.conf, live/config.d/). Wenn beide Orte für eine "
-"bestimmte Option verwendet werden, geht die Konfigurationsdatei auf dem Live "
-"Medium dem der im Root Dateisystem enthaltenen vor."
+"plaziert werden (/etc/live/config.conf, /etc/live/config.d/*.conf) oder auf "
+"dem Live Medium (live/config.conf, live/config.d/*.conf). Wenn beide Orte "
+"für eine bestimmte Option verwendet werden, geht die Konfigurationsdatei auf "
+"dem Live Medium dem der im Root Dateisystem enthaltenen vor."
 
 #. type: Plain text
 #: en/live-config.7:102
@@ -1384,8 +1384,8 @@ msgstr "B</etc/live/config.conf>"
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
-msgstr "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
+msgstr "B</etc/live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:234
@@ -1396,8 +1396,8 @@ msgstr "B<live/config.conf>"
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
-msgstr "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
+msgstr "B<live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:236
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 74f4312..c1802e5 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+0300\n"
 "PO-Revision-Date: 2011-12-06 17:47+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -587,16 +587,16 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 "Los ficheros de configuración se pueden colocar en el sistema de ficheros "
-"raíz (/etc/live/config.conf, /etc/live/config.d/), o en el medio en vivo "
-"(live/config.conf, live/config.d/). Si ambos directorios se utilizan para "
-"una determinada opción, la del medio en vivo tienen prioridad sobre la del "
-"sistema de ficheros raíz."
+"raíz (/etc/live/config.conf, /etc/live/config.d/*.conf), o en el medio en "
+"vivo (live/config.conf, live/config.d/*.conf). Si ambos directorios se "
+"utilizan para una determinada opción, la del medio en vivo tienen prioridad "
+"sobre la del sistema de ficheros raíz."
 
 #. type: Plain text
 #: en/live-config.7:102
@@ -1376,8 +1376,8 @@ msgstr "B</etc/live/config.conf>"
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
-msgstr "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
+msgstr "B</etc/live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:234
@@ -1388,8 +1388,8 @@ msgstr "B<live/config.conf>"
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
-msgstr "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
+msgstr "B<live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:236
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 28c8e09..1155bf3 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+0300\n"
 "PO-Revision-Date: 2011-12-06 18:02+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -594,16 +594,16 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 "Les fichiers de configuration peuvent être placés soit dans la racine du "
-"système de fichiers (/etc/live/config.conf, /etc/live/config.d/), soit sur "
-"le média live (live/config.conf, live/config.d/). Si ces deux endroits sont "
-"utilisés pour une même option, ceux placés dans le média live ont la "
-"préséance sur ceux placés dans la racine du système."
+"système de fichiers (/etc/live/config.conf, /etc/live/config.d/*.conf), soit "
+"sur le média live (live/config.conf, live/config.d/*.conf). Si ces deux "
+"endroits sont utilisés pour une même option, ceux placés dans le média live "
+"ont la préséance sur ceux placés dans la racine du système."
 
 #. type: Plain text
 #: en/live-config.7:102
@@ -1390,8 +1390,8 @@ msgstr "B</etc/live/config.conf>"
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
-msgstr "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
+msgstr "B</etc/live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:234
@@ -1402,8 +1402,8 @@ msgstr "B<live/config.conf>"
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
-msgstr "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
+msgstr "B<live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:236
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 6114479..b7003ed 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+0300\n"
 "PO-Revision-Date: 2011-12-06 08:01+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: none\n"
@@ -584,15 +584,15 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 "I file di configurazione sono collocabili sia nello stesso filesystem di "
-"root (/etc/live/config.conf, /etc/live/config.d/), sia nel supporto live "
-"(live/config.conf, live/config.d/). Se per una certa opzione si usano "
-"entrambe le destinazioni, avrà la precedenza quello del supporto live."
+"root (/etc/live/config.conf, /etc/live/config.d/*.conf), sia nel supporto "
+"live (live/config.conf, live/config.d/*.conf). Se per una certa opzione si "
+"usano entrambe le destinazioni, avrà la precedenza quello del supporto live."
 
 #. type: Plain text
 #: en/live-config.7:102
@@ -1377,8 +1377,8 @@ msgstr "B</etc/live/config.conf>"
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
-msgstr "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
+msgstr "B</etc/live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:234
@@ -1389,8 +1389,8 @@ msgstr "B<live/config.conf>"
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
-msgstr "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
+msgstr "B<live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:236
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index be7045b..b7c9c01 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
 "Language-Team: none\n"
@@ -574,16 +574,16 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 "Arquivos de configuração podem estar localizados no próprio sistema de "
-"arquivos raiz (/etc/live/config.conf, /etc/live/config.d/) ou na mídia live "
-"(live/config.conf, live/config.d/). Se ambas as localizações são usadas para "
-"determinada opção, as da mídia live assumem precedência sobre as do sistema "
-"de arquivo raiz."
+"arquivos raiz (/etc/live/config.conf, /etc/live/config.d/*.conf) ou na mídia "
+"live (live/config.conf, live/config.d/*.conf). Se ambas as localizações são "
+"usadas para determinada opção, as da mídia live assumem precedência sobre as "
+"do sistema de arquivo raiz."
 
 #. type: Plain text
 #: en/live-config.7:102
@@ -1368,8 +1368,8 @@ msgstr "B</etc/live/config.conf>"
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
-msgstr "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
+msgstr "B</etc/live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:234
@@ -1380,8 +1380,8 @@ msgstr "B<live/config.conf>"
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
-msgstr "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
+msgstr "B<live/config.d/*.conf>"
 
 #. type: IP
 #: en/live-config.7:236
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 1b31241..a4d0922 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: 2012-04-06 10:06+0300\n"
+"POT-Creation-Date: 2012-04-06 10:30+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"
@@ -501,10 +501,10 @@ msgstr ""
 #: en/live-config.7:100
 msgid ""
 "Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/), or on the live media (live/config."
-"conf, live/config.d/). If both places are used for a certain option, the "
-"ones from the live media take precedence over the ones from the root "
-"filesystem."
+"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
+"config.conf, live/config.d/*.conf). If both places are used for a certain "
+"option, the ones from the live media take precedence over the ones from the "
+"root filesystem."
 msgstr ""
 
 #. type: Plain text
@@ -1227,7 +1227,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:233
 #, no-wrap
-msgid "B</etc/live/config.d/>"
+msgid "B</etc/live/config.d/*.conf>"
 msgstr ""
 
 #. type: IP
@@ -1239,7 +1239,7 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:235
 #, no-wrap
-msgid "B<live/config.d/>"
+msgid "B<live/config.d/*.conf>"
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 55978e4..7b1d6e2 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -153,10 +153,10 @@ com exceção dos atalhos. Quando arquivos de configuração são usados, o
 parâmetro 'boot=live' ainda é necessário para a ativação do \fBlive\-config\fP.
 .PP
 Arquivos de configuração podem estar localizados no próprio sistema de
-arquivos raiz (/etc/live/config.conf, /etc/live/config.d/) ou na mídia live
-(live/config.conf, live/config.d/). Se ambas as localizações são usadas para
-determinada opção, as da mídia live assumem precedência sobre as do sistema
-de arquivo raiz.
+arquivos raiz (/etc/live/config.conf, /etc/live/config.d/*.conf) ou na mídia
+live (live/config.conf, live/config.d/*.conf). Se ambas as localizações são
+usadas para determinada opção, as da mídia live assumem precedência sobre as
+do sistema de arquivo raiz.
 .PP
 Apesar de os arquivos de configuração localizados nos diretórios conf.d não
 necessitarem de um nome ou sufixo particular, por uma questão de
@@ -330,9 +330,9 @@ mídia live ou um servidor http/ftp.
 
 .SH ARQUIVOS
 .IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/\fP 4
+.IP \fB/etc/live/config.d/*.conf\fP 4
 .IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/\fP 4
+.IP \fBlive/config.d/*.conf\fP 4
 .IP \fB/lib/live/config.sh\fP 4
 .IP \fB/lib/live/config/\fP 4
 .IP \fB/var/lib/live/config/\fP 4
diff --git a/scripts/config.sh b/scripts/config.sh
index 0e9a8e9..c8c93dc 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -173,9 +173,9 @@ Main ()
 		. /etc/live/config.conf
 	fi
 
-	if ls /etc/live/config.d/* > /dev/null 2>&1
+	if ls /etc/live/config.d/*.conf > /dev/null 2>&1
 	then
-		for _FILE in /etc/live/config.d/*
+		for _FILE in /etc/live/config.d/*.conf
 		do
 			. ${_FILE}
 		done
@@ -187,9 +187,9 @@ Main ()
 		. /live/image/live/config.conf
 	fi
 
-	if ls /live/image/live/config.d/* > /dev/null 2>&1
+	if ls /live/image/live/config.d/*.conf > /dev/null 2>&1
 	then
-		for _FILE in /live/image/live/config.d/*
+		for _FILE in /live/image/live/config.d/*.conf
 		do
 			. ${_FILE}
 		done

-- 
live-config

More information about the debian-live-changes mailing list