diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/busctl.xml | 1 | ||||
| -rw-r--r-- | man/custom-html.xsl | 2 | ||||
| -rw-r--r-- | man/machinectl.xml | 16 | ||||
| -rw-r--r-- | man/networkctl.xml | 2 | ||||
| -rw-r--r-- | man/sd_bus_default.xml | 2 | ||||
| -rw-r--r-- | man/systemd-bus-proxyd.service.xml (renamed from man/systemd-bus-proxyd@.service.xml) | 17 | ||||
| -rw-r--r-- | man/systemd-bus-proxyd.xml | 3 | ||||
| -rw-r--r-- | man/systemd.service.xml | 3 | ||||
| -rw-r--r-- | man/sysusers.d.xml | 2 |
9 files changed, 22 insertions, 26 deletions
diff --git a/man/busctl.xml b/man/busctl.xml index 233afa955c..4f0b2a7051 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -471,7 +471,6 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting> <para> <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, - <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>, <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/custom-html.xsl b/man/custom-html.xsl index 0856c1f29c..b298c216b1 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -231,7 +231,7 @@ <xsl:text>../python-systemd/index.html</xsl:text> </xsl:attribute> <xsl:text>Python </xsl:text> - </a>ยท + </a> <span style="float:right"> <xsl:text>systemd </xsl:text> diff --git a/man/machinectl.xml b/man/machinectl.xml index 50cbb1bc98..cf17349a6c 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -400,14 +400,14 @@ <listitem><para>Bind mounts a directory from the host into the specified container. The first directory argument is the source directory on the host, the second directory argument - the source directory on the host. When the latter is omitted - the destination path in the container is the same as the - source path on the host. When combined with the - <option>--read-only</option> switch a ready-only bind mount is - created. When combined with the <option>--mkdir</option> - switch the destination path is first created before the mount - is applied. Note that this option is currently only supported - for + is the destination directory in the container. When the + latter is omitted the destination path in the container is + the same as the source path on the host. When combined with + the <option>--read-only</option> switch a ready-only bind + mount is created. When combined with the + <option>--mkdir</option> switch the destination path is first + created before the mount is applied. Note that this option is + currently only supported for <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> containers.</para></listitem> </varlistentry> diff --git a/man/networkctl.xml b/man/networkctl.xml index d11d60f2a9..884d2005c4 100644 --- a/man/networkctl.xml +++ b/man/networkctl.xml @@ -21,7 +21,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="networkctl" +<refentry id="networkctl" conditional='ENABLE_NETWORKD' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml index 9b4c71b677..c5a1b530f9 100644 --- a/man/sd_bus_default.xml +++ b/man/sd_bus_default.xml @@ -172,7 +172,7 @@ <literal>@</literal> symbol, and the hostname. </para> - <para><function>sd_bus_open_system_container()</function> connects + <para><function>sd_bus_open_system_machine()</function> connects to the system bus in the specified <parameter>machine</parameter>, where <parameter>machine</parameter> is the name of a local container. See diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd.service.xml index e6e0a8e88d..02189eea7c 100644 --- a/man/systemd-bus-proxyd@.service.xml +++ b/man/systemd-bus-proxyd.service.xml @@ -21,10 +21,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-bus-proxyd@.service"> +<refentry id="systemd-bus-proxyd.service"> <refentryinfo> - <title>systemd-bus-proxyd@.service</title> + <title>systemd-bus-proxyd.service</title> <productname>systemd</productname> <authorgroup> @@ -38,18 +38,18 @@ </refentryinfo> <refmeta> - <refentrytitle>systemd-bus-proxyd@.service</refentrytitle> + <refentrytitle>systemd-bus-proxyd.service</refentrytitle> <manvolnum>8</manvolnum> </refmeta> <refnamediv> - <refname>systemd-bus-proxyd@.service</refname> + <refname>systemd-bus-proxyd.service</refname> <refname>systemd-bus-proxyd.socket</refname> <refpurpose>Proxy classic D-Bus clients to kdbus</refpurpose> </refnamediv> <refsynopsisdiv> - <para><filename>systemd-bus-proxyd@.service</filename></para> + <para><filename>systemd-bus-proxyd.service</filename></para> <para><filename>systemd-bus-proxyd.socket</filename></para> </refsynopsisdiv> @@ -57,11 +57,11 @@ <title>Description</title> <para><filename>systemd-bus-proxyd.socket</filename> will launch - <filename>systemd-bus-proxyd@.service</filename> for connections + <filename>systemd-bus-proxyd.service</filename> for connections to the classic D-Bus socket in <filename>/var/run/dbus/system_bus_socket</filename>.</para> - <para><filename>systemd-bus-proxyd@.service</filename> is launched + <para><filename>systemd-bus-proxyd.service</filename> is launched for an existing D-Bus connection and will use <command>systemd-bus-proxyd</command> to proxy messages from this connection to the system bus (either kdbus or classic D-Bus). @@ -74,8 +74,7 @@ <para> <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, - <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> + <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink> </para> </refsect1> </refentry> diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml index 63652b185b..0923396151 100644 --- a/man/systemd-bus-proxyd.xml +++ b/man/systemd-bus-proxyd.xml @@ -102,8 +102,7 @@ <para> <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, - <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> + <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink> </para> </refsect1> </refentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 191adcda52..1e949f0c52 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -243,8 +243,7 @@ <varlistentry> <term><varname>BusPolicy=</varname></term> - <listitem><para>If specified, a custom - <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> + <listitem><para>If specified, a custom kdbus endpoint will be created and installed as the default bus node for the service. Such a custom endpoint can hold an own set of policy rules that are enforced on top of the bus-wide ones. diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml index 99aa07a1cc..11cb83388f 100644 --- a/man/sysusers.d.xml +++ b/man/sysusers.d.xml @@ -19,7 +19,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="sysusers.d" +<refentry id="sysusers.d" conditional='ENABLE_SYSUSERS' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> |