From 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Jul 2015 19:38:58 +0200 Subject: Imported Upstream version 1.0.4 --- man/nmcli.1.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'man/nmcli.1.in') 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 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 -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 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 -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 +.B disconnect ... .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 +.B delete ... .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. -- cgit 1.3.0-6-gf8a5