From: Zbigniew Jędrzejewski-Szmek Date: Sun, 8 Nov 2015 14:13:45 +0000 (+0100) Subject: man: tweak description of machinectl show X-Git-Tag: v228~74^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28f90ea25f8d8f2bfbe6d3e6a4846943eb92e4c5;p=thirdparty%2Fsystemd.git man: tweak description of machinectl show Also, machinectl status is anything but terse. Remove "terse". --- diff --git a/TODO b/TODO index bdf8a9fa3ad..603b87e36c3 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 e2be0174271..7c0f7888800 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -317,7 +317,7 @@ status NAME... - Show terse runtime status information about + 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 to show those too. To select specific properties to show, use . 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 status if you are looking for formatted human-readable output.