Merge pull request #14779 from keszybz/news-v245

2 files changed, 28 insertions, 17 deletions

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index f393283a1d..d54a5de871 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -848,20 +848,19 @@
       <variablelist>
         <varlistentry>
           <term><filename>blockdev@.target</filename></term>
-          <listitem><para>This template unit may be used to order mount units and other consumers of block
-          devices against services that synthesize these block devices. This is intended to be used to order
-          storage services (such as
+          <listitem><para>This template unit is used to order mount units and other consumers of block
+          devices after services that synthesize these block devices. In particular, this is intended to be
+          used with storage services (such as
           <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
-          that allocate and manage a virtual block device against mount units and other consumers of
-          it. Specifically, the storage services are supposed to be orderd before an instance of
-          <filename>blockdev@.target</filename>, and the mount unit (or other consuming unit, such as a swap
-          unit) after it. The ordering is particular relevant during shutdown, as it ensures that the mount
-          is deactivated first and the service backing the mount only deactivated after that completed. The
-          <filename>blockdev@.target</filename> instance should be pulled in via a <option>Wants=</option>
-          dependency of the storage daemon and thus generally not be part of any transaction unless a storage
-          daemon is used. The instance name for instances of this template unit is supposed to be the
-          properly escaped bock device node path, e.g. <filename>blockdev@dev-mapper-foobar.target</filename>
-          for a storage device <filename>/dev/mapper/foobar</filename>.</para></listitem>
+          that allocate and manage a virtual block device. Storage services are ordered before an instance of
+          <filename>blockdev@.target</filename>, and the consumer units after it. The ordering is
+          particularly relevant during shutdown, as it ensures that the mount is deactivated first and the
+          service backing the mount later. The <filename>blockdev@.target</filename> instance should be
+          pulled in via a <option>Wants=</option> dependency of the storage daemon and thus generally not be
+          part of any transaction unless a storage daemon is used. The instance name for instances of this
+          template unit must be a properly escaped block device node path, e.g.
+          <filename>blockdev@dev-mapper-foobar.target</filename> for the storage device
+          <filename>/dev/mapper/foobar</filename>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><filename>cryptsetup-pre.target</filename></term>
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 72d8f62399..c632e8713e 100644
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -25,6 +25,16 @@
     <para><filename>/etc/sysusers.d/*.conf</filename></para>
     <para><filename>/run/sysusers.d/*.conf</filename></para>
     <para><filename>/usr/lib/sysusers.d/*.conf</filename></para>
+
+    <programlisting>
+#Type Name       ID                   GECOS                 Home directory Shell
+u     user_name  uid                  "User Description"    /path/to/shell
+u     user_name  uid:gid              -                     -
+u     user_name  /file/owned/by/user  -                     -
+g     group_name gid                  "Group Description"
+g     group_name /file/owned/by/group -
+m     user_name  group_name
+r     -          lowest-highest</programlisting>
   </refsynopsisdiv>
 
   <refsect1>
@@ -81,11 +91,13 @@
 
     <programlisting>#Type Name     ID             GECOS                 Home directory Shell
 u     httpd    404            "HTTP User"
-u     authd    /usr/bin/authd "Authorization user"
+u     _authd   /usr/bin/authd "Authorization user"
 u     postgres -              "Postgresql Database" /var/lib/pgsql /usr/libexec/postgresdb
 g     input    -              -
-m     authd    input
-u     root     0              "Superuser"           /root          /bin/zsh</programlisting>
+m     _authd   input
+u     root     0              "Superuser"           /root          /bin/zsh
+r     -        500-900
+</programlisting>
 
     <para>Empty lines and lines beginning with the <literal>#</literal> character are ignored, and may be used for
     commenting.</para>
@@ -109,7 +121,7 @@ u     root     0              "Superuser"           /root          /bin/zsh</pro
           <term><varname>g</varname></term>
           <listitem><para>Create a system group of the specified name
           should it not exist yet. Note that <varname>u</varname>
-          implicitly create a matching group. The group will be
+          implicitly creates a matching group. The group will be
           created with no password set.</para></listitem>
         </varlistentry>