X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmachinectl.xml;h=5efa3a542a5766570ba4dca973217eab343661fe;hp=2606180d123d70890d217502e5099d6f4777b547;hb=c9d954b27ee125c3c90a6d2951c62eec4abb160b;hpb=19887cd06a3af2f045e763986eda19e208bd3f85

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 2606180d1..5efa3a542 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -91,9 +91,9 @@
                                 <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
-                                session/user properties, limit
-                                display to certain properties as
-                                specified as argument. If not
+                                machine properties, limit the
+                                output to certain properties as
+                                specified by the argument. If not
                                 specified, all set properties are
                                 shown. The argument should be a
                                 property name, such as
@@ -108,8 +108,8 @@
                                 <term><option>--all</option></term>
 
                                 <listitem><para>When showing
-                                unit/job/manager properties, show all
-                                properties regardless whether they are
+                                machine properties, show all
+                                properties regardless of whether they are
                                 set or not.</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
@@ -221,7 +220,7 @@
                                 or more registered virtual machines or
                                 containers or the manager itself. If
                                 no argument is specified, properties
-                                of the manager will be shown. If a an
+                                of the manager will be shown. If an
                                 ID is specified, properties of this
                                 virtual machine or container are
                                 shown. By default, empty properties
@@ -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>