resolved: properly return start index when appending RR to packet

[elogind.git] / man / systemd-inhibit.xml

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index cac0ef6890ae504efda7b031f40845cccebaf84b..c694744fb9945083dee3387152afa3f1252a49e5 100644 (file)
--- 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/>.
 -->
 
   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>
 
         <refentryinfo>
                 <title>systemd-inhibit</title>


@@ -83,21 +84,6 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
                 <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>
 
                         <varlistentry>
                                 <term><option>--what=</option></term>
 


@@ -158,7 +144,7 @@
                                 time elapses, the lock is ignored and
                                 the operation executed. The time limit
                                 may be specified in
                                 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
                                 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>
                                 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>
                 </variablelist>
 
         </refsect1>


@@ -189,7 +178,7 @@
 
                 <para>This burns the ISO image
                 <filename>foobar.iso</filename> on a CD using
 
                 <para>This burns the ISO image
                 <filename>foobar.iso</filename> on a CD using

-                <citerefentry><refentrytitle>wodim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                <citerefentry project='man-pages'><refentrytitle>wodim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,

                 and inhibits system sleeping, shutdown and idle while
                 doing so.</para>
         </refsect1>
                 and inhibits system sleeping, shutdown and idle while
                 doing so.</para>
         </refsect1>