Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 42 deletions

diff --git a/man/sd_bus_call.xml b/man/sd_bus_call.xml
index 0bd863d..531a68a 100644
--- a/man/sd_bus_call.xml
+++ b/man/sd_bus_call.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="sd_bus_call"
@@ -122,74 +122,62 @@
         <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>
-
-          <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>
         </varlistentry>
 
         <varlistentry>
           <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>
@@ -200,21 +188,21 @@
   <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>
     <title>See Also</title>
 
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_call_method</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_call_method_async</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_error</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    </para>
+    <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_call_method</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_call_method_async</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>sd_bus_error</refentrytitle><manvolnum>3</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 
 </refentry>