man: tweak description of machinectl show

Also, machinectl status is anything but terse. Remove "terse".

diff --git a/TODO b/TODO
index bdf8a9fa3ad4467709c5cab8b89120a4f54f11f1..603b87e36c3d99130256e883fc38fd50e011fbc9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -74,8 +74,6 @@ Features:
 
 * man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
 
-* man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)
-
 * "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd
 
 * install: include generator dirs in unit file search paths

diff --git a/man/machinectl.xml b/man/machinectl.xml
index e2be01742712dfc72eea29f00c9217e9c61c5d28..7c0f788880062b3f0a78e4ea0313743a0f242d0d 100644 (file)
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -317,7 +317,7 @@
       <varlistentry>
         <term><command>status</command> <replaceable>NAME</replaceable>...</term>
 
-        <listitem><para>Show terse runtime status information about
+        <listitem><para>Show runtime status information about
         one or more virtual machines and containers, followed by the
         most recent log data from the journal. This function is
         intended to generate human-readable output. If you are looking
@@ -339,7 +339,8 @@
         are suppressed. Use <option>--all</option> to show those too.
         To select specific properties to show, use
         <option>--property=</option>. This command is intended to be
-        used whenever computer-parsable output is required. Use
+        used whenever computer-parsable output is required, and does
+        not print the cgroup tree or journal entries. Use
         <command>status</command> if you are looking for formatted
         human-readable output.</para></listitem>
       </varlistentry>