diff --git a/man/crypttab.xml b/man/crypttab.xml
index 2ebc3bf20a..c91e8c2819 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -903,7 +903,7 @@
         <term><option>tpm2-pcrlock=</option></term>
 
         <listitem><para>Takes an absolute path to a TPM2 pcrlock policy file, as produced by the
-        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         tool. This permits locking LUKS2 volumes to a local policy of allowed PCR values with
         variants. See
         <citerefentry><refentrytitle>systemd-cryptenroll</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 7d3f22f96b..7792617e51 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -91,7 +91,7 @@
         configures the time to wait for the connectivity to get restored. If the server is
         not reachable over the network for the configured time, <command>systemd-journal-upload</command>
         exits. Takes a value in seconds (or in other time units if suffixed with "ms", "min", "h", etc).
-        For details, see <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        For details, see <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         </para>
 
         <xi:include href="version-info.xml" xpointer="v249"/></listitem>
diff --git a/man/libsystemd.xml b/man/libsystemd.xml
index de41d2bf72..2e1f5f5f37 100644
--- a/man/libsystemd.xml
+++ b/man/libsystemd.xml
@@ -82,7 +82,7 @@
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>libudev</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>libudev</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><ulink url="https://systemd.io/PORTABILITY_AND_STABILITY/">Interface Portability and Stability Promise</ulink></member>
     </simplelist></para>
diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml
index 0922eef3af..34088d2d19 100644
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@@ -175,7 +175,7 @@ netgroup:       nis</programlisting>
       <member><citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>nss-mymachines</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>nsswitch.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 
diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml
index 9e712c94c2..e6eac25180 100644
--- a/man/org.freedesktop.hostname1.xml
+++ b/man/org.freedesktop.hostname1.xml
@@ -259,7 +259,7 @@ node /org/freedesktop/hostname1 {
     are not necessary. Use
     <citerefentry project="man-pages"><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
     <filename>/etc/hostname</filename> (possibly with per-distribution fallbacks), and
-    <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     for that. For more information on these files and syscalls see the respective man pages.</para>
 
     <para><varname>KernelName</varname>, <varname>KernelRelease</varname>, and
@@ -376,7 +376,7 @@ node /org/freedesktop/hostname1 {
 
     <para>To properly handle name lookups with changing local hostnames without having to edit
     <filename>/etc/hosts</filename>, we recommend using <filename>systemd-hostnamed</filename> in combination
-    with <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+    with <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     </para>
 
     <para>Here are some recommendations to follow when generating a static (internet) hostname from a pretty
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 7e8b124c09..9cd6a69311 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -1553,7 +1553,7 @@ node /org/freedesktop/systemd1 {
 
       <para>Similarly, <function>PresetUnitFiles()</function> enables/disables one or more unit files
       according to the preset policy. See
-      <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more
+      <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more
       information.</para>
 
       <para>Similarly, <function>MaskUnitFiles()</function> masks unit files and
@@ -4740,7 +4740,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <para><varname>TimeoutStartUSec</varname>, <varname>TimeoutStopUSec</varname> and
       <varname>TimeoutAbortUSec</varname> contain the start, stop and abort timeouts, in microseconds. Note
       the slight difference in naming when compared to the matching unit file settings (see
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>7</manvolnum></citerefentry>):
+      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
       these bus properties strictly use microseconds (and thus are suffixed <varname>…USec</varname>) while
       the unit file settings default to a time unit of seconds (and thus are suffixed
       <varname>…Sec</varname>), unless a different unit is explicitly specified. This reflects that fact that
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 5a2ca4636a..c568fbf4bc 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -289,7 +289,7 @@ int main(int argc, char **argv) {
       <member><citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
     </simplelist></para>
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 0630329eb5..10b326d668 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -562,7 +562,7 @@
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fork</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>execve</refentrytitle><manvolnum>2</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>credentials</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
diff --git a/man/sd_bus_message_new_signal.xml b/man/sd_bus_message_new_signal.xml
index 356c4ad45a..78645650c0 100644
--- a/man/sd_bus_message_new_signal.xml
+++ b/man/sd_bus_message_new_signal.xml
@@ -56,7 +56,7 @@
     parameter. The signal will be sent to path <parameter>path</parameter>, on the interface
     <parameter>interface</parameter>, member <parameter>member</parameter>. When this message is
     sent, no reply is expected. See
-    <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     for a short description of the meaning of the <parameter>path</parameter>,
     <parameter>interface</parameter>, and <parameter>member</parameter> parameters.
     </para>
diff --git a/man/sd_bus_message_verify_type.xml b/man/sd_bus_message_verify_type.xml
index 0944079e82..878643d133 100644
--- a/man/sd_bus_message_verify_type.xml
+++ b/man/sd_bus_message_verify_type.xml
@@ -40,7 +40,7 @@
     current location in the message <parameter>m</parameter> matches the specified
     <parameter>type</parameter> and <parameter>contents</parameter>. If non-zero, parameter
     <parameter>type</parameter> must be one of the types specified in
-    <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+    <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
     If non-null, parameter <parameter>contents</parameter> must be a valid sequence of complete
     types. If both <parameter>type</parameter> and <parameter>contents</parameter> are specified
     <parameter>type</parameter> must be a container type.</para>
diff --git a/man/sd_bus_reply_method_error.xml b/man/sd_bus_reply_method_error.xml
index 66a49fed47..d9ca18d473 100644
--- a/man/sd_bus_reply_method_error.xml
+++ b/man/sd_bus_reply_method_error.xml
@@ -156,7 +156,7 @@
       </variablelist>
 
       <para>In addition, any error returned by
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
       may be returned.</para>
     </refsect2>
   </refsect1>
diff --git a/man/sd_bus_reply_method_return.xml b/man/sd_bus_reply_method_return.xml
index aca5554bc5..753edf444c 100644
--- a/man/sd_bus_reply_method_return.xml
+++ b/man/sd_bus_reply_method_return.xml
@@ -111,7 +111,7 @@
       </variablelist>
 
       <para>In addition, any error returned by
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
       may be returned.</para>
     </refsect2>
   </refsect1>
diff --git a/man/sd_hwdb_new.xml b/man/sd_hwdb_new.xml
index 56f922b55b..8cbe1b560f 100644
--- a/man/sd_hwdb_new.xml
+++ b/man/sd_hwdb_new.xml
@@ -138,7 +138,7 @@
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>sd-hwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 
diff --git a/man/smbios-type-11.xml b/man/smbios-type-11.xml
index 2fc215ecbd..4d78f612e7 100644
--- a/man/smbios-type-11.xml
+++ b/man/smbios-type-11.xml
@@ -29,7 +29,7 @@
 
     <para>Various OS components process SMBIOS Type 11 vendor strings that a virtual machine manager (VMM)
     may set and a virtual machine (VM) receives. SMBIOS Type 11 vendor strings may play a similar role as
-    <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>
     parameters but generally are under control of the VMM rather than the boot loader or UKI.</para>
 
     <para>For details on SMBIOS Type 11 see the <ulink url="https://www.dmtf.org/standards/smbios/">System
@@ -60,7 +60,7 @@
 
         <listitem><para>This allows configuration of additional kernel command line options, and is read by
         the kernel UEFI stub. For details see
-        <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+        <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
 
         <xi:include href="version-info.xml" xpointer="v254"/></listitem>
       </varlistentry>
@@ -70,7 +70,7 @@
 
         <listitem><para>This allows configuration of additional kernel command line options for Boot Loader
         Specification Type 1 entries, and is read by <command>systemd-boot</command>. For details see
-        <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+        <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml
index 4fab74b8cc..63d378fbc6 100644
--- a/man/systemd-cryptenroll.xml
+++ b/man/systemd-cryptenroll.xml
@@ -628,7 +628,7 @@
 
         <listitem><para>Configures a TPM2 pcrlock policy to bind encryption to. Expects a path to a pcrlock
         policy file as generated by the
-        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         tool. If a TPM2 device is enrolled and this option is not used but a file
         <filename>pcrlock.json</filename> is found in <filename>/run/systemd/</filename> or
         <filename>/var/lib/systemd/</filename> it is automatically used. Assign an empty string to turn this
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index c5b3d85b52..a084f9d08c 100644
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.service.xml
@@ -86,7 +86,7 @@
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-repart</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='url'><refentrytitle url='https://btrfs.readthedocs.io/en/latest/mkfs.btrfs.html'>mkfs.btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
index b55e5deab1..eaf092860c 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -90,7 +90,7 @@
       <member><citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>4</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-boot-random-seed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
diff --git a/man/systemd-repart.xml b/man/systemd-repart.xml
index 575be14912..261053392e 100644
--- a/man/systemd-repart.xml
+++ b/man/systemd-repart.xml
@@ -699,7 +699,7 @@ systemd-repart --make-ddi=sysext \
 systemd-sysext refresh</programlisting>
 
       <para>The DDI generated that way may be applied to the system with
-      <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+      <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
     </example>
 
   </refsect1>
diff --git a/man/systemd-run-generator.xml b/man/systemd-run-generator.xml
index a78c1898bc..f7515239e8 100644
--- a/man/systemd-run-generator.xml
+++ b/man/systemd-run-generator.xml
@@ -37,7 +37,7 @@
     <varname>FailureAction=exit</varname> configured by default, thus ensuring that the system is shut down as soon as
     the command completes. The exit status of the command line is propagated to the invoking container manager, if
     this applies (which might propagate this further, to the calling shell — e.g.
-    <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>7</manvolnum></citerefentry> does this). If
+    <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> does this). If
     this option is used multiple times the unit file will contain multiple <varname>ExecStart=</varname> lines, to
     execute all commands in order. The command is started as regular service, i.e. with
     <varname>DefaultDependencies=</varname> on. </para>
@@ -55,7 +55,7 @@
     <title>Example</title>
 
     <para>Use a command like the following to add a user to the user database inside a container run with
-    <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>7</manvolnum></citerefentry>:</para>
+    <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>:</para>
 
     <programlisting># systemd-nspawn -D mycontainer -b systemd.run='"adduser test"'</programlisting>
     <para>(Note the requirement for double quoting in the command line above. The first level of quoting ('') is
@@ -72,7 +72,7 @@
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
     </simplelist></para>
diff --git a/man/systemd-sysext.xml b/man/systemd-sysext.xml
index c9bbf49907..3ebcb91abf 100644
--- a/man/systemd-sysext.xml
+++ b/man/systemd-sysext.xml
@@ -152,7 +152,7 @@
     in the extension image.</para>
 
     <para>The <command>systemd-confext</command> concept follows the same principle as the
-    <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     functionality but instead of working on <filename>/usr</filename> and <filename>/opt</filename>,
     <command>confext</command> will extend only <filename>/etc</filename>. Files and directories contained
     in the confext images outside of the <filename>/etc/</filename> hierarchy are <emphasis>not</emphasis>
diff --git a/man/systemd.image-policy.xml b/man/systemd.image-policy.xml
index f26aeb5b5e..95e6e2631f 100644
--- a/man/systemd.image-policy.xml
+++ b/man/systemd.image-policy.xml
@@ -152,7 +152,7 @@
     going to make use of any discovered swap device, regardless if the policy would allow that or not.</para>
 
     <para>Use the <command>image-policy</command> command of the
-    <citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>8</manvolnum></citerefentry> tool
+    <citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool
     to analyze image policy strings, and determine what a specific policy string means for a specific
     partition.</para>
   </refsect1>
@@ -184,7 +184,7 @@
       <member><citerefentry><refentrytitle>systemd-dissect</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 
diff --git a/man/systemd.pcrlock.xml b/man/systemd.pcrlock.xml
index 6f07dc8159..2efa122dba 100644
--- a/man/systemd.pcrlock.xml
+++ b/man/systemd.pcrlock.xml
@@ -40,7 +40,7 @@
 
     <para><filename>*.pcrlock</filename> files define expected TPM2 PCR measurements of components involved
     in the boot
-    process. <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    process. <citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     uses such pcrlock files to analyze and predict TPM2 PCR measurements. The pcrlock files are JSON arrays
     that follow a subset of the <ulink
     url="https://trustedcomputinggroup.org/resource/canonical-event-log-format/">TCG Canonical Event Log Format
@@ -292,7 +292,7 @@
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-pcrlock</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 5fa4baed20..ad7e35661f 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -409,7 +409,7 @@
         <varlistentry>
           <term><filename>initrd-fs.target</filename></term>
           <listitem>
-            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             automatically adds dependencies of type <varname>Before=</varname> to
             <filename>sysroot-usr.mount</filename> and all mount points found in
             <filename>/etc/fstab</filename> that have the <option>x-initrd.mount</option> mount option set
@@ -426,9 +426,9 @@
           <listitem>
             <para>A special initrd target unit that is reached when the root filesystem device is available, but before
             it has been mounted.
-            <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             and
-            <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             automatically setup the appropriate dependencies to make this happen.
             </para>
 
@@ -438,7 +438,7 @@
         <varlistentry>
           <term><filename>initrd-root-fs.target</filename></term>
           <listitem>
-            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             automatically adds dependencies of type <varname>Before=</varname> to the
             <filename>sysroot.mount</filename> unit, which is generated from the kernel command line's
             <varname>root=</varname> setting (or equivalent).</para>
@@ -449,7 +449,7 @@
         <varlistentry>
           <term><filename>initrd-usr-fs.target</filename></term>
           <listitem>
-            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             automatically adds dependencies of type <varname>Before=</varname> to the
             <filename>sysusr-usr.mount</filename> unit, which is generated from the kernel command line's
             <varname>usr=</varname> switch. Services may order themselves after this target unit in order to
@@ -495,7 +495,7 @@
         <varlistentry>
           <term><filename>local-fs.target</filename></term>
           <listitem>
-            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+            <para><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
             automatically adds dependencies of type
             <varname>Before=</varname> to all mount units that refer to
             local mount points for this target unit. In addition, it
@@ -625,7 +625,7 @@
           <listitem>
             <para>Similar to <filename>cryptsetup.target</filename>, but for encrypted
             devices which are accessed over the network. It is used for
-            <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
             entries marked with <option>_netdev</option>.</para>
 
           <xi:include href="version-info.xml" xpointer="v235"/>
@@ -636,7 +636,7 @@
           <listitem>
             <para>Similar to <filename>veritysetup.target</filename>, but for verity
             integrity protected devices which are accessed over the network. It is used for
-            <citerefentry><refentrytitle>veritytab</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>veritytab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
             entries marked with <option>_netdev</option>.</para>
 
           <xi:include href="version-info.xml" xpointer="v248"/>
@@ -1005,7 +1005,7 @@
           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>/
-          <citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
+          <citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
           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
@@ -1304,7 +1304,7 @@
 
       <para>There are four <literal>.slice</literal> units which form the basis of the hierarchy for
       assignment of resources for services, users, and virtual machines or containers. See
-      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       for details about slice units.</para>
 
       <variablelist>
@@ -1501,7 +1501,7 @@ PartOf=graphical-session.target
 
       <para>There are four <literal>.slice</literal> units which form the basis of the user hierarchy for
       assignment of resources for user applications and services. See
-      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       for details about slice units and the documentation about
       <ulink url="https://systemd.io/DESKTOP_ENVIRONMENTS">Desktop Environments</ulink>
       for further information.</para>
diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index 7962bb257a..b8612aa8a5 100644
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -184,7 +184,7 @@
           Read by both
           <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           and
-          <citerefentry><refentrytitle>systemd-sysusers</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+          <citerefentry><refentrytitle>systemd-sysusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
           and only honoured if no root password has been configured before.</para>
 
           <xi:include href="version-info.xml" xpointer="v252"/>
@@ -198,7 +198,7 @@
           both
           <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           and
-          <citerefentry><refentrytitle>systemd-sysusers</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+          <citerefentry><refentrytitle>systemd-sysusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
           and only honoured if no root shell has been configured before.</para>
 
         <xi:include href="version-info.xml" xpointer="v252"/>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 9b7a058842..2c7f0bd71f 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1141,7 +1141,7 @@
 
         <para>Both settings take a time span with the default unit of seconds, but other units may be
         specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         The default is <literal>infinity</literal> (job timeouts disabled), except for device units where
         <varname>JobRunningTimeoutSec=</varname> defaults to <varname>DefaultDeviceTimeoutSec=</varname>.
         </para>
@@ -1185,7 +1185,7 @@
 
         <para><replaceable>interval</replaceable> is a time span with the default unit of seconds, but other
         units may be specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         The special value <literal>infinity</literal> can be used to limit the total number of start
         attempts, even if they happen at large time intervals.
         Defaults to <varname>DefaultStartLimitIntervalSec=</varname> in manager configuration file, and may
diff --git a/man/systemd.v.xml b/man/systemd.v.xml
index 43e77bdba2..a340d1e4b7 100644
--- a/man/systemd.v.xml
+++ b/man/systemd.v.xml
@@ -156,7 +156,7 @@
         <member><citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-dissect</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>systemd-sysupdate</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>systemd-sysupdate</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       </simplelist></para>
   </refsect1>
 
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index 51c867ab29..922debfcfa 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -84,7 +84,7 @@
         to a different server.</para>
 
         <para>Takes a time span value. The default unit is seconds, but other units may be specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         Defaults to 5 seconds.</para>
 
         <xi:include href="version-info.xml" xpointer="v236"/></listitem>
@@ -99,7 +99,7 @@
 
         <para>Each setting takes a time span value. The default unit is seconds, but other units may be
         specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         <varname>PollIntervalMinSec=</varname> defaults to 32 seconds and must not be smaller than
         16 seconds. <varname>PollIntervalMaxSec=</varname> defaults to 34 min 8 s (2048 seconds) and must be
         larger than <varname>PollIntervalMinSec=</varname>.</para>
@@ -113,7 +113,7 @@
         are made.</para>
 
         <para>Takes a time span value. The default unit is seconds, but other units may be specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         Defaults to 30 seconds and must not be smaller than 1 second.</para>
 
         <xi:include href="version-info.xml" xpointer="v248"/></listitem>
@@ -127,7 +127,7 @@
         reboots.</para>
 
         <para>Takes a time interval value. The default unit is seconds, but other units may be specified, see
-        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
         Defaults to 60 seconds.</para>
 
         <xi:include href="version-info.xml" xpointer="v250"/></listitem>