[systemd-commits] 7 commits - Makefile.am Makefile-man.am man/bootctl.xml man/busctl.xml man/halt.xml man/hostnamectl.xml man/journalctl.xml man/libsystemd-pkgconfig.xml man/localectl.xml man/loginctl.xml man/machinectl.xml man/runlevel.xml man/sd_booted.xml man/sd_bus_creds_get_pid.xml man/sd_bus_creds_new_from_pid.xml man/sd_bus_error.xml man/sd_bus_label_escape.xml man/sd_bus_message_get_cookie.xml man/sd_bus_message_get_monotonic_usec.xml man/sd_bus_new.xml man/sd_bus_open_user.xml man/sd_bus_request_name.xml man/sd-daemon.xml man/sd-id128.xml man/sd_is_fifo.xml man/sd-journal.xml man/sd_listen_fds.xml man/sd-login.xml man/sd_notify.xml man/sd_watchdog_enabled.xml man/shutdown.xml man/standard-options.xml man/systemctl.xml man/systemd-activate.xml man/systemd-analyze.xml man/systemd-ask-password.xml man/systemd-bootchart.xml man/systemd-bus-proxyd.xml man/systemd-cat.xml man/systemd-cgls.xml man/systemd-cgtop.xml man/systemd-coredumpctl.xml man/systemd-delta.xml man/systemd-detect-virt.xm l man/systemd-inhibit.xml man/systemd-journal-gatewayd.service.xml man/systemd-machine-id-setup.xml man/systemd-notify.xml man/systemd-nspawn.xml man/systemd-readahead-replay.service.xml man/systemd-run.xml man/systemd-socket-proxyd.xml man/systemd-suspend.service.xml man/systemd-tmpfiles.xml man/systemd-tty-ask-password-agent.xml man/systemd-udevd.service.xml man/systemd.xml man/telinit.xml man/timedatectl.xml man/user-system-options.xml src/core TODO tools/make-man-rules.py
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Thu Feb 20 19:47:08 PST 2014
Makefile-man.am | 392 +++++++++++++++---------------
Makefile.am | 3
TODO | 7
man/bootctl.xml | 19 -
man/busctl.xml | 94 +------
man/halt.xml | 6
man/hostnamectl.xml | 35 --
man/journalctl.xml | 25 -
man/libsystemd-pkgconfig.xml | 12
man/localectl.xml | 40 ---
man/loginctl.xml | 49 ---
man/machinectl.xml | 65 +---
man/runlevel.xml | 6
man/sd-daemon.xml | 12
man/sd-id128.xml | 13
man/sd-journal.xml | 12
man/sd-login.xml | 12
man/sd_booted.xml | 9
man/sd_bus_creds_get_pid.xml | 2
man/sd_bus_creds_new_from_pid.xml | 2
man/sd_bus_error.xml | 2
man/sd_bus_label_escape.xml | 2
man/sd_bus_message_get_cookie.xml | 2
man/sd_bus_message_get_monotonic_usec.xml | 2
man/sd_bus_new.xml | 2
man/sd_bus_open_user.xml | 2
man/sd_bus_request_name.xml | 2
man/sd_is_fifo.xml | 8
man/sd_listen_fds.xml | 8
man/sd_notify.xml | 8
man/sd_watchdog_enabled.xml | 8
man/shutdown.xml | 6
man/standard-options.xml | 30 ++
man/systemctl.xml | 69 -----
man/systemd-activate.xml | 21 -
man/systemd-analyze.xml | 41 ---
man/systemd-ask-password.xml | 13
man/systemd-bootchart.xml | 11
man/systemd-bus-proxyd.xml | 20 -
man/systemd-cat.xml | 19 -
man/systemd-cgls.xml | 28 --
man/systemd-cgtop.xml | 20 -
man/systemd-coredumpctl.xml | 29 --
man/systemd-delta.xml | 28 --
man/systemd-detect-virt.xml | 20 -
man/systemd-inhibit.xml | 21 -
man/systemd-journal-gatewayd.service.xml | 20 -
man/systemd-machine-id-setup.xml | 19 -
man/systemd-notify.xml | 21 -
man/systemd-nspawn.xml | 43 +--
man/systemd-readahead-replay.service.xml | 21 -
man/systemd-run.xml | 65 ----
man/systemd-socket-proxyd.xml | 21 -
man/systemd-suspend.service.xml | 17 -
man/systemd-tmpfiles.xml | 21 -
man/systemd-tty-ask-password-agent.xml | 20 -
man/systemd-udevd.service.xml | 21 -
man/systemd.xml | 19 -
man/telinit.xml | 6
man/timedatectl.xml | 50 ---
man/user-system-options.xml | 45 +++
src/core/service.c | 5
tools/make-man-rules.py | 8
63 files changed, 558 insertions(+), 1101 deletions(-)
New commits:
commit 6a70f3aa63a3b7a6a30448c48322ad38b719cdce
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Feb 20 22:39:26 2014 -0500
man: xinclude pkg-config note
diff --git a/Makefile-man.am b/Makefile-man.am
index 3d43560..aad3f44 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1328,6 +1328,7 @@ EXTRA_DIST += \
man/kernel-command-line.xml \
man/kernel-install.xml \
man/less-variables.xml \
+ man/libsystemd-pkgconfig.xml \
man/locale.conf.xml \
man/localectl.xml \
man/localtime.xml \
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
new file mode 100644
index 0000000..56a72e1
--- /dev/null
+++ b/man/libsystemd-pkgconfig.xml
@@ -0,0 +1,12 @@
+<?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">
+
+<refsect1>
+ <title>Notes</title>
+
+ <para id='pkgconfig-text'>These APIs are implemented as a shared
+ library, which can be compiled and linked to with the
+ <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ file.</para>
+</refsect1>
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 9eef395..2b4f3a5 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd-daemon">
+<refentry id="sd-daemon"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd-daemon</title>
@@ -122,14 +123,7 @@
</example>
</refsect1>
- <refsect1>
- <title>Notes</title>
-
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
- </refsect1>
+ <xi:include href="libsystemd-pkgconfig.xml" />
<refsect1>
<title>See Also</title>
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 1d42710..5a4146a 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd-id128">
+<refentry id="sd-id128"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd-id128</title>
@@ -152,15 +153,7 @@
<option>--new-id</option> option.</para>
</refsect1>
- <refsect1>
- <title>Notes</title>
-
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <literal>libsystemd</literal>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
-
- </refsect1>
+ <xi:include href="libsystemd-pkgconfig.xml" />
<refsect1>
<title>See Also</title>
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index ca7e2f3..7a05aee 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd-journal">
+<refentry id="sd-journal"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd-journal</title>
@@ -95,14 +96,7 @@
tool.</para>
</refsect1>
- <refsect1>
- <title>Notes</title>
-
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
- </refsect1>
+ <xi:include href="libsystemd-pkgconfig.xml" />
<refsect1>
<title>See Also</title>
diff --git a/man/sd-login.xml b/man/sd-login.xml
index a0df903..e68f4fd 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd-login" conditional='HAVE_PAM'>
+<refentry id="sd-login" conditional='HAVE_PAM'
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd-login</title>
@@ -117,14 +118,7 @@
implemented.</para>
</refsect1>
- <refsect1>
- <title>Notes</title>
-
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
- </refsect1>
+ <xi:include href="libsystemd-pkgconfig.xml" />
<refsect1>
<title>See Also</title>
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index f699cef..28c153a 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_booted">
+<refentry id="sd_booted"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd_booted</title>
@@ -76,17 +77,13 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
+ <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, this function checks whether the
directory <filename>/run/systemd/system/</filename>
exists. A simple check like this can also be
implemented trivially in shell or any other
language.</para>
-
</refsect1>
<refsect1>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 60684bc..bb851d1 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_is_fifo">
+<refentry id="sd_is_fifo"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd_is_fifo</title>
@@ -185,10 +186,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
+ <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, these function use a combination of
<filename>fstat()</filename> and
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 88fb77b..6999db9 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_listen_fds">
+<refentry id="sd_listen_fds"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd_listen_fds</title>
@@ -121,10 +122,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
+ <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, this function checks whether the
<varname>$LISTEN_PID</varname> environment variable
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 3e53075..6bf8230 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_notify">
+<refentry id="sd_notify"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd_notify</title>
@@ -211,10 +212,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
+ <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, these functions send a single
datagram with the state string as payload to the
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 0e4df37..88d1e5b 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_watchdog_enabled">
+<refentry id="sd_watchdog_enabled"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>sd_watchdog_enabled</title>
@@ -115,10 +116,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as a shared library,
- which can be compiled and linked to with the
- <constant>libsystemd</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- file.</para>
+ <xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, this functions parses the
<varname>$WATCHDOG_PID</varname> and
commit 4f50d2efbac87aba0505b9f998bf3e4bde64c214
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Feb 20 19:47:03 2014 -0500
man: xinclude --host/--machine
As usual, those common options are pushed to the end.
diff --git a/man/busctl.xml b/man/busctl.xml
index 7947c8d..9865b17 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -71,26 +71,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<variablelist>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host</option></term>
-
- <listitem>
- <para>Execute the operation remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>, to
- connect to. This will use SSH to talk to the remote systemd
- instance.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a local container.
- Specify a container name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--address=<replaceable>ADDRESS</replaceable></option></term>
<listitem><para>Connect to the bus specified by
@@ -155,6 +135,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<xi:include href="user-system-options.xml" xpointer="user" />
<xi:include href="user-system-options.xml" xpointer="system" />
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index d6d0005..6746a70 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -112,18 +112,6 @@
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote
- system.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--static</option></term>
<term><option>--transient</option></term>
<term><option>--pretty</option></term>
@@ -145,6 +133,8 @@
</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
diff --git a/man/localectl.xml b/man/localectl.xml
index bef3edb..c2e79a2 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -98,18 +98,6 @@
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote
- system.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--no-convert</option></term>
<listitem><para>If
@@ -121,6 +109,8 @@
respectively.</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+
<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" />
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 25eae31..749db92 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -91,27 +91,6 @@
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote login manager
- instance.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a
- local container. Specify a container
- name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-p</option></term>
<term><option>--property=</option></term>
@@ -178,6 +157,9 @@
<constant>SIGTERM</constant>.</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
+
<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" />
diff --git a/man/machinectl.xml b/man/machinectl.xml
index da539ed..89dca9c 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -73,27 +73,6 @@
<variablelist>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host=</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote machine manager
- instance.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a
- local container. Specify a container
- name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-p</option></term>
<term><option>--property=</option></term>
@@ -167,6 +146,9 @@
footer.</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
+
<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" />
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 379bf26..355cd11 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -423,27 +423,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host</option></term>
-
- <listitem>
- <para>Execute the operation remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>, to
- connect to. This will use SSH to talk to the remote systemd
- instance.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a local
- container. Specify a container name to connect
- to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-n</option></term>
<term><option>--lines=</option></term>
@@ -477,6 +456,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
+
<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" />
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 7556ef7..c7a2598 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -199,28 +199,6 @@
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host=</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by
- <literal>@</literal>, to connect
- to. This will use SSH to talk to the
- remote machine manager
- instance.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a
- local container. Specify a container
- name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--order</option></term>
<term><option>--require</option></term>
@@ -279,6 +257,9 @@
e.g. "50ms".</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
+
<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" />
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index fc2131e..064195a 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -90,27 +90,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<variablelist>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host=</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote machine manager
- instance.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute the operation on a
- local container. Specify a container
- name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--scope</option></term>
<listitem>
@@ -173,6 +152,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<xi:include href="user-system-options.xml" xpointer="user" />
<xi:include href="user-system-options.xml" xpointer="system" />
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 7ac19e6..ee75d42 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -77,27 +77,6 @@
</varlistentry>
<varlistentry>
- <term><option>-H</option></term>
- <term><option>--host=</option></term>
-
- <listitem><para>Execute the operation
- remotely. Specify a hostname, or
- username and hostname separated by <literal>@</literal>,
- to connect to. This will use SSH to
- talk to the remote machine manager
- instance.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-M</option></term>
- <term><option>--machine=</option></term>
-
- <listitem><para>Execute operation on a
- local container. Specify a container
- name to connect to.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--adjust-system-clock</option></term>
<listitem><para>If
@@ -110,6 +89,9 @@
clock.</para></listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="host" />
+ <xi:include href="user-system-options.xml" xpointer="machine" />
+
<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" />
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 0863960..cca5c79 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -20,4 +20,26 @@
implied default.</para>
</listitem>
</varlistentry>
+
+ <varlistentry id='host'>
+ <term><option>-H</option></term>
+ <term><option>--host=</option></term>
+
+ <listitem id='host-text'>
+ <para>Execute the operation remotely. Specify a hostname, or
+ username and hostname separated by <literal>@</literal>, to
+ connect to. This will use SSH to talk to the remote machine
+ manager instance.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id='machine'>
+ <term><option>-M</option></term>
+ <term><option>--machine=</option></term>
+
+ <listitem id='machine-text'>
+ <para>Execute operation on a local container. Specify a
+ container name to connect to.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
commit 88ae7333ee052e64607ae6678fe0e84991fe3482
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Feb 13 14:40:40 2014 -0500
man: xinclude --user/--system
diff --git a/Makefile-man.am b/Makefile-man.am
index 08f856b..3d43560 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1472,4 +1472,5 @@ EXTRA_DIST += \
man/tmpfiles.d.xml \
man/udev.xml \
man/udevadm.xml \
+ man/user-system-options.xml \
man/vconsole.conf.xml
diff --git a/man/busctl.xml b/man/busctl.xml
index 9a2c63c..7947c8d 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -71,24 +71,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<variablelist>
<varlistentry>
- <term><option>--system</option></term>
-
- <listitem>
- <para>Talk to the systemd system manager (the
- default).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--user</option></term>
-
- <listitem>
- <para>Talk to the systemd manager of the calling
- user.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-H</option></term>
<term><option>--host</option></term>
@@ -171,6 +153,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="user" />
+ <xi:include href="user-system-options.xml" xpointer="system" />
+
<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" />
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 4bb8b07..379bf26 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -285,22 +285,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--system</option></term>
-
- <listitem>
- <para>Talk to the systemd system manager. (Default)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--user</option></term>
-
- <listitem>
- <para>Talk to the systemd manager of the calling
- user.</para>
- </listitem>
- </varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="user" />
+ <xi:include href="user-system-options.xml" xpointer="system" />
<varlistentry>
<term><option>--no-wall</option></term>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 87640fc..fc2131e 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -90,24 +90,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<variablelist>
<varlistentry>
- <term><option>--user</option></term>
-
- <listitem>
- <para>Talk to the service manager of the calling user,
- rather than the service manager of the system.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--system</option></term>
-
- <listitem>
- <para>Talk to the service manager of the system. This is the
- implied default.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-H</option></term>
<term><option>--host=</option></term>
@@ -189,6 +171,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</listitem>
</varlistentry>
+ <xi:include href="user-system-options.xml" xpointer="user" />
+ <xi:include href="user-system-options.xml" xpointer="system" />
+
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
new file mode 100644
index 0000000..0863960
--- /dev/null
+++ b/man/user-system-options.xml
@@ -0,0 +1,23 @@
+<?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='user'>
+ <term><option>--user</option></term>
+
+ <listitem id='user-text'>
+ <para>Talk to the service manager of the calling user,
+ rather than the service manager of the system.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id='system'>
+ <term><option>--system</option></term>
+
+ <listitem id='system-text'>
+ <para>Talk to the service manager of the system. This is the
+ implied default.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
commit dfdebb1b925332352966804303b2516a6506a429
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Feb 13 14:33:51 2014 -0500
man: xinclude --help/--version/--no-pager
diff --git a/Makefile-man.am b/Makefile-man.am
index b11d5aa..08f856b 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 28f1b92..5f19847 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 f352da1..9a2c63c 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 f54a864..d3b686e 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 4bc05f5..d6d0005 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 50027b4..78fc6f6 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 09e8d41..bef3edb 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 38f099e..25eae31 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 89ab474..da539ed 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 5efb340..976753a 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 27e7e87..7372585 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 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 d6d2c76..4bb8b07 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 35eec19..717f5c0 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 de6c2be..7556ef7 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 db5cb20..805827e 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 ae432b5..d0adaad 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 e6955c3..91a6fe3 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 e61a6ac..4098a76 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 955e0da..230957b 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 38bddf1..73f8e74 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 4318a2f..092ec56 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 23fb8d1..9117773 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 69785ce..bdf220e 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 f915fb8..555c541 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 f639811..01b2552 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 7b3aa7e..5c34b34 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 e14977d..69baae0 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 8f09c1b..0a661c9 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 b075f57..67b41f5 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 4b67b7b..87640fc 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 8061466..ab80a2b 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 4abc278..690f961 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 ba47928..0b62640 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 cb5fb43..e0df87d 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 cd679a4..f44b7a0 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 4abd890..331e6c2 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 b20a60a..1949c95 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 a82e646..7ac19e6 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>
commit 7c071fda945a8f9e3b11d37dc04c8bdfa615d44a
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Feb 19 16:04:30 2014 -0500
build-sys: add conditionals and regenerate manpage list
The list of man pages is auto generated, based on conditonal='...'
attributes in the man page itself.
diff --git a/Makefile-man.am b/Makefile-man.am
index e87dae8..b11d5aa 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -235,53 +235,6 @@ man/SD_WARNING.3: man/sd-daemon.3
man/init.1: man/systemd.1
man/poweroff.8: man/halt.8
man/reboot.8: man/halt.8
-man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_pid_starttime.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
-man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
-man/sd_bus_default_system.3: man/sd_bus_open_user.3
-man/sd_bus_default_user.3: man/sd_bus_open_user.3
-man/sd_bus_error_copy.3: man/sd_bus_error.3
-man/sd_bus_error_free.3: man/sd_bus_error.3
-man/sd_bus_error_get_errno.3: man/sd_bus_error.3
-man/sd_bus_error_has_name.3: man/sd_bus_error.3
-man/sd_bus_error_is_set.3: man/sd_bus_error.3
-man/sd_bus_error_set.3: man/sd_bus_error.3
-man/sd_bus_error_set_const.3: man/sd_bus_error.3
-man/sd_bus_error_set_errno.3: man/sd_bus_error.3
-man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
-man/sd_bus_label_unescape.3: man/sd_bus_label_escape.3
-man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
-man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
-man/sd_bus_open_system.3: man/sd_bus_open_user.3
-man/sd_bus_open_system_container.3: man/sd_bus_open_user.3
-man/sd_bus_open_system_remote.3: man/sd_bus_open_user.3
-man/sd_bus_ref.3: man/sd_bus_new.3
-man/sd_bus_release_name.3: man/sd_bus_request_name.3
-man/sd_bus_unref.3: man/sd_bus_new.3
man/sd_id128_equal.3: man/sd-id128.3
man/sd_id128_from_string.3: man/sd_id128_to_string.3
man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
@@ -440,147 +393,6 @@ man/poweroff.html: man/halt.html
man/reboot.html: man/halt.html
$(html-alias)
-man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_pid_starttime.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
- $(html-alias)
-
-man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
- $(html-alias)
-
-man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
- $(html-alias)
-
-man/sd_bus_default_system.html: man/sd_bus_open_user.html
- $(html-alias)
-
-man/sd_bus_default_user.html: man/sd_bus_open_user.html
- $(html-alias)
-
-man/sd_bus_error_copy.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_free.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_get_errno.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_has_name.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_is_set.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_set.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_set_const.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_set_errno.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
- $(html-alias)
-
-man/sd_bus_label_unescape.html: man/sd_bus_label_escape.html
- $(html-alias)
-
-man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
- $(html-alias)
-
-man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
- $(html-alias)
-
-man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
- $(html-alias)
-
-man/sd_bus_open_system.html: man/sd_bus_open_user.html
- $(html-alias)
-
-man/sd_bus_open_system_container.html: man/sd_bus_open_user.html
- $(html-alias)
-
-man/sd_bus_open_system_remote.html: man/sd_bus_open_user.html
- $(html-alias)
-
-man/sd_bus_ref.html: man/sd_bus_new.html
- $(html-alias)
-
-man/sd_bus_release_name.html: man/sd_bus_request_name.html
- $(html-alias)
-
-man/sd_bus_unref.html: man/sd_bus_new.html
- $(html-alias)
-
man/sd_id128_equal.html: man/sd-id128.html
$(html-alias)
@@ -869,8 +681,6 @@ endif
if ENABLE_KDBUS
MANPAGES += \
- man/systemd-bus-proxyd.8 \
- man/systemd-bus-proxyd at .service.8 \
man/sd_bus_creds_get_pid.3 \
man/sd_bus_creds_new_from_pid.3 \
man/sd_bus_error.3 \
@@ -879,9 +689,10 @@ MANPAGES += \
man/sd_bus_message_get_monotonic_usec.3 \
man/sd_bus_new.3 \
man/sd_bus_open_user.3 \
- man/sd_bus_request_name.3
+ man/sd_bus_request_name.3 \
+ man/systemd-bus-proxyd.8 \
+ man/systemd-bus-proxyd at .service.8
MANPAGES_ALIAS += \
- man/systemd-bus-proxyd.socket.8 \
man/sd_bus_creds_get_audit_login_uid.3 \
man/sd_bus_creds_get_audit_session_id.3 \
man/sd_bus_creds_get_cgroup.3 \
@@ -928,8 +739,197 @@ MANPAGES_ALIAS += \
man/sd_bus_open_system_remote.3 \
man/sd_bus_ref.3 \
man/sd_bus_release_name.3 \
- man/sd_bus_unref.3
+ man/sd_bus_unref.3 \
+ man/systemd-bus-proxyd.socket.8
+man/sd_bus_creds_get_audit_login_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_audit_session_id.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_cgroup.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_cmdline.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_comm.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_exe.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_gid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_mask.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_creds_get_owner_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_pid_starttime.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_selinux_context.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_session.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_slice.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_tid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_tid_comm.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_uid.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_unique_name.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_unit.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_user_unit.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_get_well_known_names.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_bounding_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_effective_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_inheritable_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_has_permitted_cap.3: man/sd_bus_creds_get_pid.3
+man/sd_bus_creds_ref.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_creds_unref.3: man/sd_bus_creds_new_from_pid.3
+man/sd_bus_default_system.3: man/sd_bus_open_user.3
+man/sd_bus_default_user.3: man/sd_bus_open_user.3
+man/sd_bus_error_copy.3: man/sd_bus_error.3
+man/sd_bus_error_free.3: man/sd_bus_error.3
+man/sd_bus_error_get_errno.3: man/sd_bus_error.3
+man/sd_bus_error_has_name.3: man/sd_bus_error.3
+man/sd_bus_error_is_set.3: man/sd_bus_error.3
+man/sd_bus_error_set.3: man/sd_bus_error.3
+man/sd_bus_error_set_const.3: man/sd_bus_error.3
+man/sd_bus_error_set_errno.3: man/sd_bus_error.3
+man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
+man/sd_bus_label_unescape.3: man/sd_bus_label_escape.3
+man/sd_bus_message_get_realtime_usec.3: man/sd_bus_message_get_monotonic_usec.3
+man/sd_bus_message_get_reply_cookie.3: man/sd_bus_message_get_cookie.3
+man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
+man/sd_bus_open_system.3: man/sd_bus_open_user.3
+man/sd_bus_open_system_container.3: man/sd_bus_open_user.3
+man/sd_bus_open_system_remote.3: man/sd_bus_open_user.3
+man/sd_bus_ref.3: man/sd_bus_new.3
+man/sd_bus_release_name.3: man/sd_bus_request_name.3
+man/sd_bus_unref.3: man/sd_bus_new.3
man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd at .service.8
+man/sd_bus_creds_get_audit_login_uid.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_audit_session_id.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_cgroup.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_cmdline.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_comm.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_exe.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_gid.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_mask.html: man/sd_bus_creds_new_from_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_owner_uid.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_pid_starttime.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_selinux_context.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_session.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_slice.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_tid.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_tid_comm.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_uid.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_unique_name.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_unit.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_user_unit.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_get_well_known_names.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_has_bounding_cap.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_has_effective_cap.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_has_inheritable_cap.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_has_permitted_cap.html: man/sd_bus_creds_get_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_ref.html: man/sd_bus_creds_new_from_pid.html
+ $(html-alias)
+
+man/sd_bus_creds_unref.html: man/sd_bus_creds_new_from_pid.html
+ $(html-alias)
+
+man/sd_bus_default_system.html: man/sd_bus_open_user.html
+ $(html-alias)
+
+man/sd_bus_default_user.html: man/sd_bus_open_user.html
+ $(html-alias)
+
+man/sd_bus_error_copy.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_free.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_get_errno.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_has_name.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_is_set.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_set.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_set_const.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_set_errno.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
+ $(html-alias)
+
+man/sd_bus_label_unescape.html: man/sd_bus_label_escape.html
+ $(html-alias)
+
+man/sd_bus_message_get_realtime_usec.html: man/sd_bus_message_get_monotonic_usec.html
+ $(html-alias)
+
+man/sd_bus_message_get_reply_cookie.html: man/sd_bus_message_get_cookie.html
+ $(html-alias)
+
+man/sd_bus_message_get_seqnum.html: man/sd_bus_message_get_monotonic_usec.html
+ $(html-alias)
+
+man/sd_bus_open_system.html: man/sd_bus_open_user.html
+ $(html-alias)
+
+man/sd_bus_open_system_container.html: man/sd_bus_open_user.html
+ $(html-alias)
+
+man/sd_bus_open_system_remote.html: man/sd_bus_open_user.html
+ $(html-alias)
+
+man/sd_bus_ref.html: man/sd_bus_new.html
+ $(html-alias)
+
+man/sd_bus_release_name.html: man/sd_bus_request_name.html
+ $(html-alias)
+
+man/sd_bus_unref.html: man/sd_bus_new.html
+ $(html-alias)
+
man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd at .service.html
$(html-alias)
@@ -1313,7 +1313,7 @@ MANPAGES_ALIAS += \
endif
EXTRA_DIST += \
-man/binfmt.d.xml \
+ man/binfmt.d.xml \
man/bootchart.conf.xml \
man/bootctl.xml \
man/bootup.xml \
@@ -1327,6 +1327,7 @@ man/binfmt.d.xml \
man/journald.conf.xml \
man/kernel-command-line.xml \
man/kernel-install.xml \
+ man/less-variables.xml \
man/locale.conf.xml \
man/localectl.xml \
man/localtime.xml \
diff --git a/Makefile.am b/Makefile.am
index 6f8d3b5..c5724dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,8 +646,7 @@ EXTRA_DIST += \
tools/make-man-index.py \
tools/make-directive-index.py \
tools/make-man-rules.py \
- tools/xml_helper.py \
- man/less-variables.xml
+ tools/xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 0a9b5d0..f84fbae 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -21,7 +21,7 @@ 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="sd_bus_creds_get_pid">
+<refentry id="sd_bus_creds_get_pid" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_creds_get_pid</title>
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 5faee9e..64b92e2 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -21,7 +21,7 @@ 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="sd_bus_creds_new_from_pid">
+<refentry id="sd_bus_creds_new_from_pid" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_creds_new_from_pid</title>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index f3abd28..68f1d7b 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -21,7 +21,7 @@ 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="sd_bus_error">
+<refentry id="sd_bus_error" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_error</title>
diff --git a/man/sd_bus_label_escape.xml b/man/sd_bus_label_escape.xml
index ef4b7e2..0b5564f 100644
--- a/man/sd_bus_label_escape.xml
+++ b/man/sd_bus_label_escape.xml
@@ -21,7 +21,7 @@ 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="sd_bus_label_escape">
+<refentry id="sd_bus_label_escape" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_label_escape</title>
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 9d179a4..5e25263 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_bus_message_get_cookie">
+<refentry id="sd_bus_message_get_cookie" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_message_get_cookie</title>
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index e0ee909..683931c 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_bus_message_get_monotonic_usec">
+<refentry id="sd_bus_message_get_monotonic_usec" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_message_get_monotonic_usec</title>
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 4e43872..b36d66c 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -21,7 +21,7 @@ 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="sd_bus_new">
+<refentry id="sd_bus_new" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_new</title>
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
index 07b9aad..7fa1be6 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -21,7 +21,7 @@ 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="sd_bus_open_user">
+<refentry id="sd_bus_open_user" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_open_user</title>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 2a2a12c..9003f9f 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="sd_bus_request_name">
+<refentry id="sd_bus_request_name" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>sd_bus_request_name</title>
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index 2127806..e6955c3 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -21,7 +21,7 @@ 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">
+<refentry id="systemd-bus-proxyd" conditional="ENABLE_KDBUS">
<refentryinfo>
<title>systemd-bus-proxyd</title>
commit c0652d453e2329fa465f71d4c68f5fe8618a7de2
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Feb 19 16:06:10 2014 -0500
man: ignore non-manpage files when generating makefile
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 0d1ca24..6224de3 100644
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -66,6 +66,8 @@ def xml(file):
def add_rules(rules, name):
xml = xml_parse(name)
# print('parsing {}'.format(name), file=sys.stderr)
+ if xml.getroot().tag != 'refentry':
+ return
conditional = xml.getroot().get('conditional') or ''
rulegroup = rules[conditional]
refmeta = xml.find('./refmeta')
@@ -86,7 +88,11 @@ def create_rules(xml_files):
" {conditional => {alias-name => source-name}} "
rules = collections.defaultdict(dict)
for name in xml_files:
- add_rules(rules, name)
+ try:
+ add_rules(rules, name)
+ except Exception:
+ print("Failed to process", name, file=sys.stderr)
+ raise
return rules
def mjoin(files):
commit ef417cfd2211ae017a38b9796c6db29130133e63
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Feb 13 17:10:12 2014 -0500
manager: be more precise in message about restart
diff --git a/TODO b/TODO
index b87ed17..e1d2126 100644
--- a/TODO
+++ b/TODO
@@ -72,8 +72,11 @@ Features:
desktop UIs such as gnome-shell to freeze apps that are not visible
on screen, not unlike how job control works on the shell
-* machinectl bash completion is missing
-* busctl bash and zsh completions are outdated
+* completions:
+ - busctl zsh completion is outdated
+ - systemd-nspawn -Z/-L/-q is missing for zsh
+ - systemd-nspawn completion is missing for bash
+ - manager property enumeration was broken when systemd moved to /usr/lib/
* cgroups:
- implement system-wide DefaultCPUAccounting=1 switch (and similar for blockio, memory?)
diff --git a/src/core/service.c b/src/core/service.c
index d8e88ea..ca71788 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3308,7 +3308,10 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
case SERVICE_AUTO_RESTART:
log_info_unit(UNIT(s)->id,
- "%s holdoff time over, scheduling restart.", UNIT(s)->id);
+ s->restart_usec > 0 ?
+ "%s holdoff time over, scheduling restart." :
+ "%s has no holdoff time, scheduling restart.",
+ UNIT(s)->id);
service_enter_restart(s);
break;
More information about the systemd-commits
mailing list