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

diff --git a/Makefile-man.am b/Makefile-man.am
index b11d5aa361499bad1af0d635edd34dbc5666d4b1..08f856b8523ac5bc6050955ba32df098200a124a 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1385,6 +1385,7 @@ EXTRA_DIST += \
        man/sd_uid_get_state.xml \
        man/sd_watchdog_enabled.xml \
        man/shutdown.xml \
        man/sd_uid_get_state.xml \
        man/sd_watchdog_enabled.xml \
        man/shutdown.xml \

+       man/standard-options.xml \

        man/sysctl.d.xml \
        man/systemctl.xml \
        man/systemd-activate.xml \
        man/sysctl.d.xml \
        man/systemctl.xml \
        man/systemd-activate.xml \

diff --git a/man/bootctl.xml b/man/bootctl.xml
index 28f1b9203fcb6e7ad8786dd4f22899635e8b216d..5f198471bee666c2ca2f793fe8d7292cb0c62cf1 100644 (file)
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -19,7 +19,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="bootctl" conditional='ENABLE_EFI'>
+<refentry id="bootctl" conditional='ENABLE_EFI'
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>bootctl</title>
 
         <refentryinfo>
                 <title>bootctl</title>


@@ -74,20 +75,8 @@
                 <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>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/busctl.xml b/man/busctl.xml
index f352da1d7b4be7f395cb6ee65e4e648fe466328a..9a2c63c94375a24223e02627318f3af696f09432 100644 (file)
--- a/man/busctl.xml
+++ b/man/busctl.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/>.
 -->
 
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="busctl">
+<refentry id="busctl"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
   <refentryinfo>
     <title>busctl</title>
 
   <refentryinfo>
     <title>busctl</title>


@@ -69,40 +70,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <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>Print a short help text and exit.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--version</option></term>
-
-        <listitem>
-          <para>Print a short version string and exit.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no-pager</option></term>
-
-        <listitem>
-          <para>Do not pipe output into a pager.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no-legend</option></term>
-
-        <listitem>
-          <para>Do not print the legend,
-          i.e. the column headers and the
-          footer.</para>
-        </listitem>
-      </varlistentry>
-

       <varlistentry>
         <term><option>--system</option></term>
 
       <varlistentry>
         <term><option>--system</option></term>
 


@@ -193,6 +160,20 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           subset matching <replaceable>MATCH</replaceable>.</para></listitem>
           <!-- TODO: link to sd_bus_add_match when it is written? -->
       </varlistentry>
           subset matching <replaceable>MATCH</replaceable>.</para></listitem>
           <!-- TODO: link to sd_bus_add_match when it is written? -->
       </varlistentry>

+
+      <varlistentry>
+        <term><option>--no-legend</option></term>
+
+        <listitem>
+          <para>Do not print the legend,
+          i.e. the column headers and the
+          footer.</para>
+        </listitem>
+      </varlistentry>
+
+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />
+      <xi:include href="standard-options.xml" xpointer="no-pager" />

     </variablelist>
   </refsect1>
 
     </variablelist>
   </refsect1>
 

diff --git a/man/halt.xml b/man/halt.xml
index f54a8648adac7d55f660be3f27ea9aa9afc48c26..d3b686e996463bde4b0021aa85a22ecc84a30f49 100644 (file)
--- a/man/halt.xml
+++ b/man/halt.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="halt">
+<refentry id="halt"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>halt</title>
 
         <refentryinfo>
                 <title>halt</title>


@@ -80,8 +81,7 @@
                         <varlistentry>
                                 <term><option>--help</option></term>
 
                         <varlistentry>
                                 <term><option>--help</option></term>
 

-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <xi:include href="standard-options.xml" xpointer="help-text" />

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 4bc05f52ce79cc4e1088c817eea4903b9c2e2c1c..d6d00053985c9ac58edc9a3119f121c4f58817dc 100644 (file)
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.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="hostnamectl" conditional='ENABLE_HOSTNAMED'>
+<refentry id="hostnamectl" conditional='ENABLE_HOSTNAMED'
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>hostnamectl</title>
 
         <refentryinfo>
                 <title>hostnamectl</title>


@@ -94,21 +95,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>--no-ask-password</option></term>
 
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 


@@ -158,6 +144,9 @@
                                 hostnames will be updated.
                                 </para></listitem>
                         </varlistentry>
                                 hostnames will be updated.
                                 </para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 50027b44dd4264d8f4d8b0b8721ec1b9ef8f555a..78fc6f616066be8aaf4e35a70c776e3f842314cf 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -130,28 +130,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-full</option></term>
                                 <term><option>--full</option></term>
                         <varlistentry>
                                 <term><option>--no-full</option></term>
                                 <term><option>--full</option></term>


@@ -866,6 +844,9 @@
                                 operation.</para></listitem>
                         </varlistentry>
 
                                 operation.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 

diff --git a/man/localectl.xml b/man/localectl.xml
index 09e8d41e7d088d58ccf644f620d022a675153e21..bef3edb441d609835e576f6e944569764dc376f6 100644 (file)
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -81,28 +81,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 


@@ -142,6 +120,10 @@
                                 the console to X11, or X11 to console,
                                 respectively.</para></listitem>
                         </varlistentry>
                                 the console to X11, or X11 to console,
                                 respectively.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 38f099edcce81c791d285d5e2ec5b917d5bb0ae0..25eae3159f9fe21e186f48a0982396824229d4b8 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -72,28 +72,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-legend</option></term>
 
                         <varlistentry>
                                 <term><option>--no-legend</option></term>
 


@@ -200,6 +178,9 @@
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 89ab47402cd4f378a6dc448cb8d3a76ee12d6b7a..da539ed087934b518b4c623dfc684fcd4fe8dc62 100644 (file)
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -72,36 +72,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-legend</option></term>
-
-                                <listitem><para>Do not print the legend,
-                                        i.e. the column headers and the
-                                        footer.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-H</option></term>
                                 <term><option>--host=</option></term>
                         <varlistentry>
                                 <term><option>-H</option></term>
                                 <term><option>--host=</option></term>


@@ -189,6 +159,17 @@
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><option>--no-legend</option></term>
+
+                                <listitem><para>Do not print the legend,
+                                        i.e. the column headers and the
+                                        footer.</para></listitem>
+                        </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/runlevel.xml b/man/runlevel.xml
index 5efb340df501e3320f1edf8ec1f6c8a3f2f4b8e0..976753a737ff8ae0da9053266ea5c6b90897ade5 100644 (file)
--- a/man/runlevel.xml
+++ b/man/runlevel.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="runlevel">
+<refentry id="runlevel"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>runlevel</title>
 
         <refentryinfo>
                 <title>runlevel</title>


@@ -78,8 +79,7 @@
                         <varlistentry>
                                 <term><option>--help</option></term>
 
                         <varlistentry>
                                 <term><option>--help</option></term>
 

-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <xi:include href="standard-options.xml" xpointer="help-text" />

                         </varlistentry>
                 </variablelist>
 
                         </varlistentry>
                 </variablelist>
 

diff --git a/man/shutdown.xml b/man/shutdown.xml
index 27e7e87b6c6c5b7327d0952ef0a145c9c38a0651..737258514f45bf036b3a1a01c314e44d5a0308f0 100644 (file)
--- a/man/shutdown.xml
+++ b/man/shutdown.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="shutdown">
+<refentry id="shutdown"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>shutdown</title>
 
         <refentryinfo>
                 <title>shutdown</title>


@@ -94,8 +95,7 @@
                         <varlistentry>
                                 <term><option>--help</option></term>
 
                         <varlistentry>
                                 <term><option>--help</option></term>
 

-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <xi:include href="standard-options.xml" xpointer="help-text" />

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/standard-options.xml b/man/standard-options.xml
new file mode 100644 (file)
index 0000000..7ae8a96
--- /dev/null
+++ b/man/standard-options.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<variablelist>
+  <varlistentry id='help'>
+    <term><option>-h</option></term>
+    <term><option>--help</option></term>
+
+    <listitem id='help-text'>
+      <para>Print a short help text and exit.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry id='version'>
+    <term><option>--version</option></term>
+
+    <listitem id='version-text'>
+      <para>Print a short version string and exit.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry id='no-pager'>
+    <term><option>--no-pager</option></term>
+
+    <listitem>
+      <para>Do not pipe output into a pager.</para>
+    </listitem>
+  </varlistentry>
+</variablelist>

diff --git a/man/systemctl.xml b/man/systemctl.xml
index d6d2c76f2eb9559ad02a8b847135499682a919ce..4bb8b07d61eb4bb90691d9a1f7371c0c5fca0d7e 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -72,22 +72,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <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>-t</option></term>
         <term><option>--type=</option></term>
       <varlistentry>
         <term><option>-t</option></term>
         <term><option>--type=</option></term>


@@ -301,14 +285,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
         </listitem>
       </varlistentry>
 

-      <varlistentry>
-        <term><option>--no-pager</option></term>
-
-        <listitem>
-          <para>Do not pipe output into a pager.</para>
-        </listitem>
-      </varlistentry>
-

       <varlistentry>
         <term><option>--system</option></term>
 
       <varlistentry>
         <term><option>--system</option></term>
 


@@ -515,6 +491,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
         </listitem>
       </varlistentry>
 

+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />
+      <xi:include href="standard-options.xml" xpointer="no-pager" />

     </variablelist>
   </refsect1>
 
     </variablelist>
   </refsect1>
 

diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 35eec1929e009f31f90ed31d1097508446b99d57..717f5c0c28c8303c7ae44865e958c018d7f30d47 100644 (file)
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.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/>.
 -->
 
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="systemd-activate">
+<refentry id="systemd-activate"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
   <refentryinfo>
     <title>systemd-activate</title>
 
   <refentryinfo>
     <title>systemd-activate</title>


@@ -83,21 +84,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
   <refsect1>
     <title>Options</title>
     <variablelist>
   <refsect1>
     <title>Options</title>
     <variablelist>

-      <varlistentry>
-        <term><option>--help</option></term>
-        <term><option>-h</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>-l <replaceable>address</replaceable></option></term>
         <term><option>--listen=<replaceable>address</replaceable></option></term>
       <varlistentry>
         <term><option>-l <replaceable>address</replaceable></option></term>
         <term><option>--listen=<replaceable>address</replaceable></option></term>


@@ -128,6 +114,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         environment of <command>systemd-activate</command> itself.
         </para></listitem>
       </varlistentry>
         environment of <command>systemd-activate</command> itself.
         </para></listitem>
       </varlistentry>

+
+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />

     </variablelist>
   </refsect1>
 
     </variablelist>
   </refsect1>
 

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index de6c2bee2f9473c54124681de108f25f8286b419..7556ef7bce0e1e887e85b6fed9406a2764120fdc 100644 (file)
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -182,14 +182,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>--user</option></term>
 
                         <varlistentry>
                                 <term><option>--user</option></term>
 


@@ -287,13 +279,9 @@
                                 e.g. "50ms".</para></listitem>
                         </varlistentry>
 
                                 e.g. "50ms".</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                                <listitem>
-                                        <para>Do not pipe output into a pager.</para>
-                                </listitem>
-                        </varlistentry>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index db5cb20db5f51a44f9036495abf235ae6498431e..805827efc30ae6e5a92e098fe6d291ee5ac0a460 100644 (file)
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.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-ask-password">
+<refentry id="systemd-ask-password"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-ask-password</title>
 
         <refentryinfo>
                 <title>systemd-ask-password</title>


@@ -103,14 +104,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>--icon=</option></term>
 
                         <varlistentry>
                                 <term><option>--icon=</option></term>
 


@@ -160,6 +153,8 @@
                                 output one password per
                                 line.</para></listitem>
                         </varlistentry>
                                 output one password per
                                 line.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index ae432b563f8a70c0bedb43deca2d83895a6b5007..d0adaad982cbef80e5ecb218f801d91ea2070ea5 100644 (file)
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -26,7 +26,9 @@
   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-bootchart" conditional='ENABLE_BOOTCHART'>
+<refentry id="systemd-bootchart" conditional='ENABLE_BOOTCHART'
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+

         <refentryinfo>
                 <title>systemd-bootchart</title>
                 <productname>systemd</productname>
         <refentryinfo>
                 <title>systemd-bootchart</title>
                 <productname>systemd</productname>


@@ -144,12 +146,7 @@
                 </para>
 
                 <variablelist>
                 </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>
+                        <xi:include href="standard-options.xml" xpointer="help" />

 
                         <varlistentry>
                                 <term><option>-n</option></term>
 
                         <varlistentry>
                                 <term><option>-n</option></term>

diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index e6955c3cee4a89e972c3d39c90a720bd1564ec83..91a6fe36852300babe05d1be52139194cc81d899 100644 (file)
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.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/>.
 -->
 
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="systemd-bus-proxyd" conditional="ENABLE_KDBUS">
+<refentry id="systemd-bus-proxyd" conditional="ENABLE_KDBUS"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
   <refentryinfo>
     <title>systemd-bus-proxyd</title>
 
   <refentryinfo>
     <title>systemd-bus-proxyd</title>


@@ -86,21 +87,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
         </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
     </variablelist>
 
     <para><replaceable>PLACEHOLDER</replaceable>, if given, must be a string

diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index e61a6ac8f97334ee6c46ab25a1492e747c97d818..4098a76bc77099a47136ecee55a4bf60a0ce6cbb 100644 (file)
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.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-cat">
+<refentry id="systemd-cat"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-cat</title>
 
         <refentryinfo>
                 <title>systemd-cat</title>


@@ -81,20 +82,8 @@
                 <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>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

 
                         <varlistentry>
                                 <term><option>-t</option></term>
 
                         <varlistentry>
                                 <term><option>-t</option></term>

diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 955e0da37c4aee2aaced792977a592e9788851c9..230957ba2df453507c374a82fb436a8e9b0a05cd 100644 (file)
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.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-cgls">
+<refentry id="systemd-cgls"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-cgls</title>
 
         <refentryinfo>
                 <title>systemd-cgls</title>


@@ -82,28 +83,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--all</option></term>
 
                         <varlistentry>
                                 <term><option>--all</option></term>
 


@@ -138,6 +117,9 @@
                                 </para></listitem>
                         </varlistentry>
 
                                 </para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 38bddf183c31ba32791d8b4cbc683b92195d69fd..73f8e741898f7d4cd73aead32ae03ecc4d8cec75 100644 (file)
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.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-cgtop">
+<refentry id="systemd-cgtop"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-cgtop</title>
 
         <refentryinfo>
                 <title>systemd-cgtop</title>


@@ -99,21 +100,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 version string and
-                                exits.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-p</option></term>
 
                         <varlistentry>
                                 <term><option>-p</option></term>
 


@@ -197,6 +183,8 @@
                                 3.</para></listitem>
                         </varlistentry>
 
                                 3.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 4318a2fd44c04c645ee943cdf2023a4cee328c4a..092ec56a24fcf454a00fe9525e5cf3aab5de282c 100644 (file)
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.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-coredumpctl" conditional='ENABLE_COREDUMP'>
+<refentry id="systemd-coredumpctl" conditional='ENABLE_COREDUMP'
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-coredumpctl</title>
 
         <refentryinfo>
                 <title>systemd-coredumpctl</title>


@@ -70,21 +71,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>Print a short help
-                                text and exit.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Print a short version
-                                string and exit.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-F</option></term>
                                 <term><option>--field=</option></term>
                         <varlistentry>
                                 <term><option>-F</option></term>
                                 <term><option>--field=</option></term>


@@ -103,14 +89,6 @@
                                 <option>FILE</option>.</para></listitem>
                         </varlistentry>
 
                                 <option>FILE</option>.</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output of
-                                <command>list</command> into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-legend</option></term>
 
                         <varlistentry>
                                 <term><option>--no-legend</option></term>
 


@@ -118,6 +96,9 @@
                                 </para></listitem>
                         </varlistentry>
 
                                 </para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>

diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 23fb8d1df20ec23b2ed02b187fcd0380a7d193b8..9117773b7f7508546acc87f2fcc6acea04c959de 100644 (file)
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.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-delta">
+<refentry id="systemd-delta"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-delta</title>
 
         <refentryinfo>
                 <title>systemd-delta</title>


@@ -107,28 +108,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-t</option></term>
                                 <term><option>--type=</option></term>
                         <varlistentry>
                                 <term><option>-t</option></term>
                                 <term><option>--type=</option></term>


@@ -197,6 +176,9 @@
                                 to <option>true</option>.</para></listitem>
                         </varlistentry>
 
                                 to <option>true</option>.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 69785ceffac88380e0c08691a631c5a17e40b1d9..bdf220eb28ce0df05123a8bf0ee0ff1d64ac4ff5 100644 (file)
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.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-detect-virt">
+<refentry id="systemd-detect-virt"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-detect-virt</title>
 
         <refentryinfo>
                 <title>systemd-detect-virt</title>


@@ -89,21 +90,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>-c</option></term>
                                 <term><option>--container</option></term>
                         <varlistentry>
                                 <term><option>-c</option></term>
                                 <term><option>--container</option></term>


@@ -131,6 +117,8 @@
                                 identifier.</para></listitem>
                         </varlistentry>
 
                                 identifier.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index f915fb8cbd2124929c7a06903f869017a625e52a..555c5414b4d1fd270d992db00a2c8e90a22420ed 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>
 


@@ -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>

diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index f639811e3b99ef61a1efe808e29541bec75d76f5..01b2552015300f8a11e1ba8ad5260ba5426a039e 100644 (file)
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.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/>.
 -->
 
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="systemd-journal-gatewayd.service" conditional='HAVE_MICROHTTPD'>
+<refentry id="systemd-journal-gatewayd.service" conditional='HAVE_MICROHTTPD'
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
   <refentryinfo>
     <title>systemd-journal-gatewayd.service</title>
 
   <refentryinfo>
     <title>systemd-journal-gatewayd.service</title>


@@ -81,21 +82,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para>The following options are understood:</para>
 
     <variablelist>
     <para>The following options are understood:</para>
 
     <variablelist>

-      <varlistentry>
-        <term><option>--help</option></term>
-        <term><option>-h</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>--cert=</option></term>
 
       <varlistentry>
         <term><option>--cert=</option></term>
 


@@ -114,6 +100,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         with <option>--cert=</option>.</para></listitem>
       </varlistentry>
 
         with <option>--cert=</option>.</para></listitem>
       </varlistentry>
 

+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />

     </variablelist>
   </refsect1>
 
     </variablelist>
   </refsect1>
 

diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 7b3aa7e9a07d4e847fa5c685c7321b5c6bfab519..5c34b345d01281bcfc9376357fa32e350d310af8 100644 (file)
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.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-machine-id-setup">
+<refentry id="systemd-machine-id-setup"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-machine-id-setup</title>
 
         <refentryinfo>
                 <title>systemd-machine-id-setup</title>


@@ -95,20 +96,8 @@
                 <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>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index e14977d054b74fa1610f67568cad86a8ce1f5bb0..69baae0dce3759da57828062956c861ade94d52a 100644 (file)
--- 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/>.
 -->
 
   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>
 
         <refentryinfo>
                 <title>systemd-notify</title>


@@ -86,21 +87,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>--ready</option></term>
 
                         <varlistentry>
                                 <term><option>--ready</option></term>
 


@@ -165,6 +151,9 @@
                                 about the semantics of this option see
                                 <citerefentry><refentrytitle>sd_readahead</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
                         </varlistentry>
                                 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>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 8f09c1b41be8ad351170f76f2fd3e425c8963d1b..0a661c9257c035499867b6f929c82bd0d26e8154 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.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-nspawn">
+<refentry id="systemd-nspawn"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-nspawn</title>
 
         <refentryinfo>
                 <title>systemd-nspawn</title>


@@ -158,32 +159,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 version string
-                                and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-q</option></term>
-                                <term><option>--quiet</option></term>
-
-                                <listitem><para>Turns off any status
-                                output by the tool itself. When this
-                                switch is used, the only output
-                                from nspawn will be the console output
-                                of the container OS itself.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-D</option></term>
                                 <term><option>--directory=</option></term>
                         <varlistentry>
                                 <term><option>-D</option></term>
                                 <term><option>--directory=</option></term>


@@ -577,6 +552,20 @@
                                 reported on the
                                 host.</para></listitem>
                         </varlistentry>
                                 reported on the
                                 host.</para></listitem>
                         </varlistentry>

+
+                        <varlistentry>
+                                <term><option>-q</option></term>
+                                <term><option>--quiet</option></term>
+
+                                <listitem><para>Turns off any status
+                                output by the tool itself. When this
+                                switch is used, the only output
+                                from nspawn will be the console output
+                                of the container OS itself.</para></listitem>
+                        </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
index b075f572dcd6eb44beddf8c5fdea88815387687f..67b41f5b26b5cff86ceb054d84cb6ae20a977c79 100644 (file)
--- a/man/systemd-readahead-replay.service.xml
+++ b/man/systemd-readahead-replay.service.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-readahead-replay.service" conditional='ENABLE_READAHEAD'>
+<refentry id="systemd-readahead-replay.service" conditional='ENABLE_READAHEAD'
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-readahead-replay.service</title>
 
         <refentryinfo>
                 <title>systemd-readahead-replay.service</title>


@@ -115,21 +116,6 @@
                 the following options:</para>
 
                 <variablelist>
                 the following options:</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>--max-files=</option></term>
 
                         <varlistentry>
                                 <term><option>--max-files=</option></term>
 


@@ -157,6 +143,9 @@
                                 for the <command>collect</command>
                                 command.</para></listitem>
                         </varlistentry>
                                 for the <command>collect</command>
                                 command.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 4b67b7b5cadcf90a678d585940ea38550db37043..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/>.
 -->
 
 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>
 
   <refentryinfo>
     <title>systemd-run</title>


@@ -88,21 +89,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <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>--user</option></term>
 
       <varlistentry>
         <term><option>--user</option></term>
 


@@ -202,6 +188,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </para>
         </listitem>
       </varlistentry>
         </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
     </variablelist>
 
     <para>All command-line arguments after the first non-option

diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index 8061466d8f832ebfaa12db1e10135cc6594ce8fe..ab80a2b4ba17de823b538d037260907fc419d52d 100644 (file)
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -20,7 +20,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
   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-socket-proxyd">
+<refentry id="systemd-socket-proxyd"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+

         <refentryinfo>
                 <title>systemd-socket-proxyd</title>
                 <productname>systemd</productname>
         <refentryinfo>
                 <title>systemd-socket-proxyd</title>
                 <productname>systemd</productname>


@@ -83,21 +85,8 @@
                 <title>Options</title>
                 <para>The following options are understood:</para>
                 <variablelist>
                 <title>Options</title>
                 <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 version
-                                        string and exits.</para>
-                                </listitem>
-                        </varlistentry>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
         </refsect1>
         <refsect1>
                 </variablelist>
         </refsect1>
         <refsect1>

diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 4abc2781912b534ed64caf0a3267fdf5c9d33f3d..690f961a21caff59870af0f24a9bea9d17eb6b02 100644 (file)
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -22,7 +22,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-suspend.service">
+<refentry id="systemd-suspend.service"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-suspend.service</title>
 
         <refentryinfo>
                 <title>systemd-suspend.service</title>


@@ -125,19 +126,9 @@
                 following commands:</para>
 
                 <variablelist>
                 following commands:</para>
 
                 <variablelist>

-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

 
 

-                                <listitem><para>Print a short help
-                                text and exit.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Print the systemd version
-                                identifier and exit.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><option>suspend</option></term>
                                 <term><option>hibernate</option></term>
                         <varlistentry>
                                 <term><option>suspend</option></term>
                                 <term><option>hibernate</option></term>

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index ba47928b03f024c0c938831e7fb8f1681b062c24..0b6264033d4b8874f99acff502e77d20840a46a0 100644 (file)
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.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-tmpfiles">
+<refentry id="systemd-tmpfiles"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-tmpfiles</title>
 
         <refentryinfo>
                 <title>systemd-tmpfiles</title>


@@ -91,21 +92,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>--create</option></term>
                                 <listitem><para>If this option is
                         <varlistentry>
                                 <term><option>--create</option></term>
                                 <listitem><para>If this option is


@@ -166,6 +152,9 @@
                                 prefix. This option can be specified
                                 multiple times.</para></listitem>
                         </varlistentry>
                                 prefix. This option can be specified
                                 multiple times.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
                 <para>It is possible to combine
                 </variablelist>
 
                 <para>It is possible to combine

diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index cb5fb43d9ca68b9dce8d70733b158ed74bc10865..e0df87d21701ac544aa9e577159a1a17a6f66c37 100644 (file)
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.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-tty-ask-password-agent">
+<refentry id="systemd-tty-ask-password-agent"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-tty-ask-password-agent</title>
 
         <refentryinfo>
                 <title>systemd-tty-ask-password-agent</title>


@@ -76,21 +77,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>--list</option></term>
 
                         <varlistentry>
                                 <term><option>--list</option></term>
 


@@ -141,6 +127,8 @@
                                 calling TTY.  </para></listitem>
                         </varlistentry>
 
                                 calling TTY.  </para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index cd679a449db5ce59f48cfb3dd91a168bf26285a5..f44b7a0482098428f2c1fe7f27c7c8e1fa758548 100644 (file)
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -3,7 +3,9 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 

-<refentry id="systemd-udevd.service">
+<refentry id="systemd-udevd.service"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+

   <refentryinfo>
     <title>systemd-udevd.service</title>
     <productname>systemd</productname>
   <refentryinfo>
     <title>systemd-udevd.service</title>
     <productname>systemd</productname>


@@ -67,18 +69,21 @@
           <para>Detach and run in the background.</para>
         </listitem>
       </varlistentry>
           <para>Detach and run in the background.</para>
         </listitem>
       </varlistentry>

+

       <varlistentry>
         <term><option>--debug</option></term>
         <listitem>
           <para>Print debug messages to standard error.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--debug</option></term>
         <listitem>
           <para>Print debug messages to standard error.</para>
         </listitem>
       </varlistentry>

+

       <varlistentry>
         <term><option>--children-max=</option></term>
         <listitem>
           <para>Limit the number of events executed in parallel.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--children-max=</option></term>
         <listitem>
           <para>Limit the number of events executed in parallel.</para>
         </listitem>
       </varlistentry>

+

       <varlistentry>
         <term><option>--exec-delay=</option></term>
         <listitem>
       <varlistentry>
         <term><option>--exec-delay=</option></term>
         <listitem>


@@ -89,6 +94,7 @@
           modules.</para>
         </listitem>
       </varlistentry>
           modules.</para>
         </listitem>
       </varlistentry>

+

       <varlistentry>
         <term><option>--resolve-names=</option></term>
         <listitem>
       <varlistentry>
         <term><option>--resolve-names=</option></term>
         <listitem>


@@ -100,18 +106,13 @@
           and all devices will be owned by root.</para>
         </listitem>
       </varlistentry>
           and all devices will be owned by root.</para>
         </listitem>
       </varlistentry>

-      <varlistentry>
-        <term><option>--version</option></term>
-        <listitem>
-          <para>Print version number.</para>
-        </listitem>
-      </varlistentry>
+

       <varlistentry>
         <term><option>--help</option></term>
       <varlistentry>
         <term><option>--help</option></term>

-        <listitem>
-          <para>Print help text.</para>
-        </listitem>
+
+        <xi:include href="standard-options.xml" xpointer="help-text" />

       </varlistentry>
       </varlistentry>

+      <xi:include href="standard-options.xml" xpointer="version" />

     </variablelist>
   </refsect1>
 
     </variablelist>
   </refsect1>
 

diff --git a/man/systemd.xml b/man/systemd.xml
index 4abd8902a431d4a579316dfdaa27b8741796911b..331e6c2ff6c4e770c905336ec04fd39e614a381c 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.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">
+<refentry id="systemd"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd</title>
 
         <refentryinfo>
                 <title>systemd</title>


@@ -88,19 +89,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 systemd version
-                                identifier and exits.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><option>--test</option></term>
 
                         <varlistentry>
                                 <term><option>--test</option></term>
 


@@ -264,6 +252,9 @@
                                 to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                                 to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 

diff --git a/man/telinit.xml b/man/telinit.xml
index b20a60a4ca2da2a49f209c85b30961eb6f24c365..1949c950e024b33aed7a44ed9edaf7d6117dff57 100644 (file)
--- a/man/telinit.xml
+++ b/man/telinit.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="telinit">
+<refentry id="telinit"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>telinit</title>
 
         <refentryinfo>
                 <title>telinit</title>


@@ -73,8 +74,7 @@
                         <varlistentry>
                                 <term><option>--help</option></term>
 
                         <varlistentry>
                                 <term><option>--help</option></term>
 

-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <xi:include href="standard-options.xml" xpointer="help-text" />

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index a82e6468cb8a7901f7522d93aa6e97934fe187f4..7ac19e6be43c1e9e77b5d0975780d6c96170c33a 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -68,28 +68,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>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 


@@ -131,6 +109,10 @@
                                 synchronized from the system
                                 clock.</para></listitem>
                         </varlistentry>
                                 synchronized from the system
                                 clock.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
+                        <xi:include href="standard-options.xml" xpointer="no-pager" />

                 </variablelist>
 
                 <para>The following commands are understood:</para>
                 </variablelist>
 
                 <para>The following commands are understood:</para>