X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-bus-proxyd.xml;h=2c7764047b1324f9d1921a9236ffac446cc97ab1;hp=d53f966ab32cf5d66571171473246da85ebf410f;hb=a2e0337875addaf08225fbf9b231435ba12a88b5;hpb=708c143c7cd2bbd748ac0fa993496ff44e72701c

diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index d53f966ab..2c7764047 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
@@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-bus-proxyd">
+<refentry id="systemd-bus-proxyd" conditional="ENABLE_KDBUS"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd-bus-proxyd</title>
@@ -61,8 +62,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><command>systemd-bus-proxyd</command> will proxy D-Bus
     messages to and from a bus. The will be either the system bus or
     the bus specified with <option>--address</option> when that option
-    is given. Messages will be proxied to/from stdin and stdout, or
-    the socket received through socket activation.</para>
+    is given. Messages will be proxied to/from standard input and
+    output, or the socket received through socket activation.</para>
 
     <para>This program can be used to connect a program using classic
     D-Bus to kdbus.</para>
@@ -79,31 +80,18 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
         <listitem>
           <para>Connect to the bus specified by
-          <replaceable>ADDRESS</replaceable>. Multiple colon-seperated
+          <replaceable>ADDRESS</replaceable>. Multiple colon-separated
           addresses can be specified, in which case
           <command>systemd-bus-proxyd</command> will attempt to
           connect to them in turn.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--version</option></term>
-
-        <listitem>
-          <para>Prints a short version string and exits.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-h</option></term>
-        <term><option>--help</option></term>
-
-        <listitem><para>Prints a short help
-        text and exits.</para></listitem>
-      </varlistentry>
+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />
     </variablelist>
 
-    <para><replaceable>PLACEHOLDER</replaceable> if given must be a string
+    <para><replaceable>PLACEHOLDER</replaceable>, if given, must be a string
     of <literal>x</literal> and will be used to display information about
     the process that <command>systemd-bus-proxyd</command> is forwarding
     messages for.</para>