diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:38:58 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:38:58 +0200 |
| commit | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (patch) | |
| tree | 6790165f39daee79e2b6c6617483320613493367 /man/nmcli.1.in | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Imported Upstream version 1.0.4 upstream/1.0.4
Diffstat (limited to 'man/nmcli.1.in')
| -rw-r--r-- | man/nmcli.1.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/man/nmcli.1.in b/man/nmcli.1.in index f6df1b0a..335b6511 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -398,6 +398,8 @@ If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP, \fIpath\fP or \fIapath\fP can be used. .br See \fBconnection show\fP above for the description of the <ID>-specifying keywords. +.br +If '--wait' option is not specified, the default timeout will be 10 seconds. .TP .B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS .br @@ -686,6 +688,8 @@ its name, UUID or D-Bus path. If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP or \fIpath\fP can be used. .br See \fBconnection show\fP above for the description of the <ID>-specifying keywords. +.br +If '--wait' option is not specified, the default timeout will be 10 seconds. .TP .B reload .br @@ -730,14 +734,15 @@ will be activated. It will also consider connections that are not set to auto co .br If '--wait' option is not specified, the default timeout will be 90 seconds. .TP -.B disconnect <ifname> +.B disconnect <ifname> ... .br Disconnect a device and prevent the device from automatically activating further -connections without user/manual intervention. +connections without user/manual intervention. Note that disconnecting software +devices may mean that the devices will disappear. .br If '--wait' option is not specified, the default timeout will be 10 seconds. .TP -.B delete <ifname> +.B delete <ifname> ... .br Delete a device. The command removes the interface from the system. Note that this only works for software devices like bonds, bridges, teams, etc. |