summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-08 15:13:45 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-10 07:53:43 -0500
commit28f90ea25f8d8f2bfbe6d3e6a4846943eb92e4c5 (patch)
treea63081d4236923946ff47a00b9b7e9aef4fa5ee6
parent474acc98703df444e55c60ca2a8709d658558e1a (diff)
man: tweak description of machinectl show
Also, machinectl status is anything but terse. Remove "terse".
-rw-r--r--TODO2
-rw-r--r--man/machinectl.xml5
2 files changed, 3 insertions, 4 deletions
diff --git a/TODO b/TODO
index bdf8a9fa3a..603b87e36c 100644
--- 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 e2be017427..7c0f788880 100644
--- 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>