man: xinclude --user/--system

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-02-13 14:40:40 -05:00
parent dfdebb1b92
commit 88ae7333ee
5 changed files with 32 additions and 52 deletions

View File

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

View File

@ -70,24 +70,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para>The following options are understood:</para>
<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" />

View File

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

View File

@ -89,24 +89,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para>The following options are understood:</para>
<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>

View File

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