X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-inhibit.xml;h=555c5414b4d1fd270d992db00a2c8e90a22420ed;hp=6f63c8c73e5d0e145fa0a509f3b391ce6d99e101;hb=93ae25e6fd62b2f87c3dd9ad3e81934eecc48057;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 6f63c8c73..555c5414b 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-inhibit">
+<refentry id="systemd-inhibit"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>systemd-inhibit</title>
@@ -83,26 +84,11 @@
                 <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>--what=</option></term>
 
-                                <listitem><para>Takes a colon
-                                separated list of one or more
+                                <listitem><para>Takes a colon-separated
+                                list of one or more
                                 operations to inhibit:
                                 <literal>shutdown</literal>,
                                 <literal>sleep</literal>,
@@ -124,9 +110,9 @@
                         <varlistentry>
                                 <term><option>--who=</option></term>
 
-                                <listitem><para>Takes a short human
-                                readable descriptive string for the
-                                program taking the lock. If not passed
+                                <listitem><para>Takes a short,
+                                human-readable descriptive string for the
+                                program taking the lock. If not passed,
                                 defaults to the command line
                                 string.</para></listitem>
                         </varlistentry>
@@ -134,8 +120,8 @@
                         <varlistentry>
                                 <term><option>--why=</option></term>
 
-                                <listitem><para>Takes a short human
-                                readable descriptive string for the
+                                <listitem><para>Takes a short,
+                                human-readable descriptive string for the
                                 reason for taking the lock. Defaults
                                 to "Unknown reason".</para></listitem>
                         </varlistentry>
@@ -155,10 +141,10 @@
                                 <literal>delay</literal> is used, the
                                 lock can only delay the requested
                                 operations for a limited time. If the
-                                time elapses the lock is ignored and
+                                time elapses, the lock is ignored and
                                 the operation executed. The time limit
                                 may be specified in
-                                <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
+                                <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
                                 that <literal>delay</literal> is only
                                 available for <literal>sleep</literal>
                                 and
@@ -172,6 +158,9 @@
                                 inhibition locks instead of acquiring
                                 one.</para></listitem>
                         </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
                 </variablelist>
 
         </refsect1>
@@ -198,7 +187,7 @@
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>