From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Nov 2017 09:54:50 +0000 (+0100)
Subject: nspawn: correctly document the relationship of --keep-unit and --register=no (#7364)
X-Git-Tag: v236~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb8499578934cf66998ec0b4cf24f5ff1e4df67c;p=thirdparty%2Fsystemd.git

nspawn: correctly document the relationship of --keep-unit and --register=no (#7364)

Fixes: #7228
---

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 2386c80b1ca..98ce1529de0 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -915,20 +915,17 @@
       <varlistentry>
         <term><option>--keep-unit</option></term>
 
-        <listitem><para>Instead of creating a transient scope unit to
-        run the container in, simply register the service or scope
-        unit <command>systemd-nspawn</command> has been invoked in
-        with
-        <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-        This has no effect if <option>--register=no</option> is used.
-        This switch should be used if
-        <command>systemd-nspawn</command> is invoked from within a
-        service unit, and the service unit's sole purpose is to run a
-        single <command>systemd-nspawn</command> container. This
-        option is not available if run from a user
-        session.</para>
+        <listitem><para>Instead of creating a transient scope unit to run the container in, simply use the service or
+        scope unit <command>systemd-nspawn</command> has been invoked in. If <option>--register=yes</option> is set
+        this unit is registered with
+        <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>. This
+        switch should be used if <command>systemd-nspawn</command> is invoked from within a service unit, and the
+        service unit's sole purpose is to run a single <command>systemd-nspawn</command> container. This option is not
+        available if run from a user session.</para>
         <para>Note that passing <option>--keep-unit</option> disables the effect of <option>--slice=</option> and
-        <option>--property=</option>.</para></listitem>
+        <option>--property=</option>. Use <option>--keep-unit</option> and <option>--register=no</option> in
+        combination to disable any kind of unit allocation or registration with
+        <command>systemd-machined</command>.</para></listitem>
       </varlistentry>
 
       <varlistentry>