summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Reichelt <debian@nachtgeist.net>2015-09-17 18:37:12 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-06-03 13:42:54 +0000
commit42381c48543ba9ea8e603d36ca2a1e5150244b1a (patch)
tree57e76f14619f97e1fe9575bf866e57783c4ec302
parentAvoiding deadlock during boot by using systemctl --no-block. (diff)
downloadsystem-config-42381c48543ba9ea8e603d36ca2a1e5150244b1a.tar.xz
system-config-42381c48543ba9ea8e603d36ca2a1e5150244b1a.zip
Fixing naming of config snippets in manpages.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--manpages/en/live-config.72
-rw-r--r--manpages/es/live-config.es.78
-rw-r--r--manpages/po/es/live-config.7.po14
-rw-r--r--manpages/po/fr/live-config.7.po6
-rw-r--r--manpages/po/it/live-config.7.po6
-rw-r--r--manpages/po/ja/live-config.7.po6
-rw-r--r--manpages/pot/live-config.7.pot8
7 files changed, 25 insertions, 25 deletions
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 01d5849..ee53b0f 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -110,7 +110,7 @@ Enables debug output in live\-config.
.PP
\fBNote:\fR If configuration files are used, either (preferably) all boot parameters should be put into the \fBLIVE_CONFIG_CMDLINE\fR variable, or individual variables can be set. If individual variables are used, the user is required to ensure that all the necessary variables are set to create a valid configuration.
.PP
-Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/config.conf, live/config.conf.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.
+Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media (live/config.conf, live/config.conf.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 configuration 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 'progress\-linux.conf').
.PP
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 42036ec..0a6bd99 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -201,10 +201,10 @@ el usuario debe asegurarse de crear todas las variables necesarias para
tener una configuración válida.
.PP
Los ficheros de configuración se pueden colocar en el sistema de ficheros
-raíz (/etc/live/config.conf, /etc/live/config.conf.d/*), o en el medio en
-vivo (live/config.conf, live/config.conf.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.
+raíz (/etc/live/config.conf, /etc/live/config.conf.d/*.conf), o en el medio
+en vivo (live/config.conf, live/config.conf.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 de
configuración no requieren un nombre o sufijo en concreto, se sugiere, por
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index e0ed85d..c7df0bf 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\n"
-"POT-Creation-Date: 2015-08-21 11:15+0200\n"
+"POT-Creation-Date: 2015-09-17 20:33+0200\n"
"PO-Revision-Date: 2015-08-21 11:45+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -687,16 +687,16 @@ msgstr ""
#: en/live-config.7:114
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/"
-"config.conf, live/config.conf.d/*.conf). If both places are used for a "
+"live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media "
+"(live/config.conf, live/config.conf.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.conf.d/*), o en el medio en "
-"vivo (live/config.conf, live/config.conf.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."
+"raíz (/etc/live/config.conf, /etc/live/config.conf.d/*.conf), o en el medio "
+"en vivo (live/config.conf, live/config.conf.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:116
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index c301b5e..44aec01 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\n"
-"POT-Creation-Date: 2015-08-21 11:15+0200\n"
+"POT-Creation-Date: 2015-09-17 20:33+0200\n"
"PO-Revision-Date: 2013-06-25 20:32+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -695,8 +695,8 @@ msgstr ""
#: en/live-config.7:114
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/"
-"config.conf, live/config.conf.d/*.conf). If both places are used for a "
+"live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media "
+"(live/config.conf, live/config.conf.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 ""
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index b9f4ea8..721cc7b 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\n"
-"POT-Creation-Date: 2015-08-21 11:15+0200\n"
+"POT-Creation-Date: 2015-09-17 20:33+0200\n"
"PO-Revision-Date: 2013-09-29 18:59+0200\n"
"Last-Translator: skizzhg <skizzhg@gmx.com>\n"
"Language-Team: none\n"
@@ -685,8 +685,8 @@ msgstr ""
#: en/live-config.7:114
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/"
-"config.conf, live/config.conf.d/*.conf). If both places are used for a "
+"live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media "
+"(live/config.conf, live/config.conf.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 ""
diff --git a/manpages/po/ja/live-config.7.po b/manpages/po/ja/live-config.7.po
index 2aafa8b..9b4a9e5 100644
--- a/manpages/po/ja/live-config.7.po
+++ b/manpages/po/ja/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config\n"
-"POT-Creation-Date: 2015-08-21 11:15+0200\n"
+"POT-Creation-Date: 2015-09-17 20:33+0200\n"
"PO-Revision-Date: 2015-08-21 18:15+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
@@ -676,8 +676,8 @@ msgstr ""
#: en/live-config.7:114
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/"
-"config.conf, live/config.conf.d/*.conf). If both places are used for a "
+"live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media "
+"(live/config.conf, live/config.conf.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 ""
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 797c927..2fdd4d7 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: live-config 5.0~a4-1\n"
-"POT-Creation-Date: 2015-08-21 11:15+0200\n"
+"Project-Id-Version: live-config 5.0~a5-1\n"
+"POT-Creation-Date: 2015-09-17 20:33+0200\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"
@@ -572,8 +572,8 @@ msgstr ""
#: en/live-config.7:114
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/*), or on the live media (live/"
-"config.conf, live/config.conf.d/*.conf). If both places are used for a "
+"live/config.conf, /etc/live/config.conf.d/*.conf), or on the live media "
+"(live/config.conf, live/config.conf.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 ""