summaryrefslogtreecommitdiff
path: root/man/machinectl.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-09-26 11:45:31 -0400
committerGitHub <noreply@github.com>2016-09-26 11:45:31 -0400
commitbc3bb330b8543a31d4a1f488cb782b6ff3519d6a (patch)
treeac5b77147eb72029d19dcb79b455fa83bf3bee97 /man/machinectl.xml
parenteeb084806be1cc7f579d61634fe7b9b3dd5b3df9 (diff)
machinectl: prefer user@ to --uid=user for shell (#4006)
It seems to me that the explicit positional argument should have higher priority than "an option".
Diffstat (limited to 'man/machinectl.xml')
-rw-r--r--man/machinectl.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 7056fd4204..eaa247714b 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -186,12 +186,11 @@
<varlistentry>
<term><option>--uid=</option></term>
- <listitem><para>When used with the <command>shell</command>
- command, chooses the user ID to open the interactive shell
- session as. If this switch is not specified, defaults to
- <literal>root</literal>. Note that this switch is not
- supported for the <command>login</command> command (see
- below).</para></listitem>
+ <listitem><para>When used with the <command>shell</command> command, chooses the user ID to
+ open the interactive shell session as. If the argument to the <command>shell</command>
+ command also specifies an user name, this option is ignored. If the name is not specified
+ in either way, <literal>root</literal> will be used by default. Note that this switch is
+ not supported for the <command>login</command> command (see below).</para></listitem>
</varlistentry>
<varlistentry>