man: update systemd-nspawn regarding new --slice= logic

diff --git a/TODO b/TODO
index d111f36e9e321887f5036d2755ad2ef51bd24db3..63b1280f0489a698d33d3fcd227ec8ee62ab56f8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -45,8 +45,8 @@ CGroup Rework Completion:
 
 * introduce high-level settings for RT budget, swappiness
 
-* wiki: document new bus APIs of PID 1 (transient units, Reloading signal), systemctl commands
-* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_systemd, systemd-run, systemd-nspawn
+* wiki: document new bus APIs of PID 1 (transient units, Reloading signal)
+* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_system, systemctl commands
 
 * Send SIGHUP and SIGTERM in session scopes
 

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index feafb31bc026f1da9f3ea3e3c3b80116365de039..f4c5d77eed1ea12b1f39b2a656638aa4faf6b2fb 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -239,6 +239,16 @@
                                 container is used.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--slice=</option></term>
+
+                                <listitem><para>Make the container
+                                part of the specified slice, instead
+                                of the
+                                <filename>machine.slice</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--uuid=</option></term>
 
@@ -250,16 +260,6 @@
                                 </para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>-C</option></term>
-                                <term><option>--controllers=</option></term>
-
-                                <listitem><para>Makes the container appear in
-                                other hierarchies than the name=systemd:/ one.
-                                Takes a comma-separated list of controllers.
-                                </para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><option>--private-network</option></term>
 
@@ -443,7 +443,8 @@
                         <citerefentry><refentrytitle>unshare</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>