X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-notify.xml;h=69baae0dce3759da57828062956c861ade94d52a;hp=b03492c5c10a69614dc9a54247d96795c70611c1;hb=e0fbf1fcffe014d5af6767b29f9108c2f2444888;hpb=34511ca7b166b0e89d08ff9870b0cf2624a7815f

diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index b03492c5c..69baae0dc 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-notify">
+<refentry id="systemd-notify"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>systemd-notify</title>
@@ -86,21 +87,6 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Prints a short version
-                                string and exits.</para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><option>--ready</option></term>
 
@@ -119,7 +105,7 @@
                                 <listitem><para>Inform the init system
                                 about the main PID of the
                                 daemon. Takes a PID as argument. If
-                                the argument is omitted the PID of the
+                                the argument is omitted, the PID of the
                                 process that invoked
                                 <command>systemd-notify</command> is
                                 used. This is equivalent to
@@ -148,10 +134,10 @@
                                 <listitem><para>Returns 0 if the
                                 system was booted up with systemd,
                                 non-zero otherwise. If this option is
-                                passed no message is sent. This option
+                                passed, no message is sent. This option
                                 is hence unrelated to the other
                                 options. For details about the
-                                semantics of this option see
+                                semantics of this option, see
                                 <citerefentry><refentrytitle>sd_booted</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
                         </varlistentry>
 
@@ -165,6 +151,9 @@
                                 about the semantics of this option see
                                 <citerefentry><refentrytitle>sd_readahead</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
                         </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
                 </variablelist>
 
         </refsect1>
@@ -172,7 +161,7 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>