summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile-man.am1
-rw-r--r--man/busctl.xml21
-rw-r--r--man/systemctl.xml18
-rw-r--r--man/systemd-run.xml21
-rw-r--r--man/user-system-options.xml23
5 files changed, 32 insertions, 52 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index 08f856b852..3d43560199 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 9a2c63c943..7947c8d2c8 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 4bb8b07d61..379bf263e0 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 87640fc259..fc2131eb2f 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 0000000000..0863960214
--- /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>