man: tweak description of machinectl show

Also, machinectl status is anything but terse. Remove "terse".
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-08 15:13:45 +01:00
parent 474acc9870
commit 28f90ea25f
2 changed files with 3 additions and 4 deletions

2
TODO
View File

@ -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: 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 * "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd
* install: include generator dirs in unit file search paths * install: include generator dirs in unit file search paths

View File

@ -317,7 +317,7 @@
<varlistentry> <varlistentry>
<term><command>status</command> <replaceable>NAME</replaceable>...</term> <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 one or more virtual machines and containers, followed by the
most recent log data from the journal. This function is most recent log data from the journal. This function is
intended to generate human-readable output. If you are looking intended to generate human-readable output. If you are looking
@ -339,7 +339,8 @@
are suppressed. Use <option>--all</option> to show those too. are suppressed. Use <option>--all</option> to show those too.
To select specific properties to show, use To select specific properties to show, use
<option>--property=</option>. This command is intended to be <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 <command>status</command> if you are looking for formatted
human-readable output.</para></listitem> human-readable output.</para></listitem>
</varlistentry> </varlistentry>