summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-11-07 09:55:29 +0100
committerJiří Klimeš <jklimes@redhat.com>2014-11-07 09:57:36 +0100
commit252c8bf4edd5a0a85da74ffd4cdc87c41d082875 (patch)
tree64677a10c2452fdf01118b7edb21f8d02d7c0310 /man
parent3c9b8671fa2f338dccbb92084ead9f1707f29a40 (diff)
downloadNetworkManager-252c8bf4edd5a0a85da74ffd4cdc87c41d082875.tar.gz
man: document/clarify --ask option in relation to password prompting
Diffstat (limited to 'man')
-rw-r--r--man/nmcli.1.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index e2ac9d5aa7..2d142f4eaa 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -131,6 +131,8 @@ incompatible versions may produce incorrect results.
.B \-a, \-\-ask
When using this option \fInmcli\fP will stop and ask for any missing required
arguments, so do not use this option for non-interactive purposes like scripts.
+This option controls, for example, whether you will be prompted for a password
+if it is required for connecting to a network.
.TP
.B \-w, \-\-wait <seconds>
This option sets a timeout period for which \fInmcli\fP will wait for \fINetworkManager\fP
@@ -371,7 +373,10 @@ For 802.1X password, the line would be
\fI802-1x.password:my 1X password\fP
.br
nmcli also accepts "wifi-sec" and "wifi" strings instead of "802-11-wireless-security".
-When a required password is not given, nmcli will ask for it when run with --ask.
+When NetworkManager requires a password and it is not given, nmcli will ask for it
+when run with --ask. If --ask was not passed, NetworkManager can ask another secret
+agent that may be running (typically a GUI secret agent, such as nm-applet or
+gnome-shell).
.RE
.RE
.TP