7 files changed, 90 insertions, 59 deletions
diff --git a/man/Makefile.in b/man/Makefile.in
index ee9bab8e..ef05bde1 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -41,11 +41,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/nmcli.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -91,7 +96,6 @@ NROFF = nroff
 MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -100,13 +104,15 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -118,6 +124,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -126,6 +133,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -134,8 +142,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -150,13 +158,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -164,6 +182,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -172,13 +192,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -204,13 +226,12 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
@@ -224,11 +245,15 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 92c6e5aa..c5f44513 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -8,7 +8,7 @@
 .SH NAME
 NetworkManager \- network management daemon
 .SH SYNOPSIS
-.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
+.B NetworkManager [\-\-version] [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
 .SH DESCRIPTION
 The \fINetworkManager\fP daemon attempts to make  networking configuration and
 operation as painless and automatic as possible by managing the primary network
@@ -61,6 +61,9 @@ The DHCPv6 lease has changed (renewed, rebound, etc).
 .SH OPTIONS
 The following options are supported:
 .TP
+.I "\-\-version"
+Print the NetworkManager software version and exit.
+.TP
 .I "\-\-no\-daemon"
 Do not daemonize.  This is useful for debugging, and directs log output to the
 controlling terminal in addition to syslog.
diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in
index 92c6e5aa..c5f44513 100644
--- a/man/NetworkManager.8.in
+++ b/man/NetworkManager.8.in
@@ -8,7 +8,7 @@
 .SH NAME
 NetworkManager \- network management daemon
 .SH SYNOPSIS
-.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
+.B NetworkManager [\-\-version] [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
 .SH DESCRIPTION
 The \fINetworkManager\fP daemon attempts to make  networking configuration and
 operation as painless and automatic as possible by managing the primary network
@@ -61,6 +61,9 @@ The DHCPv6 lease has changed (renewed, rebound, etc).
 .SH OPTIONS
 The following options are supported:
 .TP
+.I "\-\-version"
+Print the NetworkManager software version and exit.
+.TP
 .I "\-\-no\-daemon"
 Do not daemonize.  This is useful for debugging, and directs log output to the
 controlling terminal in addition to syslog.
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index acacb432..d047f393 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -162,11 +162,11 @@ warning messages.
 .B domains=\fI<domain1>,<domain2>, ...\fP
 The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
 DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
-USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC].  When "NONE" is given by itself,
-logging is disabled.  MB = Mobile Broadband, USER_SET = user settings operations
-and communication, SYS_SET = system settings service operations, OLPC = OLPC
-Mesh device operations, CORE = core daemon operations, DEVICE = activation and
-general interface operations.
+AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
+itself, logging is disabled.  MB = Mobile Broadband, AGENTS = secret agents
+operations and communication, SETTINGS = settings/config service operations,
+OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE =
+activation and general interface operations.
 .SH "SEE ALSO"
 .BR http://live.gnome.org/NetworkManager/SystemSettings
 .sp
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
index acacb432..d047f393 100644
--- a/man/NetworkManager.conf.5.in
+++ b/man/NetworkManager.conf.5.in
@@ -162,11 +162,11 @@ warning messages.
 .B domains=\fI<domain1>,<domain2>, ...\fP
 The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
 DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
-USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC].  When "NONE" is given by itself,
-logging is disabled.  MB = Mobile Broadband, USER_SET = user settings operations
-and communication, SYS_SET = system settings service operations, OLPC = OLPC
-Mesh device operations, CORE = core daemon operations, DEVICE = activation and
-general interface operations.
+AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
+itself, logging is disabled.  MB = Mobile Broadband, AGENTS = secret agents
+operations and communication, SETTINGS = settings/config service operations,
+OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE =
+activation and general interface operations.
 .SH "SEE ALSO"
 .BR http://live.gnome.org/NetworkManager/SystemSettings
 .sp
diff --git a/man/nmcli.1 b/man/nmcli.1
index 44e9558a..5afb802b 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -66,16 +66,18 @@ power users who prefer the command line.
 The use cases comprise:
 .IP \(em 4
 Initscripts: ifup/ifdown can utilize NetworkManager via \fInmcli\fP instead of
-having to manage connections itself and possible interfere with NetworkManager.
+having to manage connections itself and possibly interfere with NetworkManager.
 .IP \(em 4
-Servers, headless machines: No GUI is available; then \fInmcli\fP is used to
-talk directly to NetworkManager and control only system-wide connections.
+Servers, headless machines: No GUI is available; then \fInmcli\fP can be used
+to activate/deactivate connections.  However, if a connection requires a secret
+to activate and if that secret is not stored at the system level, \fInmcli\fP
+will not be able to activate it; it is currently unable to supply the needed
+secrets to NetworkManager.
 .IP \(em 4
-User sessions: For this case, \fInmcli\fP can talk to \fInm-applet\fP to find
-user connections.  It can still talk directly to NetworkManager for manipulating
-these connections.  As \fInmcli\fP doesn't have direct access to user
-configuration data in GConf, \fInm-applet\fP handles that itself.  That may,
-for example, cause the applet to pop up keyring dialogs when secrets are needed.
+User sessions: \fInmcli\fP can be used activate/deactivate connections from the
+command line, but a full NetworkManager client (like \fInm-applet\fP) is used
+for supplying secrets not stored at the system level.  Keyring dialogs and
+password prompts may appear if this happens.
 .SS \fIOPTIONS\fP
 .TP
 .B \-t, \-\-terse
@@ -203,14 +205,12 @@ Get information about NetworkManager's connections.
 .sp
 .RS
 .TP
-.B list [id <id> | uuid <id> | system | user]
-.br
-List configured connections.  Without a parameter, configured connection from
-both system and user settings services are listed.  \fIsystem\fP argument filters
-only system-wide connections, \fIuser\fP prints user connections only.
-In order to get connection details, \fIid\fP with connection's name or \fIuuid\fP
-with connection's UUID shall be specified.
-When no command is given to \fIcon\fP object, the default action is 'nmcli con list'.
+.B list [id <id> | uuid <id>]
+.br
+List configured connections.  Without a parameter, all connections
+are listed.  In order to get connection details, \fIid\fP with connection's
+name or \fIuuid\fP with connection's UUID shall be specified.  When no command
+is given to the \fIcon\fP object, the default action is 'nmcli con list'.
 .br
 .nf
 \fBReference to D-Bus:\fP
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index 44e9558a..5afb802b 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -66,16 +66,18 @@ power users who prefer the command line.
 The use cases comprise:
 .IP \(em 4
 Initscripts: ifup/ifdown can utilize NetworkManager via \fInmcli\fP instead of
-having to manage connections itself and possible interfere with NetworkManager.
+having to manage connections itself and possibly interfere with NetworkManager.
 .IP \(em 4
-Servers, headless machines: No GUI is available; then \fInmcli\fP is used to
-talk directly to NetworkManager and control only system-wide connections.
+Servers, headless machines: No GUI is available; then \fInmcli\fP can be used
+to activate/deactivate connections.  However, if a connection requires a secret
+to activate and if that secret is not stored at the system level, \fInmcli\fP
+will not be able to activate it; it is currently unable to supply the needed
+secrets to NetworkManager.
 .IP \(em 4
-User sessions: For this case, \fInmcli\fP can talk to \fInm-applet\fP to find
-user connections.  It can still talk directly to NetworkManager for manipulating
-these connections.  As \fInmcli\fP doesn't have direct access to user
-configuration data in GConf, \fInm-applet\fP handles that itself.  That may,
-for example, cause the applet to pop up keyring dialogs when secrets are needed.
+User sessions: \fInmcli\fP can be used activate/deactivate connections from the
+command line, but a full NetworkManager client (like \fInm-applet\fP) is used
+for supplying secrets not stored at the system level.  Keyring dialogs and
+password prompts may appear if this happens.
 .SS \fIOPTIONS\fP
 .TP
 .B \-t, \-\-terse
@@ -203,14 +205,12 @@ Get information about NetworkManager's connections.
 .sp
 .RS
 .TP
-.B list [id <id> | uuid <id> | system | user]
-.br
-List configured connections.  Without a parameter, configured connection from
-both system and user settings services are listed.  \fIsystem\fP argument filters
-only system-wide connections, \fIuser\fP prints user connections only.
-In order to get connection details, \fIid\fP with connection's name or \fIuuid\fP
-with connection's UUID shall be specified.
-When no command is given to \fIcon\fP object, the default action is 'nmcli con list'.
+.B list [id <id> | uuid <id>]
+.br
+List configured connections.  Without a parameter, all connections
+are listed.  In order to get connection details, \fIid\fP with connection's
+name or \fIuuid\fP with connection's UUID shall be specified.  When no command
+is given to the \fIcon\fP object, the default action is 'nmcli con list'.
 .br
 .nf
 \fBReference to D-Bus:\fP