man: fix wrong version info (#31949)

Fixes #31920.

26 files changed, 105 insertions, 238 deletions

diff --git a/man/sd_bus_add_match.xml b/man/sd_bus_add_match.xml
index 527b2d9f54..575d628364 100644
--- a/man/sd_bus_add_match.xml
+++ b/man/sd_bus_add_match.xml
@@ -156,7 +156,7 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_add_match()</function> and
-    <function>sd_bus_message_handler_t()</function> were added in version 231.</para>
+    <function>sd_bus_message_handler_t()</function> were added in version 221.</para>
     <para><function>sd_bus_add_match_async()</function>,
     <function>sd_bus_match_signal()</function>, and
     <function>sd_bus_match_signal_async()</function> were added in version 237.</para>
diff --git a/man/sd_bus_add_node_enumerator.xml b/man/sd_bus_add_node_enumerator.xml
index 149bd21897..5aeb782686 100644
--- a/man/sd_bus_add_node_enumerator.xml
+++ b/man/sd_bus_add_node_enumerator.xml
@@ -98,34 +98,25 @@
           <term><constant>-EINVAL</constant></term>
 
           <listitem><para>One of the required parameters is <constant>NULL</constant> or
-          <parameter>path</parameter> is not a valid object path.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <parameter>path</parameter> is not a valid object path.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -136,7 +127,7 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_node_enumerator_t()</function> and
-    <function>sd_bus_add_node_enumerator()</function> were added in version 246.</para>
+    <function>sd_bus_add_node_enumerator()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_add_object.xml b/man/sd_bus_add_object.xml
index 94ad637cff..4d14a7e731 100644
--- a/man/sd_bus_add_object.xml
+++ b/man/sd_bus_add_object.xml
@@ -377,10 +377,7 @@
           combination of flags, see below.</para>
 
           <para><constant>SD_BUS_METHOD_WITH_ARGS()</constant> is a shorthand for calling
-          <constant>SD_BUS_METHOD_WITH_ARGS_OFFSET()</constant> with an offset of zero.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/>
-          </listitem>
+          <constant>SD_BUS_METHOD_WITH_ARGS_OFFSET()</constant> with an offset of zero.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -406,10 +403,7 @@
           <para>Prefer using <constant>SD_BUS_METHOD_WITH_ARGS_OFFSET()</constant> and
           <constant>SD_BUS_METHOD_WITH_ARGS()</constant> over these macros as they allow specifying argument
           types and names next to each other which is less error-prone than first specifying all argument
-          types followed by specifying all argument names.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/>
-          </listitem>
+          types followed by specifying all argument names.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -423,9 +417,7 @@
           <replaceable>args</replaceable>. If a signal has no parameters, pass
           <constant>SD_BUS_NO_ARGS</constant> to <replaceable>args</replaceable>. The elements at uneven
           indices describe the names of the signal's arguments. Parameter <replaceable>flags</replaceable> is
-          a combination of flags. See below for a complete example.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          a combination of flags. See below for a complete example.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -445,10 +437,7 @@
 
           <para>Prefer using <constant>SD_BUS_SIGNAL_WITH_ARGS()</constant> over these macros as it allows
           specifying argument types and names next to each other which is less error-prone than first
-          specifying all argument types followed by specifying all argument names.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/>
-          </listitem>
+          specifying all argument types followed by specifying all argument names.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -473,17 +462,13 @@
           </para>
 
           <para><constant>SD_BUS_PROPERTY()</constant> is used to define a read-only property.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>SD_BUS_PARAM()</constant></term>
           <listitem><para>Parameter names should be wrapped in this macro, see the example below.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -502,9 +487,7 @@
           <listitem><para>Mark this vtable entry as deprecated using the
           <constant>org.freedesktop.DBus.Deprecated</constant> annotation in introspection data. If
           specified for <constant>SD_BUS_VTABLE_START()</constant>, the annotation is applied to the
-          enclosing interface.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          enclosing interface.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -512,9 +495,7 @@
 
           <listitem><para>Make this vtable entry hidden. It will not be shown in introspection data.
           If specified for <constant>SD_BUS_VTABLE_START()</constant>, all entries in the array are
-          hidden.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          hidden.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -522,9 +503,7 @@
 
           <listitem><para>Mark this vtable entry as a method that will not return a reply using the
           <constant>org.freedesktop.DBus.Method.NoReply</constant> annotation in introspection data.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -543,9 +522,7 @@
           <constant>true</constant> and means that the signal is emitted.
           <constant>SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION</constant> corresponds to
           <constant>invalidates</constant> and means that the signal is emitted, but the value is
-          not included in the signal.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          not included in the signal.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -556,9 +533,7 @@
           cannot be combined with <constant>SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE</constant>, and will
           not be shown in property listings by default (e.g. <command>busctl introspect</command>).
           This corresponds to the <constant>org.freedesktop.systemd1.Explicit</constant> annotation
-          in introspection data.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          in introspection data.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -567,9 +542,7 @@
           <listitem><para>Mark this vtable method entry as processing sensitive data. When set,
           incoming method call messages and their outgoing reply messages are marked as sensitive using
           <citerefentry><refentrytitle>sd_bus_message_sensitive</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-          so that they are erased from memory when freed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          so that they are erased from memory when freed.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -579,9 +552,7 @@
           its associated handler functions is determined slightly differently: instead of adding the offset
           parameter of the entry to the user data pointer specified during vtable registration, the offset is
           passed directly, converted to a pointer, without taking the user data pointer specified during
-          vtable registration into account.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          vtable registration into account.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -597,10 +568,7 @@
           for information about capabilities.</para>
 
           <para>Note that vtable entries may be marked as unprivileged and the whole bus may be marked as
-          trusted, see the discussion of <constant>SD_BUS_VTABLE_UNPRIVILEGED</constant> below.</para>
-
-          <xi:include href="version-info.xml" xpointer="v251"/>
-          </listitem>
+          trusted, see the discussion of <constant>SD_BUS_VTABLE_UNPRIVILEGED</constant> below.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -625,9 +593,7 @@
           additional policy that may permit or deny connections, see
           "CONFIGURATION FILE" in
           <citerefentry project='man-pages'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -667,33 +633,25 @@
 
           <listitem><para>One of the required parameters is <constant>NULL</constant> or invalid. A
           reserved D-Bus interface was passed as the <replaceable>interface</replaceable> parameter.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -701,19 +659,14 @@
 
           <listitem><para><function>sd_bus_add_object_vtable()</function> and
           <function>sd_bus_add_fallback_vtable()</function> have been both called for the same bus
-          object path, which is not allowed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          object path, which is not allowed.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-EEXIST</constant></term>
 
           <listitem><para>This vtable has already been registered for this
-          <replaceable>interface</replaceable> and <replaceable>path</replaceable>.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <replaceable>interface</replaceable> and <replaceable>path</replaceable>.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -730,7 +683,7 @@
     <function>sd_bus_add_fallback()</function>,
     <function>sd_bus_add_object_vtable()</function>,
     <function>sd_bus_add_fallback_vtable()</function>, and
-    <function>sd_bus_add_filter()</function> were added in version 246.</para>
+    <function>sd_bus_add_filter()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_add_object_manager.xml b/man/sd_bus_add_object_manager.xml
index a636bde6c8..c47577e031 100644
--- a/man/sd_bus_add_object_manager.xml
+++ b/man/sd_bus_add_object_manager.xml
@@ -77,34 +77,25 @@
           <term><constant>-EINVAL</constant></term>
 
           <listitem><para>One of the required parameters is <constant>NULL</constant> or
-          <parameter>path</parameter> is not a valid object path.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <parameter>path</parameter> is not a valid object path.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -114,7 +105,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_add_object_manager()</function> was added in version 246.</para>
+    <para><function>sd_bus_add_object_manager()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_attach_event.xml b/man/sd_bus_attach_event.xml
index 993aa4350b..16d46e5c45 100644
--- a/man/sd_bus_attach_event.xml
+++ b/man/sd_bus_attach_event.xml
@@ -106,7 +106,7 @@
     <title>History</title>
     <para><function>sd_bus_attach_event()</function>,
     <function>sd_bus_detach_event()</function>, and
-    <function>sd_bus_get_event()</function> were added in version 240.</para>
+    <function>sd_bus_get_event()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_call.xml b/man/sd_bus_call.xml
index 4cfcf17277..531a68a07b 100644
--- a/man/sd_bus_call.xml
+++ b/man/sd_bus_call.xml
@@ -137,8 +137,6 @@
             <para>The input parameter <parameter>error</parameter> is
             non-<constant>NULL</constant> but was not set to <constant>SD_BUS_ERROR_NULL</constant>.
             </para>
-
-            <xi:include href="version-info.xml" xpointer="v246"/>
           </listitem>
         </varlistentry>
 
@@ -146,52 +144,40 @@
           <term><constant>-ECHILD</constant></term>
 
           <listitem><para>The bus connection was allocated in a parent process and is being reused
-          in a child process after <function>fork()</function>.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          in a child process after <function>fork()</function>.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOTCONN</constant></term>
 
           <listitem><para>The input parameter <parameter>bus</parameter> is
-          <constant>NULL</constant> or the bus is not connected.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <constant>NULL</constant> or the bus is not connected.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECONNRESET</constant></term>
 
           <listitem><para>The bus connection was closed while waiting for the response.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ETIMEDOUT</constant></term>
 
-          <listitem><para>A response was not received within the given timeout.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>A response was not received within the given timeout.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ELOOP</constant></term>
 
           <listitem><para>The message <parameter>m</parameter> is addressed to its own client.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -202,7 +188,7 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_call()</function> and
-    <function>sd_bus_call_async()</function> were added in version 246.</para>
+    <function>sd_bus_call_async()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_call_method.xml b/man/sd_bus_call_method.xml
index 1bd09ce0c3..1178a95c3d 100644
--- a/man/sd_bus_call_method.xml
+++ b/man/sd_bus_call_method.xml
@@ -141,9 +141,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_call_method()</function>,
-    <function>sd_bus_call_methodv()</function>,
-    <function>sd_bus_call_method_async()</function>, and
+    <para><function>sd_bus_call_method()</function>, and
+    <function>sd_bus_call_method_async()</function> were added in version 221.</para>
+    <para><function>sd_bus_call_methodv()</function>,
     <function>sd_bus_call_method_asyncv()</function> were added in version 246.</para>
   </refsect1>
 
diff --git a/man/sd_bus_can_send.xml b/man/sd_bus_can_send.xml
index 7819116a7d..09e8026e33 100644
--- a/man/sd_bus_can_send.xml
+++ b/man/sd_bus_can_send.xml
@@ -58,28 +58,21 @@
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus object <parameter>bus</parameter> could not be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/>
-          </listitem>
+          <listitem><para>The bus object <parameter>bus</parameter> could not be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOTCONN</constant></term>
 
           <listitem><para>The input parameter <parameter>bus</parameter> is
-          <constant>NULL</constant> or the bus is not connected.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <constant>NULL</constant> or the bus is not connected.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
           <listitem><para>The bus object <parameter>bus</parameter> was created in a different
-          process.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          process.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -89,7 +82,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_can_send()</function> was added in version 246.</para>
+    <para><function>sd_bus_can_send()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_close.xml b/man/sd_bus_close.xml
index 89c3cdb43c..70d0b86139 100644
--- a/man/sd_bus_close.xml
+++ b/man/sd_bus_close.xml
@@ -108,8 +108,8 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_close()</function> and
-    <function>sd_bus_flush()</function> were added in version 240.</para>
-    <para><function>sd_bus_default_flush_close()</function> was added in version 246.</para>
+    <function>sd_bus_flush()</function> were added in version 221.</para>
+    <para><function>sd_bus_default_flush_close()</function> was added in version 227.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 6f3e1ee07b..0630329eb5 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -539,9 +539,9 @@
     <function>sd_bus_creds_get_selinux_context()</function>,
     <function>sd_bus_creds_get_audit_session_id()</function>,
     <function>sd_bus_creds_get_audit_login_uid()</function>,
-    <function>sd_bus_creds_get_unique_name()</function>, and
-    <function>sd_bus_creds_get_well_known_names()</function> were added in version 209.</para>
-    <para><function>sd_bus_creds_get_ppid()</function>,
+    <function>sd_bus_creds_get_unique_name()</function>,
+    <function>sd_bus_creds_get_well_known_names()</function>,
+    <function>sd_bus_creds_get_ppid()</function>,
     <function>sd_bus_creds_get_uid()</function>,
     <function>sd_bus_creds_get_euid()</function>,
     <function>sd_bus_creds_get_suid()</function>,
@@ -550,9 +550,9 @@
     <function>sd_bus_creds_get_sgid()</function>,
     <function>sd_bus_creds_get_fsgid()</function>,
     <function>sd_bus_creds_get_supplementary_gids()</function>,
-    <function>sd_bus_creds_get_tty()</function>, and
-    <function>sd_bus_creds_get_description()</function> were added in version 220.</para>
-    <para><function>sd_bus_creds_get_user_slice()</function> was added in version 223.</para>
+    <function>sd_bus_creds_get_tty()</function>,
+    <function>sd_bus_creds_get_description()</function>, and
+    <function>sd_bus_creds_get_user_slice()</function> were added in version 221.</para>
     <para><function>sd_bus_creds_get_pidfd_dup()</function> was added in version 256.</para>
   </refsect1>
 
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 4b39f4a003..1dffd13266 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -286,9 +286,9 @@
     <title>History</title>
     <para><function>sd_bus_creds_new_from_pid()</function>,
     <function>sd_bus_creds_get_mask()</function>,
-    <function>sd_bus_creds_ref()</function>, and
-    <function>sd_bus_creds_unref()</function> were added in version 209.</para>
-    <para><function>sd_bus_creds_get_augmented_mask()</function> was added in version 223.</para>
+    <function>sd_bus_creds_ref()</function>,
+    <function>sd_bus_creds_unref()</function>, and
+    <function>sd_bus_creds_get_augmented_mask()</function> were added in version 221.</para>
     <para><function>sd_bus_creds_unrefp()</function> was added in version 229.</para>
     <para><function>sd_bus_creds_new_from_pidfd()</function> was added in version 256.</para>
   </refsect1>
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index e07ca3ee74..f32fbc0b42 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -306,9 +306,7 @@
 
           <listitem><para>The requested bus type is not available because of invalid environment (for example
           the user session bus is not available because <varname>$XDG_RUNTIME_DIR</varname> is not set).
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v247"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -341,10 +339,10 @@
     <function>sd_bus_open_user()</function>,
     <function>sd_bus_open_system()</function>,
     <function>sd_bus_open_system_remote()</function>, and
-    <function>sd_bus_open_system_machine()</function> were added in version 220.</para>
+    <function>sd_bus_open_system_machine()</function> were added in version 221.</para>
     <para><function>sd_bus_open_with_description()</function>,
     <function>sd_bus_open_user_with_description()</function>, and
-    <function>sd_bus_open_system_with_description()</function> were added in version 240.</para>
+    <function>sd_bus_open_system_with_description()</function> were added in version 239.</para>
     <para><function>sd_bus_open_user_machine()</function> was added in version 248.</para>
   </refsect1>
 
diff --git a/man/sd_bus_emit_signal.xml b/man/sd_bus_emit_signal.xml
index 7acd10baaf..b7d764839d 100644
--- a/man/sd_bus_emit_signal.xml
+++ b/man/sd_bus_emit_signal.xml
@@ -214,33 +214,25 @@
 
           <listitem><para>One of the required parameters is <constant>NULL</constant> or invalid. A
           reserved D-Bus interface was passed as the <replaceable>interface</replaceable> parameter.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -251,9 +243,7 @@
           <function>sd_bus_emit_object_added()</function> or
           <function>sd_bus_emit_object_removed()</function> was called on an object without an
           object manager registered on its own object path or one of its parent object paths.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          </para></listitem>
         </varlistentry>
       </variablelist>
 
@@ -270,15 +260,15 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_emit_signal()</function>,
-    <function>sd_bus_emit_signalv()</function>,
     <function>sd_bus_emit_interfaces_added()</function>,
     <function>sd_bus_emit_interfaces_added_strv()</function>,
     <function>sd_bus_emit_interfaces_removed()</function>,
     <function>sd_bus_emit_interfaces_removed_strv()</function>,
     <function>sd_bus_emit_properties_changed()</function>,
-    <function>sd_bus_emit_properties_changed_strv()</function>,
-    <function>sd_bus_emit_object_added()</function>, and
-    <function>sd_bus_emit_object_removed()</function> were added in version 246.</para>
+    <function>sd_bus_emit_properties_changed_strv()</function>, were added in version 221.</para>
+    <para><function>sd_bus_emit_object_added()</function>, and
+    <function>sd_bus_emit_object_removed()</function> were added in version 222.</para>
+    <para><function>sd_bus_emit_signalv()</function> was added in version 246.</para>
     <para><function>sd_bus_emit_signal_to()</function> and
     <function>sd_bus_emit_signal_tov()</function> were added in version 253.</para>
   </refsect1>
diff --git a/man/sd_bus_enqueue_for_read.xml b/man/sd_bus_enqueue_for_read.xml
index acf1a432d3..a1352c15c0 100644
--- a/man/sd_bus_enqueue_for_read.xml
+++ b/man/sd_bus_enqueue_for_read.xml
@@ -67,9 +67,7 @@
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus connection has been created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v245"/></listitem>
+          <listitem><para>The bus connection has been created in a different process, library or module instance.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 976c7956de..5bf1691be2 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -402,11 +402,11 @@
     <function>sd_bus_error_set_const()</function>,
     <function>sd_bus_error_set_errno()</function>,
     <function>sd_bus_error_set_errnof()</function>,
+    <function>sd_bus_error_set_errnofv()</function>,
     <function>sd_bus_error_get_errno()</function>,
     <function>sd_bus_error_copy()</function>,
     <function>sd_bus_error_is_set()</function>, and
-    <function>sd_bus_error_has_name()</function> were added in version 209.</para>
-    <para><function>sd_bus_error_set_errnofv()</function> was added in version 223.</para>
+    <function>sd_bus_error_has_name()</function> were added in version 221.</para>
     <para><function>sd_bus_error_move()</function> was added in version 240.</para>
     <para><function>sd_bus_error_has_names_sentinel()</function> was added in version 247.</para>
     <para><function>sd_bus_error_setfv()</function> was added in version 252.</para>
diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
index d91647f484..e6e635130e 100644
--- a/man/sd_bus_error_add_map.xml
+++ b/man/sd_bus_error_add_map.xml
@@ -120,7 +120,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_error_add_map()</function> was added in version 223.</para>
+    <para><function>sd_bus_error_add_map()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_current_handler.xml b/man/sd_bus_get_current_handler.xml
index 5ff2d2b501..98b01d1f17 100644
--- a/man/sd_bus_get_current_handler.xml
+++ b/man/sd_bus_get_current_handler.xml
@@ -79,7 +79,7 @@
     <para><function>sd_bus_get_current_handler()</function>,
     <function>sd_bus_get_current_message()</function>,
     <function>sd_bus_get_current_slot()</function>, and
-    <function>sd_bus_get_current_userdata()</function> were added in version 246.</para>
+    <function>sd_bus_get_current_userdata()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index a7bed31f24..9d239f3294 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -150,9 +150,7 @@
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -162,9 +160,9 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_fd()</function> was added in version 231.</para>
-    <para><function>sd_bus_get_events()</function> and
-    <function>sd_bus_get_timeout()</function> were added in version 240.</para>
+    <para><function>sd_bus_get_fd()</function>,
+    <function>sd_bus_get_events()</function>, and
+    <function>sd_bus_get_timeout()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_name_creds.xml b/man/sd_bus_get_name_creds.xml
index d33cf622a5..b223f536eb 100644
--- a/man/sd_bus_get_name_creds.xml
+++ b/man/sd_bus_get_name_creds.xml
@@ -77,41 +77,31 @@
         <varlistentry>
           <term><constant>-EINVAL</constant></term>
 
-          <listitem><para>An argument is invalid.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>An argument is invalid.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-EPERM</constant></term>
 
-          <listitem><para>The bus has already been started.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus has already been started.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -122,7 +112,7 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_bus_get_name_creds()</function> and
-    <function>sd_bus_get_owner_creds()</function> were added in version 246.</para>
+    <function>sd_bus_get_owner_creds()</function> were added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_get_name_machine_id.xml b/man/sd_bus_get_name_machine_id.xml
index 37ec15adff..486701841b 100644
--- a/man/sd_bus_get_name_machine_id.xml
+++ b/man/sd_bus_get_name_machine_id.xml
@@ -60,33 +60,25 @@
         <varlistentry>
           <term><constant>-EINVAL</constant></term>
 
-          <listitem><para>An argument is invalid.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>An argument is invalid.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -96,7 +88,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_get_name_machine_id()</function> was added in version 246.</para>
+    <para><function>sd_bus_get_name_machine_id()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_interface_name_is_valid.xml b/man/sd_bus_interface_name_is_valid.xml
index c87c4a62d0..965480133b 100644
--- a/man/sd_bus_interface_name_is_valid.xml
+++ b/man/sd_bus_interface_name_is_valid.xml
@@ -77,9 +77,7 @@
           <term><constant>-EINVAL</constant></term>
 
           <listitem><para>The <parameter>p</parameter> parameter is
-          <constant>NULL</constant>.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <constant>NULL</constant>.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml
index 1d0ce1d877..b60956ccee 100644
--- a/man/sd_bus_is_open.xml
+++ b/man/sd_bus_is_open.xml
@@ -93,8 +93,8 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_is_open()</function> and
-    <function>sd_bus_is_ready()</function> were added in version 237.</para>
+    <para><function>sd_bus_is_open()</function> was added in version 221.</para>
+    <para><function>sd_bus_is_ready()</function> was added in version 237.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_list_names.xml b/man/sd_bus_list_names.xml
index c9103a331a..b49259b4f1 100644
--- a/man/sd_bus_list_names.xml
+++ b/man/sd_bus_list_names.xml
@@ -66,42 +66,31 @@
           <term><constant>-EINVAL</constant></term>
 
           <listitem><para><parameter>bus</parameter> or both <parameter>acquired</parameter> and
-          <parameter>activatable</parameter> were <constant>NULL</constant>.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <parameter>activatable</parameter> were <constant>NULL</constant>.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOPKG</constant></term>
 
-          <listitem><para>The bus cannot be resolved.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus cannot be resolved.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ECHILD</constant></term>
 
-          <listitem><para>The bus was created in a different process, library or module instance.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus was created in a different process, library or module instance.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
-          <listitem><para>Memory allocation failed.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>Memory allocation failed.</para></listitem>
         </varlistentry>
 
         <varlistentry>
           <term><constant>-ENOTCONN</constant></term>
 
-          <listitem><para>The bus is not connected.</para>
-
-          <xi:include href="version-info.xml" xpointer="v246"/></listitem>
+          <listitem><para>The bus is not connected.</para></listitem>
         </varlistentry>
       </variablelist>
     </refsect2>
@@ -111,7 +100,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_list_names()</function> was added in version 246.</para>
+    <para><function>sd_bus_list_names()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_message_read_basic.xml b/man/sd_bus_message_read_basic.xml
index 3f5aafc496..6eb0e2349d 100644
--- a/man/sd_bus_message_read_basic.xml
+++ b/man/sd_bus_message_read_basic.xml
@@ -224,7 +224,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_message_read_basic()</function> was added in version 231.</para>
+    <para><function>sd_bus_message_read_basic()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_bus_process.xml b/man/sd_bus_process.xml
index 9417d69c52..d9b49bd79e 100644
--- a/man/sd_bus_process.xml
+++ b/man/sd_bus_process.xml
@@ -118,7 +118,7 @@
 
   <refsect1>
     <title>History</title>
-    <para><function>sd_bus_process()</function> was added in version 231.</para>
+    <para><function>sd_bus_process()</function> was added in version 221.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 20e1eccd4d..95bb0bef46 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -320,9 +320,9 @@
   <refsect1>
     <title>History</title>
     <para><function>sd_event_prepare()</function>,
-    <function>sd_event_wait()</function>, and
-    <function>sd_event_dispatch()</function> were added in version 220.</para>
-    <para><function>sd_event_get_state()</function> was added in version 229.</para>
+    <function>sd_event_wait()</function>,
+    <function>sd_event_dispatch()</function>, and
+    <function>sd_event_get_state()</function> were added in version 221.</para>
     <para><function>sd_event_get_iteration()</function> was added in version 231.</para>
   </refsect1>