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

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 8a96d423b..2ed9f2e8a 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -91,7 +91,7 @@
                                 <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 +108,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,8 +117,8 @@
                                 <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>
 
@@ -141,13 +141,13 @@
                                 <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 +156,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
@@ -294,7 +293,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-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
                 </para>
         </refsect1>