man: xinclude --help/--version/--no-pager

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

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index cc8a68a0227dc369b5f05dfe90ae3c7c40719121..87640fc259970f918128f10c15eea1ca828cc5a5 100644 (file)
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -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-run">
+<refentry id="systemd-run"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd-run</title>
@@ -89,26 +90,20 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <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>
+        <term><option>--user</option></term>
 
-        <listitem><para>Prints a short version
-        string and exits.</para></listitem>
+        <listitem>
+          <para>Talk to the service manager of the calling user,
+          rather than the service manager of the system.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>--user</option></term>
+        <term><option>--system</option></term>
 
         <listitem>
-          <para>Talk to the service manager of the calling user,
-          rather than the service manager of the system.</para>
+          <para>Talk to the service manager of the system. This is the
+          implied default.</para>
         </listitem>
       </varlistentry>
 
@@ -116,7 +111,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
               <term><option>-H</option></term>
               <term><option>--host=</option></term>
 
-              <listitem><para>Execute operation
+              <listitem><para>Execute the operation
               remotely. Specify a hostname, or
               username and hostname separated by <literal>@</literal>,
               to connect to. This will use SSH to
@@ -128,7 +123,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
               <term><option>-M</option></term>
               <term><option>--machine=</option></term>
 
-              <listitem><para>Execute operation on a
+              <listitem><para>Execute the operation on a
               local container. Specify a container
               name to connect to.</para></listitem>
       </varlistentry>
@@ -193,6 +188,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </para>
         </listitem>
       </varlistentry>
+
+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />
     </variablelist>
 
     <para>All command-line arguments after the first non-option
@@ -221,8 +219,7 @@ Sep 08 07:37:21 bupkis systemd[1]: Starting /usr/bin/env...
 Sep 08 07:37:21 bupkis systemd[1]: Started /usr/bin/env.
 Sep 08 07:37:21 bupkis env[19948]: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 Sep 08 07:37:21 bupkis env[19948]: LANG=en_US.UTF-8
-Sep 08 07:37:21 bupkis env[19948]: BOOT_IMAGE=/vmlinuz-3.11.0-0.rc5.git6.2.fc20.x86_64
-    </programlisting>
+Sep 08 07:37:21 bupkis env[19948]: BOOT_IMAGE=/vmlinuz-3.11.0-0.rc5.git6.2.fc20.x86_64</programlisting>
   </refsect1>
 
   <refsect1>