Merge pull request #30615 from dtardon/docbook-valid-1

DocBook validation fixes (part 1)

diff --git a/man/busctl.xml b/man/busctl.xml
index b6471388bd9168a7f96e5b3e50f11ed5ff567866..612e9733fec3508fb5e9a608194909878bc6092c 100644 (file)
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -44,7 +44,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><command>list</command></term>
+        <term><cmdsynopsis><command>list</command></cmdsynopsis></term>
 
         <listitem><para>Show all peers on the bus, by their service
         names. By default, shows both unique and well-known names, but
@@ -56,7 +56,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>status</command> <arg choice="opt"><replaceable>SERVICE</replaceable></arg></term>
+        <term><cmdsynopsis><command>status</command> <arg choice="opt"><replaceable>SERVICE</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Show process information and credentials of a
         bus service (if one is specified by its unique or well-known
@@ -68,7 +68,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>monitor</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
+        <term><cmdsynopsis><command>monitor</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Dump messages being exchanged. If
         <replaceable>SERVICE</replaceable> is specified, show messages
@@ -81,7 +81,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>capture</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
+        <term><cmdsynopsis><command>capture</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Similar to <command>monitor</command> but
         writes the output in pcapng format (for details, see
@@ -96,7 +96,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>tree</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
+        <term><cmdsynopsis><command>tree</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Shows an object tree of one or more
         services. If <replaceable>SERVICE</replaceable> is specified,
@@ -108,7 +108,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>introspect</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="opt"><replaceable>INTERFACE</replaceable></arg></term>
+        <term><cmdsynopsis><command>introspect</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="opt"><replaceable>INTERFACE</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Show interfaces, methods, properties and
         signals of the specified object (identified by its path) on
@@ -120,7 +120,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>call</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>METHOD</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></term>
+        <term><cmdsynopsis><command>call</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>METHOD</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></cmdsynopsis></term>
 
         <listitem><para>Invoke a method and show the response. Takes a
         service name, object path, interface name and method name. If
@@ -134,7 +134,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>emit</command> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>SIGNAL</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></term>
+        <term><cmdsynopsis><command>emit</command> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>SIGNAL</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></cmdsynopsis></term>
 
         <listitem><para>Emit a signal. Takes an object path, interface name and method name. If parameters
         shall be passed, a signature string is required, followed by the arguments, individually formatted as
@@ -145,7 +145,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>get-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>PROPERTY</replaceable></arg></term>
+        <term><cmdsynopsis><command>get-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>PROPERTY</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Retrieve the current value of one or more
         object properties. Takes a service name, object path,
@@ -159,7 +159,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>set-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>PROPERTY</replaceable></arg> <arg choice="plain"><replaceable>SIGNATURE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></term>
+        <term><cmdsynopsis><command>set-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>PROPERTY</replaceable></arg> <arg choice="plain"><replaceable>SIGNATURE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></cmdsynopsis></term>
 
         <listitem><para>Set the current value of an object
         property. Takes a service name, object path, interface name,
@@ -170,7 +170,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><command>help</command></term>
+        <term><cmdsynopsis><command>help</command></cmdsynopsis></term>
 
         <listitem><para>Show command syntax help.</para>
 

diff --git a/man/cgroup-sandboxing.xml b/man/cgroup-sandboxing.xml
index 56f7c4007b6b7e968aaf15c0c422ec49febbc39d..c9e068f88796f6021d6bddeef5f17ca04fa8bb64 100644 (file)
--- a/man/cgroup-sandboxing.xml
+++ b/man/cgroup-sandboxing.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <!--
   SPDX-License-Identifier: LGPL-2.1-or-later
 -->
 
 <refsect1>
+  <title/>
 
-<para id="singular">This option cannot be bypassed by prefixing <literal>+</literal> to the executable path
-in the service unit, as it applies to the whole control group.</para>
+  <para id="singular">This option cannot be bypassed by prefixing <literal>+</literal> to the executable path
+  in the service unit, as it applies to the whole control group.</para>
 
-<para id="plural">These options cannot be bypassed by prefixing <literal>+</literal> to the executable path
-in the service unit, as it applies to the whole control group.</para>
+  <para id="plural">These options cannot be bypassed by prefixing <literal>+</literal> to the executable path
+  in the service unit, as it applies to the whole control group.</para>
 
 </refsect1>

diff --git a/man/common-variables.xml b/man/common-variables.xml
index 81425e57e20aeb51cae8701ebb1a24b20c27d573..35ac98048fd86506c105f7d041f6b738c13730e5 100644 (file)
--- a/man/common-variables.xml
+++ b/man/common-variables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
@@ -116,24 +116,28 @@
         <varlistentry>
           <term><option>K</option></term>
 
-          <para>This option instructs the pager to exit immediately when
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
-          <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
-          itself to switch back to the pager command prompt, unset this option.</para>
-
-          <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
-          and the pager that is invoked is <command>less</command>,
-          <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
-          executable, and needs to be handled by the pager.</para>
+          <listitem>
+            <para>This option instructs the pager to exit immediately when
+            <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> is pressed. To allow
+            <command>less</command> to handle <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo>
+            itself to switch back to the pager command prompt, unset this option.</para>
+
+            <para>If the value of <varname>$SYSTEMD_LESS</varname> does not include <literal>K</literal>,
+            and the pager that is invoked is <command>less</command>,
+            <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> will be ignored by the
+            executable, and needs to be handled by the pager.</para>
+          </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><option>X</option></term>
 
-          <para>This option instructs the pager to not send termcap initialization and deinitialization
-          strings to the terminal. It is set by default to allow command output to remain visible in the
-          terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
-          working, in particular paged output cannot be scrolled with the mouse.</para>
+          <listitem>
+            <para>This option instructs the pager to not send termcap initialization and deinitialization
+            strings to the terminal. It is set by default to allow command output to remain visible in the
+            terminal even after the pager exits. Nevertheless, this prevents some pager functionality from
+            working, in particular paged output cannot be scrolled with the mouse.</para>
+        </listitem>
         </varlistentry>
       </variablelist>
 

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 126f9675596daef2efa7df52e37eb84027db4081..01072083c202aabfc0e11c1838f9a77f2152ea93 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -387,7 +387,7 @@
         <para>When forwarding to the kernel log buffer (kmsg), make sure to select a suitably large size for
         the log buffer, for example by adding <literal>log_buf_len=8M</literal> to the kernel command line.
         <command>systemd</command> will automatically disable kernel's rate-limiting applied to userspace
-        processes (equivalent to setting <literal>printk.devkmsg=on</literal>).</para></listitem>
+        processes (equivalent to setting <literal>printk.devkmsg=on</literal>).</para>
 
         <para>Note: Forwarding is performed synchronously within journald, and may significantly affect its
         performance.  This is particularly relevant when using ForwardToConsole=yes in cloud environments,
@@ -397,6 +397,7 @@
         journal also becoming blocked.  Unless actively debugging/developing something, it's generally
         preferable to setup a <command>journalctl --follow</command> style service redirected to the
         console, instead of ForwardToConsole=yes, for production use.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 3d228707395415efa154958cebdfa67667f6dd53..02e4b8fc72fd2569eead262989318e9959c17307 100644 (file)
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 

diff --git a/man/networkctl.xml b/man/networkctl.xml
index fbf5a0633ee6ffea9721d20062526a07065ff85f..0ca29d544038de9ea5e3058c87f9c39432ecb848 100644 (file)
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -576,6 +576,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
 
         <xi:include href="version-info.xml" xpointer="v254"/>
         </listitem>
+      </varlistentry>
 
       <varlistentry>
         <term><option>--runtime</option></term>
@@ -587,7 +588,6 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
           <xi:include href="version-info.xml" xpointer="v256"/>
         </listitem>
       </varlistentry>
-      </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="json" />
       <xi:include href="standard-options.xml" xpointer="help" />

diff --git a/man/portablectl.xml b/man/portablectl.xml
index 2044428913baad6c95f07ba8a5ea2faaad7af1a5..6352a8259b414a515ef2b20377a4e3cb22fcc397 100644 (file)
--- a/man/portablectl.xml
+++ b/man/portablectl.xml
@@ -155,11 +155,11 @@
         files. This is a convenience feature to allow all arguments passed as <command>attach</command> also to
         <command>detach</command>.</para>
 
-        <xi:include href="version-info.xml" xpointer="v239"/></listitem>
-
         <para>If <option>--now</option> and/or <option>--enable</option> are passed, the portable services are
         immediately stopped (blocking operation) and/or disabled before detaching the image. Prefix(es) are also accepted,
         to be used in case the unit names do not match the image name as described in the <command>attach</command>.</para>
+
+        <xi:include href="version-info.xml" xpointer="v239"/></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -171,11 +171,11 @@
         character has to match. If the new image doesn't exist, the existing one will not be detached. The parameters
         follow the same syntax as the <command>attach</command> command.</para>
 
-        <xi:include href="version-info.xml" xpointer="v248"/></listitem>
-
         <para>If <option>--now</option> and/or <option>--enable</option> are passed, the portable services are
         immediately stopped if removed, started and/or enabled if added, or restarted if updated. Prefixes are also
         accepted, in the same way as described in the <command>attach</command> case.</para>
+
+        <xi:include href="version-info.xml" xpointer="v248"/></listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/poweroff.xml b/man/poweroff.xml
index f3385357ee2cbc8f5c46b8148af64a8332aac8a4..cb3b4561af114cfe01fd5a6a614bea6989f41104 100644 (file)
--- a/man/poweroff.xml
+++ b/man/poweroff.xml
@@ -55,9 +55,11 @@
       <varlistentry>
         <term><option>--help</option></term>
 
-        <xi:include href="standard-options.xml" xpointer="help-text" />
+        <listitem>
+          <xi:include href="standard-options.xml" xpointer="help-para" />
 
-        <xi:include href="version-info.xml" xpointer="v253"/>
+          <xi:include href="version-info.xml" xpointer="v253"/>
+        </listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 9febbe5f51b0c9e497a9010ae6e2e38864b1fc60..4ef3d393beb9f281d015010bdaff2c57ce54fa01 100644 (file)
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -102,7 +102,7 @@
         <funcdef>int <function>sd_id128_in_set_sentinel</function></funcdef>
         <paramdef>sd_id128_t <parameter>id</parameter></paramdef>
         <paramdef>…</paramdef>
-        <paramdef><constant>SD_ID128_NULL</constant></paramdef>
+        <paramdef><parameter><constant>SD_ID128_NULL</constant></parameter></paramdef>
       </funcprototype>
 
       <funcprototype>

diff --git a/man/sd_bus_call.xml b/man/sd_bus_call.xml
index 6cae300234ddaecfb70f85698a27d8658bc7901b..e9d5345ed326c8ebf755f4e78386659a397e2a9f 100644 (file)
--- a/man/sd_bus_call.xml
+++ b/man/sd_bus_call.xml
@@ -122,22 +122,24 @@
         <varlistentry>
           <term><constant>-EINVAL</constant></term>
 
-          <listitem><para>The input parameter <parameter>m</parameter> is <constant>NULL</constant>.
-          </para>
+          <listitem>
+            <para>The input parameter <parameter>m</parameter> is <constant>NULL</constant>.
+            </para>
 
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+            <para>The input parameter <parameter>m</parameter> is not a D-Bus method call.
+            To create a new D-Bus method call, use
+            <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+            </para>
 
-          <listitem><para>The input parameter <parameter>m</parameter> is not a D-Bus method call.
-          To create a new D-Bus method call, use
-          <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-          </para></listitem>
+            <para>The input parameter <parameter>m</parameter> has the
+            <constant>BUS_MESSAGE_NO_REPLY_EXPECTED</constant> flag set.</para>
 
-          <listitem><para>The input parameter <parameter>m</parameter> has the
-          <constant>BUS_MESSAGE_NO_REPLY_EXPECTED</constant> flag set.</para></listitem>
+            <para>The input parameter <parameter>error</parameter> is
+            non-<constant>NULL</constant> but was not set to <constant>SD_BUS_ERROR_NULL</constant>.
+            </para>
 
-          <listitem><para>The input parameter <parameter>error</parameter> is
-          non-<constant>NULL</constant> but was not set to <constant>SD_BUS_ERROR_NULL</constant>.
-          </para></listitem>
+            <xi:include href="version-info.xml" xpointer="v246"/>
+          </listitem>
         </varlistentry>
 
         <varlistentry>

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index cc2b87401672db40257991643c3cb3d84b79f359..0174c090e91224796ce8cf63d238de41692de73c 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -8,6 +8,8 @@
 -->
 
 <refsection>
+  <title/>
+
   <refsection id='confd'>
     <title>Configuration Directories and Precedence</title>
 

diff --git a/man/standard-options.xml b/man/standard-options.xml
index eb27f5cb65b6c0ef4c877058b11189f4e557d9ed..aec9a0d75091e457caa4f9051ce67d08817dc69b 100644 (file)
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
@@ -11,7 +11,7 @@
     <term><option>--help</option></term>
 
     <listitem id='help-text'>
-      <para>Print a short help text and exit.
+      <para id='help-para'>Print a short help text and exit.
     </para></listitem>
   </varlistentry>
 

diff --git a/man/standard-specifiers.xml b/man/standard-specifiers.xml
index 7aa7acaf600f45346bbbc0b0ab3a37fdb177d557..3a2c0b0266a68b8abd751c932312dfa4610f8995 100644 (file)
--- a/man/standard-specifiers.xml
+++ b/man/standard-specifiers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE tbody PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 

diff --git a/man/supported-controllers.xml b/man/supported-controllers.xml
index 61cdf468d97b381579f9d97b6e4556c376258681..3ec06939e64d2f93e00838b40f2336fc2390c057 100644 (file)
--- a/man/supported-controllers.xml
+++ b/man/supported-controllers.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <!--
   SPDX-License-Identifier: LGPL-2.1-or-later
 -->
 
 <refsect1>
+  <title/>
 
-<para id="controllers-text">The following controller names may be specified: <option>cpu</option>, <option>cpuacct</option>,
-<option>cpuset</option>, <option>io</option>, <option>blkio</option>, <option>memory</option>, <option>devices</option>,
-<option>pids</option>, <option>bpf-firewall</option>, and <option>bpf-devices</option>.</para>
+  <para id="controllers-text">The following controller names may be specified: <option>cpu</option>, <option>cpuacct</option>,
+  <option>cpuset</option>, <option>io</option>, <option>blkio</option>, <option>memory</option>, <option>devices</option>,
+  <option>pids</option>, <option>bpf-firewall</option>, and <option>bpf-devices</option>.</para>
 
 </refsect1>

diff --git a/man/system-only.xml b/man/system-only.xml
index afd3d32bc5aea309c2eb585e116f92923704ef2c..39786e8384717aec2c00ad1038d173ab1dc7140c 100644 (file)
--- a/man/system-only.xml
+++ b/man/system-only.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <!--
   SPDX-License-Identifier: LGPL-2.1-or-later

diff --git a/man/system-or-user-ns.xml b/man/system-or-user-ns.xml
index 532c1ef64e28e94b43c3bed06b0fa3a28fe1e054..1475ed06e248e9f080453e5d3259596fa41e93cb 100644 (file)
--- a/man/system-or-user-ns.xml
+++ b/man/system-or-user-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <!--
   SPDX-License-Identifier: LGPL-2.1-or-later

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 91909ff33f30934cdd1773f582829fdde1e10d96..9eccf8fffc6d1c84d5c67ef755e6a027e455b762 100644 (file)
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -23,7 +23,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>systemd-ask-password <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">MESSAGE</arg></command>
+      <command>systemd-ask-password</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">MESSAGE</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 

diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index d8dbdce87a86cf5692ef779c2da4985fa4f023a0..16aa54937a079687d2c17a4999f6f52d6baaa738 100644 (file)
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -26,8 +26,8 @@
     <cmdsynopsis>
       <command index='false'>/path/to/generator</command>
       <arg choice="plain"><replaceable>normal-dir</replaceable></arg>
-      <arg choice="option"><replaceable>early-dir</replaceable></arg>
-      <arg choice="option"><replaceable>late-dir</replaceable></arg>
+      <arg choice="opt"><replaceable>early-dir</replaceable></arg>
+      <arg choice="opt"><replaceable>late-dir</replaceable></arg>
     </cmdsynopsis>
 
     <para><simplelist>

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index db17211f5851c13dbfd1bbb7363dad155dde694a..07ab26e6f6b0087d2247d6f7f19b3f0112871f4e 100644 (file)
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -223,7 +223,7 @@
           </table>
 
           <para>The PCI domain is only prepended when it is not 0. All multi-function PCI devices will carry
-          the <constant>f<replaceable>function</replaceable></constant> number in the device name, including
+          the <constant>f</constant><replaceable>function</replaceable> number in the device name, including
           the function 0 device. For non-multi-function devices, the number is suppressed if 0. The port name
           <replaceable>port_name</replaceable> is used, or the port number
           <constant>d</constant><replaceable>dev_port</replaceable> if the name is not known.</para>

diff --git a/man/systemd.syntax.xml b/man/systemd.syntax.xml
index 2fc22885ca60b42de71c4bddf20916f847969e9f..a0d63f994ddf1592fc3eddd96557a3ae888ad635 100644 (file)
--- a/man/systemd.syntax.xml
+++ b/man/systemd.syntax.xml
@@ -89,7 +89,7 @@
     file type. When a comment line or lines follow a line ending with a backslash, the comment block
     is ignored, so the continued line is concatenated with whatever follows the comment block.</para>
 
-    <example><programlisting>[Section A]
+    <informalexample><programlisting>[Section A]
 KeyOne=value 1
 KeyTwo=value 2
 
@@ -105,7 +105,7 @@ KeyThree=value 3\
 # this line is ignored
 ; this line is ignored too
        value 3 continued
-</programlisting></example>
+</programlisting></informalexample>
 
     <para>Boolean arguments used in configuration files can be written in
     various formats. For positive settings the strings

diff --git a/man/tc.xml b/man/tc.xml
index 8d39be3d19b06e8bedcc8f3e1a26e700e68e22d2..f845b1588147df3f37931d19e0a2ef9fddddef77 100644 (file)
--- a/man/tc.xml
+++ b/man/tc.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <!--
   SPDX-License-Identifier: LGPL-2.1-or-later
 -->
 
 <refsect1>
+  <title/>
+
   <variablelist class='network-directives'>
     <varlistentry id='qdisc-parent'>
       <term><varname>Parent=</varname></term>

diff --git a/man/telinit.xml b/man/telinit.xml
index 6b59373a60fbcd50632d4638bc79c165d4ee95ec..875f0746e1c4dd60183fd0ec847b83778fc0a925 100644 (file)
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -23,7 +23,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>telinit <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMAND</arg></command>
+      <command>telinit</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMAND</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 

diff --git a/man/threads-aware.xml b/man/threads-aware.xml
index 442e45bbbbadf9a56785d8991aba5847a3aa2c63..bb39266626fbed6bfcb55b5d2240d15abe9180b2 100644 (file)
--- a/man/threads-aware.xml
+++ b/man/threads-aware.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refsect1>
+  <title/>
 
-<para id="strict">All functions listed here are thread-agnostic and only a single specific thread may operate on a
-given object during its entire lifetime. It's safe to allocate multiple independent objects and use each from a
-specific thread in parallel. However, it's not safe to allocate such an object in one thread, and operate or free it
-from any other, even if locking is used to ensure these threads don't operate on it at the very same time.</para>
+  <para id="strict">All functions listed here are thread-agnostic and only a single specific thread may operate on a
+  given object during its entire lifetime. It's safe to allocate multiple independent objects and use each from a
+  specific thread in parallel. However, it's not safe to allocate such an object in one thread, and operate or free it
+  from any other, even if locking is used to ensure these threads don't operate on it at the very same time.</para>
 
-<para id="safe">All functions listed here are thread-safe and may be called in parallel from multiple threads.</para>
+  <para id="safe">All functions listed here are thread-safe and may be called in parallel from multiple threads.</para>
 
-<para id='getenv'>The code described here uses
-<citerefentry project='man-pages'><refentrytitle>getenv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-which is declared to be not multi-thread-safe. This means that the code calling the functions described
-here must not call
-<citerefentry project='man-pages'><refentrytitle>setenv</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-from a parallel thread. It is recommended to only do calls to <function>setenv()</function>
-from an early phase of the program when no other threads have been started.</para>
+  <para id='getenv'>The code described here uses
+  <citerefentry project='man-pages'><refentrytitle>getenv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+  which is declared to be not multi-thread-safe. This means that the code calling the functions described
+  here must not call
+  <citerefentry project='man-pages'><refentrytitle>setenv</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+  from a parallel thread. It is recommended to only do calls to <function>setenv()</function>
+  from an early phase of the program when no other threads have been started.</para>
 
 </refsect1>

diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index f3bafaea389df7785a20f2a292b1de2d7c27e05d..952ac18a4f917fda43e022f732ba0ad6a7cd6d34 100644 (file)
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 

diff --git a/man/veritytab.xml b/man/veritytab.xml
index 43e8c56f29b682a604ed4ca196fabdf545f6e32e..e58edf1a50619c0f24cc751491662495d5635121 100644 (file)
--- a/man/veritytab.xml
+++ b/man/veritytab.xml
@@ -129,7 +129,6 @@ This is based on crypttab(5).
         provided in standard UUID format, e.g. 12345678-1234-1234-1234-123456789abc.</para>
 
         <xi:include href="version-info.xml" xpointer="v254"/></listitem>
-        <listitem><para></para></listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/version-info.xml b/man/version-info.xml
index 5dabf9d31a66ebe8183c54d5fc94aafe48cf412b..414172873dc21e1add66b89444356dfe55b6b0a4 100644 (file)
--- a/man/version-info.xml
+++ b/man/version-info.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refsect1>
+  <title/>
+
   <para id="v183">Added in version 183.</para>
   <para id="v184">Added in version 184.</para>
   <para id="v185">Added in version 185.</para>