Merge pull request #22044 from keszybz/minor-man-page-adjustments

Minor man page adjustments

man/bootup.xml

@@ -106,21 +106,21 @@
  |  swap.target                       |           |    v     v                 |
  |    |                               v           |  remote-cryptsetup.target  |
  |    |  (various low-level  (various mounts and  |  remote-veritysetup.target |
- |    |   services: udevd,    fsck services...)   |             |    remote-fs.target
+ |    |   services: udevd,    fsck services...)   |             |              |
- |    |   tmpfiles, random            |           |             |             /
+ |    |   tmpfiles, random            |           |             |    remote-fs.target
- |    |   seed, sysctl, ...)          v           |             |            /
+ |    |   seed, sysctl, ...)          v           |             |              |
- |    |      |                 local-fs.target    |             |           /
+ |    |      |                 local-fs.target    |             | _____________/
- |    |      |                        |           |             |          /
+ |    |      |                        |           |             |/
- \____|______|_______________   ______|___________/             |         /
+ \____|______|_______________   ______|___________/             |
-                             \ /                                |        /
+                             \ /                                |
-                              v                                 |       /
+                              v                                 |
-                       sysinit.target                           |      /
+                       sysinit.target                           |
-                              |                                 |     /
+                              |                                 |
-       ______________________/|\_____________________           |    /
+       ______________________/|\_____________________           |
-      /              |        |      |               \          |   /
+      /              |        |      |               \          |
-      |              |        |      |               |          |  /
+      |              |        |      |               |          |
-      v              v        |      v               |          | /
+      v              v        |      v               |          |
- (various       (various      |  (various            |          |/
+ (various       (various      |  (various            |          |
   timers...)      paths...)   |   sockets...)        |          |
       |              |        |      |               |          |
       v              v        |      v               |          |

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
+    <para>The format of <filename>locale.conf</filename> is a newline-separated list of environment-like
-    a newline-separated list of environment-like shell-compatible
+    shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the
-    variable assignments, ignoring comments and empty lines.
+    configuration from shell scripts, however, beyond mere variable assignments, no shell features are
-    It is possible to source the configuration
+    supported, allowing applications to read the file without implementing a shell compatible execution
-    from shell scripts, however, beyond mere variable assignments, no
+    engine. See
-    shell features are supported, allowing applications to read the
+    <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a
-    file without implementing a shell compatible execution
+    detailed description of the format.</para>
-    engine.</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>

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>
+    <para>The format of <filename>machine-info</filename> is a newline-separated list of environment-like
-    is a newline-separated list of environment-like shell-compatible
+    shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the
-    variable assignments. It is possible to source the configuration
+    configuration from shell scripts, however, beyond mere variable assignments no shell features are
-    from shell scripts, however, beyond mere variable assignments no
+    supported, allowing applications to read the file without implementing a shell compatible execution
-    shell features are supported, allowing applications to read the
+    engine. See
-    file without implementing a shell compatible execution
+    <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a
-    engine.</para>
+    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

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
+    be used. Concatenation of multiple individually quoted strings is not supported. Lines beginning with "#"
-    "#" shall be ignored as comments. Blank lines are permitted and ignored.</para>
+    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>.

man/systemd.network.xml

@@ -4554,10 +4554,10 @@ Bridge=bridge0</programlisting>
     </example>
 
     <example>
-      <title></title>
+      <title>Bridge port with VLAN forwarding</title>
 
       <programlisting>
-# /etc/systemd/network/20-bridge-slave-interface-vlan.network
+# /etc/systemd/network/25-bridge-slave-interface-1.network
 [Match]
 Name=enp2s0
 

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
+    <para>The format of <filename>vconsole.conf</filename> is a newline-separated list of environment-like
-    <filename>vconsole.conf</filename> is a newline-separated list of
+    shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the
-    environment-like shell-compatible variable assignments. It is
+    configuration from shell scripts, however, beyond mere variable assignments no shell features are
-    possible to source the configuration from shell scripts, however,
+    supported, allowing applications to read the file without implementing a shell compatible execution
-    beyond mere variable assignments no shell features are supported,
+    engine. See
-    allowing applications to read the file without implementing a
+    <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a
-    shell compatible execution engine.</para>
+    detailed description of the format.</para>
 
     <para>Note that the kernel command line options
     <varname>vconsole.keymap=</varname>,