diff options
| -rw-r--r-- | man/locale.conf.xml | 18 | ||||
| -rw-r--r-- | man/machine-info.xml | 14 | ||||
| -rw-r--r-- | man/os-release.xml | 6 | ||||
| -rw-r--r-- | man/vconsole.conf.xml | 14 |
4 files changed, 25 insertions, 27 deletions
diff --git a/man/locale.conf.xml b/man/locale.conf.xml index df19f1a435..24be105d4f 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -30,14 +30,13 @@ system-wide locale settings. It is read at early boot by <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> - <para>The basic file format of <filename>locale.conf</filename> is - a newline-separated list of environment-like shell-compatible - variable assignments, ignoring comments and empty lines. - It is possible to source the configuration - from shell scripts, however, beyond mere variable assignments, no - shell features are supported, allowing applications to read the - file without implementing a shell compatible execution - engine.</para> + <para>The format of <filename>locale.conf</filename> is a newline-separated list of environment-like + shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the + configuration from shell scripts, however, beyond mere variable assignments, no shell features are + supported, allowing applications to read the file without implementing a shell compatible execution + engine. See + <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a + detailed description of the format.</para> <para>Note that the kernel command line options <varname>locale.LANG=</varname>, @@ -59,7 +58,7 @@ <para>The locale settings configured in <filename>/etc/locale.conf</filename> are system-wide and are inherited by every service or user, unless overridden or unset by - individual programs or individual users.</para> + individual programs or users.</para> <para>Depending on the operating system, other configuration files might be checked for locale configuration as well, however only as @@ -126,5 +125,4 @@ LC_MESSAGES=en_US.UTF-8</programlisting> <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsect1> - </refentry> diff --git a/man/machine-info.xml b/man/machine-info.xml index d324856d07..0f57cbdb88 100644 --- a/man/machine-info.xml +++ b/man/machine-info.xml @@ -29,13 +29,13 @@ <para>The <filename>/etc/machine-info</filename> file contains machine metadata.</para> - <para>The basic file format of <filename>machine-info</filename> - is a newline-separated list of environment-like shell-compatible - variable assignments. It is possible to source the configuration - from shell scripts, however, beyond mere variable assignments no - shell features are supported, allowing applications to read the - file without implementing a shell compatible execution - engine.</para> + <para>The format of <filename>machine-info</filename> is a newline-separated list of environment-like + shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the + configuration from shell scripts, however, beyond mere variable assignments no shell features are + supported, allowing applications to read the file without implementing a shell compatible execution + engine. See + <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a + detailed description of the format.</para> <para><filename>/etc/machine-info</filename> contains metadata about the machine that is set by the user or administrator. The settings configured here have the highest precedence. When not set, appropriate diff --git a/man/os-release.xml b/man/os-release.xml index 1826a60d1a..f5d6756f89 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -35,7 +35,7 @@ <filename>/usr/lib/os-release</filename> files contain operating system identification data.</para> - <para>The basic file format of <filename>os-release</filename> is a newline-separated list of + <para>The format of <filename>os-release</filename> is a newline-separated list of environment-like shell-compatible variable assignments. It is possible to source the configuration from Bourne shell scripts, however, beyond mere variable assignments, no shell features are supported (this means variable expansion is explicitly not supported), allowing applications to read the file without @@ -44,8 +44,8 @@ 0–9. (Assignments that do not include these special characters may be enclosed in quotes too, but this is optional.) Shell special characters ("$", quotes, backslash, backtick) must be escaped with backslashes, following shell style. All strings should be in UTF-8 encoding, and non-printable characters should not - be used. It is not supported to concatenate multiple individually quoted strings. Lines beginning with - "#" shall be ignored as comments. Blank lines are permitted and ignored.</para> + be used. Concatenation of multiple individually quoted strings is not supported. Lines beginning with "#" + are treated as comments. Blank lines are permitted and ignored.</para> <para>The file <filename>/etc/os-release</filename> takes precedence over <filename>/usr/lib/os-release</filename>. diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index 378812bd2a..e4e2864ff2 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -32,13 +32,13 @@ You can safely mask this file if you want to avoid this kind of initialization. </para> - <para>The basic file format of the - <filename>vconsole.conf</filename> is a newline-separated list of - environment-like shell-compatible variable assignments. It is - possible to source the configuration from shell scripts, however, - beyond mere variable assignments no shell features are supported, - allowing applications to read the file without implementing a - shell compatible execution engine.</para> + <para>The format of <filename>vconsole.conf</filename> is a newline-separated list of environment-like + shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the + configuration from shell scripts, however, beyond mere variable assignments no shell features are + supported, allowing applications to read the file without implementing a shell compatible execution + engine. See + <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a + detailed description of the format.</para> <para>Note that the kernel command line options <varname>vconsole.keymap=</varname>, |