summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-13 14:33:51 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-20 22:43:27 -0500
commitdfdebb1b925332352966804303b2516a6506a429 (patch)
tree0f17a9baaeb92f51fc2af27c0ff6eaf837c60e7f
parent7c071fda945a8f9e3b11d37dc04c8bdfa615d44a (diff)
man: xinclude --help/--version/--no-pager
-rw-r--r--Makefile-man.am1
-rw-r--r--man/bootctl.xml19
-rw-r--r--man/busctl.xml51
-rw-r--r--man/halt.xml6
-rw-r--r--man/hostnamectl.xml21
-rw-r--r--man/journalctl.xml25
-rw-r--r--man/localectl.xml26
-rw-r--r--man/loginctl.xml25
-rw-r--r--man/machinectl.xml41
-rw-r--r--man/runlevel.xml6
-rw-r--r--man/shutdown.xml6
-rw-r--r--man/standard-options.xml30
-rw-r--r--man/systemctl.xml27
-rw-r--r--man/systemd-activate.xml21
-rw-r--r--man/systemd-analyze.xml18
-rw-r--r--man/systemd-ask-password.xml13
-rw-r--r--man/systemd-bootchart.xml11
-rw-r--r--man/systemd-bus-proxyd.xml20
-rw-r--r--man/systemd-cat.xml19
-rw-r--r--man/systemd-cgls.xml28
-rw-r--r--man/systemd-cgtop.xml20
-rw-r--r--man/systemd-coredumpctl.xml29
-rw-r--r--man/systemd-delta.xml28
-rw-r--r--man/systemd-detect-virt.xml20
-rw-r--r--man/systemd-inhibit.xml21
-rw-r--r--man/systemd-journal-gatewayd.service.xml20
-rw-r--r--man/systemd-machine-id-setup.xml19
-rw-r--r--man/systemd-notify.xml21
-rw-r--r--man/systemd-nspawn.xml43
-rw-r--r--man/systemd-readahead-replay.service.xml21
-rw-r--r--man/systemd-run.xml21
-rw-r--r--man/systemd-socket-proxyd.xml21
-rw-r--r--man/systemd-suspend.service.xml17
-rw-r--r--man/systemd-tmpfiles.xml21
-rw-r--r--man/systemd-tty-ask-password-agent.xml20
-rw-r--r--man/systemd-udevd.service.xml21
-rw-r--r--man/systemd.xml19
-rw-r--r--man/telinit.xml6
-rw-r--r--man/timedatectl.xml26
39 files changed, 221 insertions, 607 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index b11d5aa361..08f856b852 100644
--- 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/standard-options.xml \
man/sysctl.d.xml \
man/systemctl.xml \
man/systemd-activate.xml \
diff --git a/man/bootctl.xml b/man/bootctl.xml
index 28f1b9203f..5f198471be 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -19,7 +19,8 @@
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>
@@ -74,20 +75,8 @@
<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>
diff --git a/man/busctl.xml b/man/busctl.xml
index f352da1d7b..9a2c63c943 100644
--- 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/>.
-->
-<refentry id="busctl">
+<refentry id="busctl"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>busctl</title>
@@ -70,40 +71,6 @@ 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>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>
<listitem>
@@ -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>
+
+ <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>
diff --git a/man/halt.xml b/man/halt.xml
index f54a8648ad..d3b686e996 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -21,7 +21,8 @@
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>
@@ -80,8 +81,7 @@
<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>
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 4bc05f52ce..d6d0005398 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -21,7 +21,8 @@
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>
@@ -95,21 +96,6 @@
<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>
<listitem><para>Do not query the user
@@ -158,6 +144,9 @@
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>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 50027b44dd..78fc6f6160 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -131,28 +131,6 @@
<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>
<term><option>-l</option></term>
@@ -866,6 +844,9 @@
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>
diff --git a/man/localectl.xml b/man/localectl.xml
index 09e8d41e7d..bef3edb441 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -82,28 +82,6 @@
<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>
<listitem><para>Do not query the user
@@ -142,6 +120,10 @@
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>
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 38f099edcc..25eae3159f 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -73,28 +73,6 @@
<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>
@@ -200,6 +178,9 @@
<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>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 89ab47402c..da539ed087 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -73,36 +73,6 @@
<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>
@@ -189,6 +159,17 @@
<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>
diff --git a/man/runlevel.xml b/man/runlevel.xml
index 5efb340df5..976753a737 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -21,7 +21,8 @@
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>
@@ -78,8 +79,7 @@
<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>
diff --git a/man/shutdown.xml b/man/shutdown.xml
index 27e7e87b6c..737258514f 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -21,7 +21,8 @@
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>
@@ -94,8 +95,7 @@
<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>
diff --git a/man/standard-options.xml b/man/standard-options.xml
new file mode 100644
index 0000000000..7ae8a965c2
--- /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 d6d2c76f2e..4bb8b07d61 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -73,22 +73,6 @@ 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>
-
- <listitem>
- <para>Prints a short version string and exits.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-t</option></term>
<term><option>--type=</option></term>
@@ -302,14 +286,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</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>
<listitem>
@@ -515,6 +491,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</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>
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 35eec1929e..717f5c0c28 100644
--- 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/>.
-->
-<refentry id="systemd-activate">
+<refentry id="systemd-activate"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-activate</title>
@@ -84,21 +85,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<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>
@@ -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>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index de6c2bee2f..7556ef7bce 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -183,14 +183,6 @@
<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>
<listitem><para>Shows performance data
@@ -287,13 +279,9 @@
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>
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index db5cb20db5..805827efc3 100644
--- 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/>.
-->
-<refentry id="systemd-ask-password">
+<refentry id="systemd-ask-password"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-ask-password</title>
@@ -104,14 +105,6 @@
<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>
<listitem><para>Specify an icon name
@@ -160,6 +153,8 @@
output one password per
line.</para></listitem>
</varlistentry>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
</refsect1>
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index ae432b563f..d0adaad982 100644
--- 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/>.
-->
-<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>
@@ -144,12 +146,7 @@
</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>
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index e6955c3cee..91a6fe3685 100644
--- 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/>.
-->
-<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>
@@ -86,21 +87,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</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
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index e61a6ac8f9..4098a76bc7 100644
--- 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/>.
-->
-<refentry id="systemd-cat">
+<refentry id="systemd-cat"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-cat</title>
@@ -81,20 +82,8 @@
<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>
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 955e0da37c..230957ba2d 100644
--- 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/>.
-->
-<refentry id="systemd-cgls">
+<refentry id="systemd-cgls"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-cgls</title>
@@ -83,28 +84,6 @@
<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>
<listitem><para>Do not hide empty
@@ -138,6 +117,9 @@
</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>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 38bddf183c..73f8e74189 100644
--- 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/>.
-->
-<refentry id="systemd-cgtop">
+<refentry id="systemd-cgtop"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-cgtop</title>
@@ -100,21 +101,6 @@
<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>
<listitem><para>Order by control group
@@ -197,6 +183,8 @@
3.</para></listitem>
</varlistentry>
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 4318a2fd44..092ec56a24 100644
--- 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/>.
-->
-<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>
@@ -71,21 +72,6 @@
<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>
@@ -104,20 +90,15 @@
</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>
<listitem><para>Do not print the column headers.
</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>
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 23fb8d1df2..9117773b7f 100644
--- 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/>.
-->
-<refentry id="systemd-delta">
+<refentry id="systemd-delta"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-delta</title>
@@ -108,28 +109,6 @@
<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>
@@ -197,6 +176,9 @@
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>
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 69785ceffa..bdf220eb28 100644
--- 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/>.
-->
-<refentry id="systemd-detect-virt">
+<refentry id="systemd-detect-virt"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-detect-virt</title>
@@ -90,21 +91,6 @@
<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>
@@ -131,6 +117,8 @@
identifier.</para></listitem>
</varlistentry>
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index f915fb8cbd..555c5414b4 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-inhibit">
+<refentry id="systemd-inhibit"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-inhibit</title>
@@ -84,21 +85,6 @@
<variablelist>
<varlistentry>
- <term><option>-h</option></term>
- <term><option>--help</option></term>
-
- <listitem><para>Prints a short help
- text and exits.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--version</option></term>
-
- <listitem><para>Prints a short version
- string and exits.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--what=</option></term>
<listitem><para>Takes a colon-separated
@@ -172,6 +158,9 @@
inhibition locks instead of acquiring
one.</para></listitem>
</varlistentry>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index f639811e3b..01b2552015 100644
--- 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/>.
-->
-<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>
@@ -82,21 +83,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<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>
<listitem><para>Specify the path to a file containing a server
@@ -114,6 +100,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
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>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 7b3aa7e9a0..5c34b345d0 100644
--- 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/>.
-->
-<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>
@@ -95,20 +96,8 @@
<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>
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index e14977d054..69baae0dce 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-notify">
+<refentry id="systemd-notify"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-notify</title>
@@ -87,21 +88,6 @@
<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>
<listitem><para>Inform the init system
@@ -165,6 +151,9 @@
about the semantics of this option see
<citerefentry><refentrytitle>sd_readahead</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
</varlistentry>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 8f09c1b41b..0a661c9257 100644
--- 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/>.
-->
-<refentry id="systemd-nspawn">
+<refentry id="systemd-nspawn"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-nspawn</title>
@@ -159,32 +160,6 @@
<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>
@@ -577,6 +552,20 @@
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>
diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
index b075f572dc..67b41f5b26 100644
--- 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/>.
-->
-<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>
@@ -116,21 +117,6 @@
<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>
<listitem><para>Maximum number of
@@ -157,6 +143,9 @@
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>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 4b67b7b5ca..87640fc259 100644
--- 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,21 +90,6 @@ 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>
-
- <listitem><para>Prints a short version
- string and exits.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--user</option></term>
<listitem>
@@ -202,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
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index 8061466d8f..ab80a2b4ba 100644
--- 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/>.
-->
-<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>
@@ -83,21 +85,8 @@
<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>
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 4abc278191..690f961a21 100644
--- 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/>.
-->
-<refentry id="systemd-suspend.service">
+<refentry id="systemd-suspend.service"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-suspend.service</title>
@@ -125,19 +126,9 @@
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>
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index ba47928b03..0b6264033d 100644
--- 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/>.
-->
-<refentry id="systemd-tmpfiles">
+<refentry id="systemd-tmpfiles"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-tmpfiles</title>
@@ -92,21 +93,6 @@
<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
passed, all files and directories
@@ -166,6 +152,9 @@
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
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index cb5fb43d9c..e0df87d217 100644
--- 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/>.
-->
-<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>
@@ -77,21 +78,6 @@
<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>
<listitem><para>Lists all currently pending system password requests.</para></listitem>
@@ -141,6 +127,8 @@
calling TTY. </para></listitem>
</varlistentry>
+ <xi:include href="standard-options.xml" xpointer="help" />
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index cd679a449d..f44b7a0482 100644
--- 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">
-<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>
@@ -67,18 +69,21 @@
<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>--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>
@@ -89,6 +94,7 @@
modules.</para>
</listitem>
</varlistentry>
+
<varlistentry>
<term><option>--resolve-names=</option></term>
<listitem>
@@ -100,18 +106,13 @@
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>
- <listitem>
- <para>Print help text.</para>
- </listitem>
+
+ <xi:include href="standard-options.xml" xpointer="help-text" />
</varlistentry>
+ <xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
</refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index 4abd8902a4..331e6c2ff6 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -21,7 +21,8 @@
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>
@@ -89,19 +90,6 @@
<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>
<listitem><para>Determine startup
@@ -264,6 +252,9 @@
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>
diff --git a/man/telinit.xml b/man/telinit.xml
index b20a60a4ca..1949c950e0 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -21,7 +21,8 @@
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>
@@ -73,8 +74,7 @@
<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>
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index a82e6468cb..7ac19e6be4 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -69,28 +69,6 @@
<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>
<listitem><para>Do not query the user
@@ -131,6 +109,10 @@
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>