Imported Upstream version 0.9.1.95 upstream/0.9.1.95

3 files changed, 46 insertions, 14 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index ef05bde1..dd6dfdf6 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -185,8 +185,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
+LIBNL1_CFLAGS = @LIBNL1_CFLAGS@
+LIBNL1_LIBS = @LIBNL1_LIBS@
+LIBNL2_CFLAGS = @LIBNL2_CFLAGS@
+LIBNL2_LIBS = @LIBNL2_LIBS@
+LIBNL3_CFLAGS = @LIBNL3_CFLAGS@
+LIBNL3_LIBS = @LIBNL3_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
+LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@
+LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/man/nmcli.1 b/man/nmcli.1
index 5afb802b..03ed664c 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -20,9 +20,9 @@
 .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
 .\" USA.
 .\"
-.\" Copyright (C) 2010 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2011 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "22 September 2010"
+.TH NMCLI "1" "6 September 2011"
 
 .SH NAME
 nmcli \- command-line tool for controlling NetworkManager
@@ -201,7 +201,7 @@ Connections
 .br
 Get information about NetworkManager's connections.
 .TP
-.SS \fICOMMAND\fP := { list | status | up | down }
+.SS \fICOMMAND\fP := { list | status | up | down | delete }
 .sp
 .RS
 .TP
@@ -226,7 +226,7 @@ Print status of active connections.
 No simple reference.
 .fi
 .TP
-.B up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [\-\-nowait] [\-\-timeout <timeout>]
+.B up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [\-\-nowait] [\-\-timeout <timeout>]
 .br
 Activate a connection.  The connection is identified by its name using \fIid\fP
 or UUID using \fIuuid\fP.  For requiring particular device to activate
@@ -255,6 +255,18 @@ interface: org.freedesktop.NetworkManager
 method:    DeactivateConnection
 arguments: according to arguments
 .fi
+.TP
+.B delete id <id> | uuid <id>
+.br
+Delete a configured connection.  The connection to delete is specified with
+\fIid\fP (connection name) or \fIuuid\fP (connection UUID).
+.br
+.nf
+\fBReference to D-Bus:\fP
+interface: org.freedesktop.NetworkManager.Settings.Connection
+method:    Delete
+arguments: none
+.fi
 .RE
 
 .TP
@@ -303,9 +315,9 @@ method:    Disconnect
 arguments: none
 .fi
 .TP
-.B wifi [list [iface <iface>] [hwaddr <hwaddr>]]
+.B wifi [list [iface <iface>] [bssid <BSSID>]]
 .br
-List available WiFi access points.  \fIiface\fP and \fIhwaddr\fP options
+List available WiFi access points.  \fIiface\fP and \fIbssid\fP options
 can be used to get just APs for particular interface or specific AP,
 respectively.
 .br
@@ -329,7 +341,7 @@ or null.
 .RE
 Notes about localization:
 .br
-Be aware that \fInmcli\fP is localized and that's why the output depends on 
+Be aware that \fInmcli\fP is localized and that's why the output depends on
 your environment. It's important to realize that especially when you parse the
 output.
 .br
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index 5afb802b..03ed664c 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -20,9 +20,9 @@
 .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
 .\" USA.
 .\"
-.\" Copyright (C) 2010 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2011 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "22 September 2010"
+.TH NMCLI "1" "6 September 2011"
 
 .SH NAME
 nmcli \- command-line tool for controlling NetworkManager
@@ -201,7 +201,7 @@ Connections
 .br
 Get information about NetworkManager's connections.
 .TP
-.SS \fICOMMAND\fP := { list | status | up | down }
+.SS \fICOMMAND\fP := { list | status | up | down | delete }
 .sp
 .RS
 .TP
@@ -226,7 +226,7 @@ Print status of active connections.
 No simple reference.
 .fi
 .TP
-.B up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [\-\-nowait] [\-\-timeout <timeout>]
+.B up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [\-\-nowait] [\-\-timeout <timeout>]
 .br
 Activate a connection.  The connection is identified by its name using \fIid\fP
 or UUID using \fIuuid\fP.  For requiring particular device to activate
@@ -255,6 +255,18 @@ interface: org.freedesktop.NetworkManager
 method:    DeactivateConnection
 arguments: according to arguments
 .fi
+.TP
+.B delete id <id> | uuid <id>
+.br
+Delete a configured connection.  The connection to delete is specified with
+\fIid\fP (connection name) or \fIuuid\fP (connection UUID).
+.br
+.nf
+\fBReference to D-Bus:\fP
+interface: org.freedesktop.NetworkManager.Settings.Connection
+method:    Delete
+arguments: none
+.fi
 .RE
 
 .TP
@@ -303,9 +315,9 @@ method:    Disconnect
 arguments: none
 .fi
 .TP
-.B wifi [list [iface <iface>] [hwaddr <hwaddr>]]
+.B wifi [list [iface <iface>] [bssid <BSSID>]]
 .br
-List available WiFi access points.  \fIiface\fP and \fIhwaddr\fP options
+List available WiFi access points.  \fIiface\fP and \fIbssid\fP options
 can be used to get just APs for particular interface or specific AP,
 respectively.
 .br
@@ -329,7 +341,7 @@ or null.
 .RE
 Notes about localization:
 .br
-Be aware that \fInmcli\fP is localized and that's why the output depends on 
+Be aware that \fInmcli\fP is localized and that's why the output depends on
 your environment. It's important to realize that especially when you parse the
 output.
 .br