X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachinectl.xml;h=f2fa6ce53e9aff3f2b974683ec671dec717e4798;hb=4b4bec19582c3ad2b7d25116f3c22c783274fead;hp=8a96d423b9602e1c98d4753d9e965bfbcea222b6;hpb=7b870f607bcb8f445d4d29a776d12d9de3bf1487;p=elogind.git

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 8a96d423b..f2fa6ce53 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -86,12 +86,48 @@
                                 string and exits.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--no-pager</option></term>
+
+                                <listitem><para>Do not pipe output into a
+                                pager.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--no-ask-password</option></term>
+
+                                <listitem><para>Do not query the user
+                                for authentication for privileged
+                                operations.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-H</option></term>
+                                <term><option>--host=</option></term>
+
+                                <listitem><para>Execute operation
+                                remotely. Specify a hostname, or
+                                username and hostname separated by <literal>@</literal>,
+                                to connect to. This will use SSH to
+                                talk to the remote machine manager
+                                instance.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-M</option></term>
+                                <term><option>--machine=</option></term>
+
+                                <listitem><para>Execute operation on a
+                                local container. Specify a container
+                                name to connect to.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-p</option></term>
                                 <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
-                                session/user properties, limit the
+                                machine properties, limit the
                                 output to certain properties as
                                 specified by the argument. If not
                                 specified, all set properties are
@@ -108,7 +144,7 @@
                                 <term><option>--all</option></term>
 
                                 <listitem><para>When showing
-                                unit/job/manager properties, show all
+                                machine properties, show all
                                 properties regardless of whether they are
                                 set or not.</para></listitem>
                         </varlistentry>
@@ -117,37 +153,22 @@
                                 <term><option>-l</option></term>
                                 <term><option>--full</option></term>
 
-                                <listitem><para>Do not ellipsize cgroup
-                                members.</para>
+                                <listitem><para>Do not ellipsize
+                                process tree entries.</para>
                                 </listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-ask-password</option></term>
-
-                                <listitem><para>Do not query the user
-                                for authentication for privileged
-                                operations.</para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><option>--kill-who=</option></term>
 
                                 <listitem><para>When used with
-                                <command>kill-session</command>,
+                                <command>kill-machine</command>,
                                 choose which processes to kill. Must
                                 be one of <option>leader</option>, or
                                 <option>all</option> to select whether
                                 to kill only the leader process of the
-                                session or all processes of the
-                                session. If omitted, defaults to
+                                machine or all processes of the
+                                machine. If omitted, defaults to
                                 <option>all</option>.</para></listitem>
                         </varlistentry>
 
@@ -156,11 +177,10 @@
                                 <term><option>--signal=</option></term>
 
                                 <listitem><para>When used with
-                                <command>kill-session</command> or
-                                <command>kill-user</command>, choose
+                                <command>kill-machine</command>, choose
                                 which signal to send to selected
-                                processes. Must be one of the well-known
-                                signal specifiers, such as
+                                processes. Must be one of the
+                                well-known signal specifiers, such as
                                 <constant>SIGTERM</constant>,
                                 <constant>SIGINT</constant> or
                                 <constant>SIGSTOP</constant>. If
@@ -168,26 +188,6 @@
                                 <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host</option></term>
-
-                                <listitem><para>Execute operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by <literal>@</literal>,
-                                to connect to. This will use SSH to
-                                talk to the remote machine manager
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-P</option></term>
-                                <term><option>--privileged</option></term>
-
-                                <listitem><para>Acquire privileges via
-                                PolicyKit before executing the
-                                operation.</para></listitem>
-                        </varlistentry>
                 </variablelist>
 
                 <para>The following commands are understood:</para>
@@ -294,7 +294,8 @@
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 </para>
         </refsect1>