Imported Upstream version 0.9.10.0upstream/0.9.10.0

12 files changed, 5192 insertions, 712 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 763d43016..64469685a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,12 +1,27 @@
 man_MANS =
 CLEANFILES =
+EXTRA_DIST =
+
+XSLTPROC = xsltproc
+
+XSLTPROC_FLAGS = \
+	--xinclude \
+	--nonet \
+	--stringparam man.output.quietly 1 \
+	--stringparam funcsynopsis.style ansi \
+	--stringparam man.th.extra1.suppress 1 \
+	--stringparam man.authors.section.enabled 0 \
+	--stringparam man.copyright.section.enabled 0
+
+XSLTPROC_MAN_FLAGS = $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
 if ENABLE_GTK_DOC
 
-XSLTPROC = xsltproc --xinclude --nonet
+%.8: %.xml
+	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
-nm-settings.5: nm-settings.xml
-	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
+%.5: %.xml
+	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
 nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
 	rm -f $(builddir)/$@
@@ -14,21 +29,40 @@ nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/li
 
 endif
 
-CLEANFILES += nm-settings.5 nm-settings.xml
+configure_generated_man_pages =		\
+	nmcli.1				\
+	nm-online.1			\
+	nm-system-settings.conf.5
 
-man_MANS +=				\
+docbook_generated_man_pages =		\
 	NetworkManager.8		\
 	NetworkManager.conf.5		\
-	nm-system-settings.conf.5	\
-	nm-tool.1			\
-	nm-online.1			\
-	nmcli.1
+	nmcli-examples.5
+
+docbook_autogenerated_man_pages =	\
+	nm-settings.5
+
+generated_man_pages = 			\
+	$(docbook_generated_man_pages)	\
+	$(docbook_autogenerated_man_pages)
+
+EXTRA_DIST +=					\
+	$(docbook_generated_man_pages:.%=.xml)	\
+	$(docbook_autogenerated_man_pages)
+
+CLEANFILES +=					\
+	nm-settings.xml
+
+man_MANS += $(configure_generated_man_pages)
 
 if ENABLE_GTK_DOC
-man_MANS += nm-settings.5
+man_MANS += $(generated_man_pages)
+CLEANFILES +=					\
+	$(docbook_autogenerated_man_pages)	\
+	$(docbook_generated_man_pages)
 else
 if INSTALL_PREGEN_MANPAGES
-man_MANS += nm-settings.5
+man_MANS += $(generated_man_pages)
 endif
 endif
 
diff --git a/man/Makefile.in b/man/Makefile.in
index d32adcf91..a48bf6806 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -77,16 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_GTK_DOC_TRUE@am__append_1 = nm-settings.5
-@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_2 = nm-settings.5
+@ENABLE_GTK_DOC_TRUE@am__append_1 = $(generated_man_pages)
+@ENABLE_GTK_DOC_TRUE@am__append_2 = \
+@ENABLE_GTK_DOC_TRUE@	$(docbook_autogenerated_man_pages)	\
+@ENABLE_GTK_DOC_TRUE@	$(docbook_generated_man_pages)
+
+@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_3 = $(generated_man_pages)
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/NetworkManager.8.in \
-	$(srcdir)/NetworkManager.conf.5.in \
-	$(srcdir)/nm-system-settings.conf.5.in $(srcdir)/nm-tool.1.in \
+	$(srcdir)/nm-system-settings.conf.5.in \
 	$(srcdir)/nm-online.1.in $(srcdir)/nmcli.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -102,8 +105,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = NetworkManager.8 NetworkManager.conf.5 \
-	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1
+CONFIG_CLEAN_FILES = nm-system-settings.conf.5 nm-online.1 nmcli.1
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -185,12 +187,15 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
+DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
 DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
+DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
@@ -215,7 +220,6 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -260,12 +264,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
+LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
+LIBNDP_LIBS = @LIBNDP_LIBS@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
 LIBSOUP_LIBS = @LIBSOUP_LIBS@
+LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
+LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -282,6 +290,8 @@ MOC = @MOC@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NEWT_CFLAGS = @NEWT_CFLAGS@
+NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
@@ -309,11 +319,16 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
+PPPD_PATH = @PPPD_PATH@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+PPPOE_PATH = @PPPOE_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
+SELINUX_CFLAGS = @SELINUX_CFLAGS@
+SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -328,6 +343,7 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
+VALGRIND_RULES = @VALGRIND_RULES@
 VAPIGEN = @VAPIGEN@
 VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
 VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
@@ -390,6 +406,7 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
+subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
@@ -400,11 +417,40 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-man_MANS = NetworkManager.8 NetworkManager.conf.5 \
-	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1 \
-	$(am__append_1) $(am__append_2)
-CLEANFILES = nm-settings.5 nm-settings.xml
-@ENABLE_GTK_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet
+with_valgrind = @with_valgrind@
+man_MANS = $(configure_generated_man_pages) $(am__append_1) \
+	$(am__append_3)
+CLEANFILES = nm-settings.xml $(am__append_2)
+EXTRA_DIST = $(docbook_generated_man_pages:.%=.xml) \
+	$(docbook_autogenerated_man_pages)
+XSLTPROC = xsltproc
+XSLTPROC_FLAGS = \
+	--xinclude \
+	--nonet \
+	--stringparam man.output.quietly 1 \
+	--stringparam funcsynopsis.style ansi \
+	--stringparam man.th.extra1.suppress 1 \
+	--stringparam man.authors.section.enabled 0 \
+	--stringparam man.copyright.section.enabled 0
+
+XSLTPROC_MAN_FLAGS = $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+configure_generated_man_pages = \
+	nmcli.1				\
+	nm-online.1			\
+	nm-system-settings.conf.5
+
+docbook_generated_man_pages = \
+	NetworkManager.8		\
+	NetworkManager.conf.5		\
+	nmcli-examples.5
+
+docbook_autogenerated_man_pages = \
+	nm-settings.5
+
+generated_man_pages = \
+	$(docbook_generated_man_pages)	\
+	$(docbook_autogenerated_man_pages)
+
 all: all-am
 
 .SUFFIXES:
@@ -438,14 +484,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-NetworkManager.8: $(top_builddir)/config.status $(srcdir)/NetworkManager.8.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-NetworkManager.conf.5: $(top_builddir)/config.status $(srcdir)/NetworkManager.conf.5.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nm-system-settings.conf.5: $(top_builddir)/config.status $(srcdir)/nm-system-settings.conf.5.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nm-tool.1: $(top_builddir)/config.status $(srcdir)/nm-tool.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nm-online.1: $(top_builddir)/config.status $(srcdir)/nm-online.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 nmcli.1: $(top_builddir)/config.status $(srcdir)/nmcli.1.in
@@ -745,8 +785,11 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	uninstall-man8
 
 
-@ENABLE_GTK_DOC_TRUE@nm-settings.5: nm-settings.xml
-@ENABLE_GTK_DOC_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
+@ENABLE_GTK_DOC_TRUE@%.8: %.xml
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+@ENABLE_GTK_DOC_TRUE@%.5: %.xml
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
 @ENABLE_GTK_DOC_TRUE@nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
 @ENABLE_GTK_DOC_TRUE@	rm -f $(builddir)/$@
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
new file mode 100644
index 000000000..5022eadbd
--- /dev/null
+++ b/man/NetworkManager.8
@@ -0,0 +1,251 @@
+'\" t
+.\"     Title: NetworkManager
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 07/03/2014
+.\"    Manual: Network management daemons
+.\"    Source: NetworkManager 0.9.10
+.\"  Language: English
+.\"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 0\&.9\&.10" "Network management daemons"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+NetworkManager \- network management daemon
+.SH "SYNOPSIS"
+.HP \w'\fBNetworkManager\ \fR\fB[OPTIONS...]\fR\ 'u
+\fBNetworkManager \fR\fB[OPTIONS...]\fR
+.SH "DESCRIPTION"
+.PP
+The NetworkManager daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network connection and other network interfaces, like Ethernet, WiFi, and Mobile Broadband devices\&. NetworkManager will connect any network device when a connection for that device becomes available, unless that behavior is disabled\&. Information about networking is exported via a D\-Bus interface to any interested application, providing a rich API with which to inspect and control network settings and operation\&.
+.SH "DISPATCHER SCRIPTS"
+.PP
+NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher\&.d directory or subdirectories in alphabetical order in response to network events\&. Each script should be a regular executable file owned by root\&. Furthermore, it must not be writable by group or other, and not setuid\&.
+.PP
+Each script receives two arguments, the first being the interface name of the device an operation just happened on, and second the action\&.
+.PP
+The actions are:
+.PP
+\fIpre\-up\fR
+.RS 4
+The interface is connected to the network but is not yet fully activated\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-up\&.d directory, and NetworkManager will wait for script execution to complete before indicating to applications that the interface is fully activated\&.
+.RE
+.PP
+\fIup\fR
+.RS 4
+The interface has been activated\&.
+.RE
+.PP
+\fIpre\-down\fR
+.RS 4
+The interface will be deactivated but has not yet been disconnected from the network\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-down\&.d directory, and NetworkManager will wait for script execution to complete before disconnecting the interface from its network\&. Note that this event is not emitted for forced disconnections, like when carrier is lost or a wireless signal fades\&. It is only emitted when there is an opportunity to cleanly handle a network disconnection event\&.
+.RE
+.PP
+\fIdown\fR
+.RS 4
+The interface has been deactivated\&.
+.RE
+.PP
+\fIvpn\-pre\-up\fR
+.RS 4
+The VPN is connected to the network but is not yet fully activated\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-up\&.d directory, and NetworkManager will wait for script execution to complete before indicating to applications that the VPN is fully activated\&.
+.RE
+.PP
+\fIvpn\-up\fR
+.RS 4
+A VPN connection has been activated\&.
+.RE
+.PP
+\fIvpn\-pre\-down\fR
+.RS 4
+The VPN will be deactivated but has not yet been disconnected from the network\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-down\&.d directory, and NetworkManager will wait for script execution to complete before disconnecting the VPN from its network\&. Note that this event is not emitted for forced disconnections, like when the VPN terminates unexpectedly or general connectivity is lost\&. It is only emitted when there is an opportunity to cleanly handle a VPN disconnection event\&.
+.RE
+.PP
+\fIvpn\-down\fR
+.RS 4
+A VPN connection has been deactivated\&.
+.RE
+.PP
+\fIhostname\fR
+.RS 4
+The system hostname has been updated\&. Use gethostname(2) to retrieve it\&. The interface name (first argument) is empty and no environment variable is set for this action\&.
+.RE
+.PP
+\fIdhcp4\-change\fR
+.RS 4
+The DHCPv4 lease has changed (renewed, rebound, etc)\&.
+.RE
+.PP
+\fIdhcp6\-change\fR
+.RS 4
+The DHCPv6 lease has changed (renewed, rebound, etc)\&.
+.RE
+.PP
+The environment contains more information about the interface and the connection\&. The following variables are available for the use in the dispatcher scripts:
+.PP
+\fICONNECTION_UUID\fR
+.RS 4
+The UUID of the connection profile\&.
+.RE
+.PP
+\fICONNECTION_ID\fR
+.RS 4
+The name (ID) of the connection profile\&.
+.RE
+.PP
+\fIDEVICE_IFACE\fR
+.RS 4
+The interface name of the device\&.
+.RE
+.PP
+\fIDEVICE_IP_IFACE\fR
+.RS 4
+The IP interface name of the device\&.
+.RE
+.PP
+\fIIP4_ADDRESS_N\fR
+.RS 4
+The IPv4 address in the format "address/prefix gateway", where N is a number from 0 to (# IPv4 address \e\- 1)\&.
+.RE
+.PP
+\fIIP4_NUM_ADDRESSES\fR
+.RS 4
+The variable contains the number of IPv4 addresses the script may expect\&.
+.RE
+.PP
+\fIIP4_ROUTE_N\fR
+.RS 4
+The IPv4 route in the format "address/prefix next\-hop metric", where N is a number from 0 to (# IPv4 routes \e\- 1)\&.
+.RE
+.PP
+\fIIP4_NUM_ROUTES\fR
+.RS 4
+The variable contains the number of IPv4 routes the script may expect\&.
+.RE
+.PP
+\fIIP4_NAMESERVERS\fR
+.RS 4
+The variable contains a space\-separated list of the DNS servers\&.
+.RE
+.PP
+\fIIP4_DOMAINS\fR
+.RS 4
+The variable contains a space\-separated list of the search domains\&.
+.RE
+.PP
+\fIDHCP4_<dhcp\-option\-name>\fR
+.RS 4
+If the connection used DHCP for address configuration, the received DHCP configuration is passed in the environment using standard DHCP option names, prefixed with "DHCP4_", like "DHCP4_HOST_NAME=foobar"\&.
+.RE
+.PP
+\fIIP6_<name> and DHCP6_<name>\fR
+.RS 4
+The same variables as for IPv4 are available for IPv6, but the prefixes are IP6_ and DHCP6_ instead\&.
+.RE
+.PP
+In case of VPN, VPN_IP_IFACE is set, and IP4_*, IP6_* variables with VPN prefix are exported too, like VPN_IP4_ADDRESS_0, VPN_IP4_NUM_ADDRESSES\&.
+.PP
+Dispatcher scripts are run one at a time, but asynchronously from the main NetworkManager process, and will be killed if they run for too long\&. If your script might take arbitrarily long to complete, you should spawn a child process and have the parent return immediately\&. Also beware that once a script is queued, it will always be run, even if a later event renders it obsolete\&. (Eg, if an interface goes up, and then back down again quickly, it is possible that one or more "up" scripts will be run after the interface has gone down\&.)
+.SH "OPTIONS"
+.PP
+The following options are understood:
+.PP
+\fB\-\-version\fR | \fB\-V\fR
+.RS 4
+Print the NetworkManager software version and exit\&.
+.RE
+.PP
+\fB\-\-help\fR | \fB\-h\fR
+.RS 4
+Print NetworkManager\*(Aqs available options and exit\&.
+.RE
+.PP
+\fB\-\-no\-daemon\fR | \fB\-n\fR
+.RS 4
+Do not daemonize\&.
+.RE
+.PP
+\fB\-\-debug\fR | \fB\-d\fR
+.RS 4
+Do not daemonize, and direct log output to the controlling terminal in addition to syslog\&.
+.RE
+.PP
+\fB\-\-pid\-file\fR | \fB\-p\fR
+.RS 4
+Specify location of a PID file\&. The PID file is used for storing PID of the running proccess and prevents running multiple instances\&.
+.RE
+.PP
+\fB\-\-state\-file\fR
+.RS 4
+Specify file for storing state of the NetworkManager persistently\&. If not specified, the default value of /var/lib/NetworkManager/NetworkManager\&.state is used\&.
+.RE
+.PP
+\fB\-\-config\fR
+.RS 4
+Specify configuration file to set up various settings for NetworkManager\&. If not specified, the default value of /etc/NetworkManager/NetworkManager\&.conf is used with a fallback to the older \*(Aqnm\e\-system\e\-settings\&.conf\*(Aq if located in the same directory\&. See
+\fBNetworkManager.conf\fR(5)
+for more information on configuration file\&.
+.RE
+.PP
+\fB\-\-plugins\fR
+.RS 4
+List plugins used to manage system\-wide connection settings\&. This list has preference over plugins specified in the configuration file\&. Currently supported plugins are: keyfile,
+\fBifcfg\-rh\fR,
+\fBifcfg\-suse\fR,
+\fBifupdown\fR\&.
+.RE
+.PP
+\fB\-\-log\-level\fR
+.RS 4
+Sets how much information NetworkManager sends to the log destination (usually syslog\*(Aqs "daemon" facility)\&. By default, only informational, warning, and error messages are logged\&. See the section on
+logging
+in
+\fBNetworkManager.conf\fR(5)
+for more information\&.
+.RE
+.PP
+\fB\-\-log\-domains\fR
+.RS 4
+A comma\-separated list specifying which operations are logged to the log destination (usually syslog)\&. By default, most domains are logging\-enabled\&. See the section on
+logging
+in
+\fBNetworkManager.conf\fR(5)
+for more information\&.
+.RE
+.SH "DEBUGGING"
+.PP
+The following environment variables are supported to help debugging\&. When used in conjunction with the
+\fB\-\-no\-daemon\fR
+option (thus echoing PPP and DHCP helper output to stdout) these can quickly help pinpoint the source of connection issues\&. Also see the
+\fB\-\-log\-level\fR
+and
+\fB\-\-log\-domains\fR
+to enable debug logging inside NetworkManager itself\&.
+.PP
+\fBNM_PPP_DEBUG\fR: When set to anything, causes NetworkManager to turn on PPP debugging in pppd, which logs all PPP and PPTP frames and client/server exchanges\&.
+.SH "SEE ALSO"
+.PP
+\fBNetworkManager.conf\fR(5),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(5),
+\fBnm-online\fR(1),
+\fBnm-settings\fR(5),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)
diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in
deleted file mode 100644
index d550079a9..000000000
--- a/man/NetworkManager.8.in
+++ /dev/null
@@ -1,157 +0,0 @@
-.\" NetworkManager(8) manual page
-.\"
-.\" Copyright (C) 2005 - 2013 Red Hat, Inc.
-.\" Copyright (C) 2005 - 2009 Novell, Inc.
-.\" Copyright (C) 2005 Robert Love
-.\"
-.TH NETWORKMANAGER "8" "17 January 2012"
-.SH NAME
-NetworkManager \- network management daemon
-.SH SYNOPSIS
-.B NetworkManager [\-\-version] | [\-\-help]
-.PP
-.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>]
-.SH DESCRIPTION
-The \fINetworkManager\fP daemon attempts to make  networking configuration and
-operation as painless and automatic as possible by managing the primary network
-connection and other network interfaces, like Ethernet, WiFi, and Mobile
-Broadband devices.  NetworkManager will connect any network device when a
-connection for that device becomes available, unless that behavior is disabled.
-Information about networking is exported via a D-Bus interface to any interested
-application, providing a rich API with which to inspect and control network
-settings and operation.
-.P
-NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher.d
-directory in alphabetical order in response to network events.  Each script
-should be:
-.IP "(a)" 4
-a regular file
-.IP "(b)" 4
-owned by root
-.IP "(c)" 4
-not writable by group or other
-.IP "(d)" 4
-not set-uid
-.IP "(e)" 4
-and executable by the owner
-.PP
-Each script receives two arguments, the first being the interface name of the
-device just activated, and second an action.
-.PP
-Actions:
-.TP
-.I "up"
-The interface has been activated.  The environment contains more information
-about the interface; CONNECTION_UUID contains the UUID of the connection.  Other
-variables are IP4_ADDRESS_N where N is a number from 0 to (# IPv4 addresses \- 1),
-in the format "address/prefix gateway".  IP4_NUM_ADDRESSES contains the number
-addresses the script may expect.  IP4_NAMESERVERS contains a space-separated
-list of the DNS servers, and IP4_DOMAINS contains a space-separated list of the
-search domains.  Routes use the format IP4_ROUTE_N where N is a number from 0
-to (# IPv4 routes \- 1), in the format "address/prefix next-hop metric", and
-IP4_NUM_ROUTES contains the number of routes to expect.  If the connection used
-DHCP for address configuration, the received DHCP configuration is passed in the
-environment using standard DHCP option names, prefixed with "DHCP4_", like
-"DHCP4_HOST_NAME=foobar".
-.TP
-.I "down"
-The interface has been deactivated.
-.TP
-.I "vpn\-up"
-A VPN connection has been activated.  The environment contains the connection
-UUID in the variable CONNECTION_UUID.
-.TP
-.I "vpn\-down"
-A VPN connection has been deactivated.
-.TP
-.I "hostname"
-The system hostname has been updated.  Use gethostname(2) to retrieve it.
-.TP
-.I "dhcp4\-change"
-The DHCPv4 lease has changed (renewed, rebound, etc).
-.TP
-.I "dhcp6\-change"
-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 "\-\-help"
-Print NetworkManager's available options 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.
-.TP
-.I "\-\-pid\-file=<filename>"
-Specify location of a PID file.  The PID file is used for storing PID of the
-running proccess and prevents running multiple instances.
-.TP
-.I "\-\-state\-file=<filename>"
-Specify file for storing state of the NetworkManager persistently.  If not specified,
-the default value of '<LOCALSTATEDIR>/lib/NetworkManager/NetworkManager.state' is
-used; where <LOCALSTATEDIR> is dependent on your distribution (usually it's /var).
-.TP
-.I "\-\-config=<filename>"
-Specify configuration file to set up various settings for NetworkManager.  If not
-specified, the default value of '<SYSCONFDIR>/NetworkManager/NetworkManager.conf'
-is used with a fallback to the older 'nm\-system\-settings.conf' if located in
-the same directory; where <SYSCONFDIR> is dependent on your distribution (usually
-it's /etc).  See \fBNetworkManager.conf\fP(5) for more information on configuration
-file.
-.TP
-.I "\-\-plugins=<plugin1>,<plugin2>, ...
-List plugins used to manage system-wide connection settings.   This list has
-preference over plugins specified in the configuration file.  Currently supported
-plugins are: keyfile, ifcfg\-rh, ifcfg\-suse, ifupdown.
-See \fBNetworkManager.conf\fP(5) for more information on the plugins.
-.TP
-.I "\-\-log\-level=<level>
-Sets how much information NetworkManager sends to the log destination (usually
-syslog's "daemon" facility).  By default, only informational, warning, and error
-messages are logged.  See \fBNetworkManager.conf\fP(5) for more information on
-log levels and domains.
-.TP
-.I "\-\-log\-domains=<domain1>,<domain2>, ...
-Sets which operations are logged to the log destination (usually syslog).  By
-default, most domains are logging-enabled.  See \fBNetworkManager.conf\fP(5) for
-more information on log levels and domains.
-.TP
-.I "\-\-connectivity\-uri=<uri>
-Sets the URI of a web page that will be used for connectivity checking. By
-default connectivity checking is disabled.  See \fBNetworkManager.conf\fP(5)
-[connectivity] section for more information on connectivity checking feature.
-.TP
-.I "\-\-connectivity\-interval=<int>
-Sets the interval (in seconds) in which connection checks for the URI are done.
-0 means no checks. The default value is 300 seconds. See
-\fBNetworkManager.conf\fP(5) [connectivity] section for more information on
-connectivity checking feature.
-.TP
-.I "\-\-connectivity\-response=<resp>
-If set, it controls what body content NetworkManager checks for when requesting
-the URI for connectivity checking.  If missing, defaults to "NetworkManager is online".
-See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on
-connectivity checking feature.
-
-.SH DEBUGGING
-The following environment variables are supported to help debugging.  When used
-in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper
-output to stdout) these can quickly help pinpoint the source of connection
-issues.  Also see the \-\-log\-level and \-\-log\-domains to enable debug logging inside
-NetworkManager itself.
-.TP
-.I "NM_PPP_DEBUG"
-When set to anything, causes NetworkManager to turn on PPP debugging in pppd,
-which logs all PPP and PPTP frames and client/server exchanges.
-.SH SEE ALSO
-.BR nm\-tool (1),
-.BR nm\-online (1),
-.BR nmcli (1),
-.BR NetworkManager.conf (5),
-.BR nm\-settings (5),
-.BR nm\-applet (1),
-.BR nm\-connection\-editor (1).
-
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
new file mode 100644
index 000000000..ef7641bc9
--- /dev/null
+++ b/man/NetworkManager.conf.5
@@ -0,0 +1,458 @@
+'\" t
+.\"     Title: NetworkManager.conf
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 07/03/2014
+.\"    Manual: Configuration
+.\"    Source: NetworkManager 0.9.10
+.\"  Language: English
+.\"
+.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 0\&.9\&.10" "Configuration"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+NetworkManager.conf \- NetworkManager configuration file
+.SH "SYNOPSIS"
+.PP
+/etc/NetworkManager/NetworkManager\&.conf,
+/etc/NetworkManager/conf\&.d/\fIname\fR\&.conf
+.SH "DESCRIPTION"
+.PP
+This is a configuration file for NetworkManager\&. It is used to set up various aspects of NetworkManager\*(Aqs behavior\&. The location of the file may be changed through use of the
+\fB\-\-config\fR
+argument for NetworkManager\&.
+.PP
+If a default
+NetworkManager\&.conf
+is provided by your distribution\*(Aqs packages, you should not modify it, since your changes may get overwritten by package updates\&. Instead, you can add additional
+\&.conf
+files to the
+conf\&.d
+directory\&. These will be read in order, with later files overriding earlier ones\&.
+.SH "FILE FORMAT"
+.PP
+The configuration file format is so\-called key file (sort of ini\-style format)\&. It consists of sections (groups) of key\-value pairs\&. Lines beginning with a \*(Aq#\*(Aq and blank lines are considered comments\&. Sections are started by a header line containing the section enclosed in \*(Aq[\*(Aq and \*(Aq]\*(Aq, and ended implicitly by the start of the next section or the end of the file\&. Each key\-value pair must be contained in a section\&.
+.PP
+For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or "*" to specify all devices\&.
+.PP
+Minimal system settings configuration file looks like this:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+	[main]
+	plugins=keyfile
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+As an extension to the normal keyfile format, you can also append a value to a previously\-set list\-valued key by doing:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+	plugins+=another\-plugin
+      
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "MAIN SECTION"
+.PP
+\fIplugins\fR
+.RS 4
+Lists system settings plugin names separated by \*(Aq,\*(Aq\&. These plugins are used to read and write system\-wide connections\&. When multiple plugins are specified, the connections are read from all listed plugins\&. When writing connections, the plugins will be asked to save the connection in the order listed here; if the first plugin cannot write out that connection type (or can\*(Aqt write out any connections) the next plugin is tried, etc\&. If none of the plugins can save the connection, an error is returned to the user\&.
+.sp
+If NetworkManager defines a distro\-specific network\-configuration plugin for your system, then that will normally be listed here\&. (See below for the available plugins\&.) Note that the
+keyfile
+plugin is always appended to the end of this list (if it doesn\*(Aqt already appear earlier in the list), so if there is no distro\-specific plugin for your system then you can leave this key unset and NetworkManager will default to using
+keyfile\&.
+.RE
+.PP
+\fImonitor\-connection\-files\fR
+.RS 4
+Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running\&. This is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested via the ReloadConnections D\-Bus call\&. If this key is set to \*(Aqtrue\*(Aq, then NetworkManager will reload connection files any time they changed\&.
+.RE
+.PP
+\fIdhcp\fR
+.RS 4
+This key sets up what DHCP client NetworkManager will use\&. Presently
+dhclient
+and
+dhcpcd
+are supported\&. The client configured here should be available on your system too\&. If this key is missing, available DHCP clients are looked for in this order: dhclient, dhcpcd\&.
+.RE
+.PP
+\fIno\-auto\-default\fR
+.RS 4
+Comma\-separated list of devices for which NetworkManager shouldn\*(Aqt create default wired connection (Auto eth0)\&. By default, NetworkManager creates a temporary wired connection for any Ethernet device that is managed and doesn\*(Aqt have a connection configured\&. List a device in this option to inhibit creating the default connection for the device\&. May have the special value
+*
+to apply to all devices\&.
+.sp
+When the default wired connection is deleted or saved to a new persistent connection by a plugin, the device is added to a list in the file
+/var/run/NetworkManager/no\-auto\-default\&.state
+to prevent creating the default connection for that device again\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+	    no\-auto\-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
+	    no\-auto\-default=eth0,eth1
+	    no\-auto\-default=*
+	  
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
+.PP
+\fIignore\-carrier\fR
+.RS 4
+Comma\-separated list of devices for which NetworkManager will (partially) ignore the carrier state\&. Normally, for device types that support carrier\-detect, such as Ethernet and InfiniBand, NetworkManager will only allow a connection to be activated on the device if carrier is present (ie, a cable is plugged in), and it will deactivate the device if carrier drops for more than a few seconds\&.
+.sp
+Listing a device here will allow activating connections on that device even when it does not have carrier, provided that the connection uses only statically\-configured IP addresses\&. Additionally, it will allow any active connection (whether static or dynamic) to remain active on the device when carrier is lost\&.
+.sp
+May have the special value
+*
+to apply to all devices\&.
+.sp
+Note that the "carrier" property of NMDevices and device D\-Bus interfaces will still reflect the actual device state; it\*(Aqs just that NetworkManager will not make use of that information\&.
+.RE
+.PP
+\fIdns\fR
+.RS 4
+Set the DNS (resolv\&.conf) processing mode\&.
+.sp
+default: The default if the key is not specified\&. NetworkManager will update
+resolv\&.conf
+to reflect the nameservers provided by currently active connections\&.
+.sp
+dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a "split DNS" configuration if you are connected to a VPN, and then update
+resolv\&.conf
+to point to the local nameserver\&.
+.sp
+unbound: NetworkManager will talk to unbound and dnssec\-triggerd, providing a "split DNS" configuration with DNSSEC support\&. The /etc/resolv\&.conf will be managed by dnssec\-trigger daemon\&.
+.sp
+none: NetworkManager will not modify resolv\&.conf\&.
+.RE
+.PP
+\fIdebug\fR
+.RS 4
+Comma separated list of options to aid debugging\&. This value will be combined with the environment variable
+NM_DEBUG\&. Currently the following values are supported:
+.sp
+RLIMIT_CORE: set ulimit \-c unlimited to write out core dumps\&.
+.RE
+.SH "KEYFILE SECTION"
+.PP
+This section contains keyfile\-plugin\-specific options, and is normally only used when you are not using any other distro\-specific plugin\&.
+.PP
+.PP
+\fIhostname\fR
+.RS 4
+Set a persistent hostname\&.
+.RE
+.PP
+\fIunmanaged\-devices\fR
+.RS 4
+Set devices that should be ignored by NetworkManager when using the
+keyfile
+plugin\&. Devices are specified in the following format:
+.sp
+mac:<hwaddr>
+or
+interface\-name:<ifname>\&. Here
+hwaddr
+is the MAC address of the device to be ignored, in hex\-digits\-and\-colons notation\&.
+ifname
+is the interface name of the ignored device\&.
+.sp
+Multiple entries are separated with semicolons\&. No spaces are allowed in the value\&.
+.sp
+Example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+unmanaged\-devices=interface\-name:em4
+unmanaged\-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface\-name:eth2
+	    
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
+.SH "IFUPDOWN SECTION"
+.PP
+This section contains ifupdown\-specific options and thus only has effect when using the
+ifupdown
+plugin\&.
+.PP
+.PP
+\fImanaged\fR
+.RS 4
+If set to
+true, then interfaces listed in
+/etc/network/interfaces
+are managed by NetworkManager\&. If set to
+false, then any interface listed in
+/etc/network/interfaces
+will be ignored by NetworkManager\&. Remember that NetworkManager controls the default route, so because the interface is ignored, NetworkManager may assign the default route to some other interface\&.
+.sp
+The default value is
+false\&.
+.RE
+.SH "LOGGING SECTION"
+.PP
+This section controls NetworkManager\*(Aqs logging\&. Any settings here are overridden by the
+\fB\-\-log\-level\fR
+and
+\fB\-\-log\-domains\fR
+command\-line options\&.
+.PP
+.PP
+\fIlevel\fR
+.RS 4
+The default logging verbosity level\&. One of
+ERR,
+WARN,
+INFO,
+DEBUG\&. The ERR level logs only critical errors\&. WARN logs warnings that may reflect operation\&. INFO logs various informational messages that are useful for tracking state and operations\&. DEBUG enables verbose logging for debugging purposes\&. Subsequent levels also log all messages from earlier levels; thus setting the log level to INFO also logs error and warning messages\&.
+.RE
+.PP
+\fIdomains\fR
+.RS 4
+The following log domains are available: PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH\&.
+.sp
+In addition, these special domains can be used: NONE, ALL, DEFAULT, DHCP, IP\&.
+.sp
+You can specify per\-domain log level overrides by adding a colon and a log level to any domain\&. E\&.g\&., "WIFI:DEBUG"\&.
+.RE
+.PP
+.RS 4
+.PP
+Domain descriptions:
+.RS 4
+PLATFORM    : OS (platform) operations
+.RE
+.RS 4
+RFKILL      : RFKill subsystem operations
+.RE
+.RS 4
+ETHER       : Ethernet device operations
+.RE
+.RS 4
+WIFI        : Wi\-Fi device operations
+.RE
+.RS 4
+BT          : Bluetooth operations
+.RE
+.RS 4
+MB          : Mobile broadband operations
+.RE
+.RS 4
+DHCP4       : DHCP for IPv4
+.RE
+.RS 4
+DHCP6       : DHCP for IPv6
+.RE
+.RS 4
+PPP         : Point\-to\-point protocol operations
+.RE
+.RS 4
+WIFI_SCAN   : Wi\-Fi scanning operations
+.RE
+.RS 4
+IP4         : IPv4\-related operations
+.RE
+.RS 4
+IP6         : IPv6\-related operations
+.RE
+.RS 4
+AUTOIP4     : AutoIP (avahi) operations
+.RE
+.RS 4
+DNS         : Domain Name System related operations
+.RE
+.RS 4
+VPN         : Virtual Private Network connections and operations
+.RE
+.RS 4
+SHARING     : Connection sharing
+.RE
+.RS 4
+SUPPLICANT  : WPA supplicant related operations
+.RE
+.RS 4
+AGENTS      : Secret agents operations and communication
+.RE
+.RS 4
+SETTINGS    : Settings/config service operations
+.RE
+.RS 4
+SUSPEND     : Suspend/resume
+.RE
+.RS 4
+CORE        : Core daemon and policy operations
+.RE
+.RS 4
+DEVICE      : Activation and general interface operations
+.RE
+.RS 4
+OLPC        : OLPC Mesh device operations
+.RE
+.RS 4
+WIMAX       : WiMAX device operations
+.RE
+.RS 4
+INFINIBAND  : InfiniBand device operations
+.RE
+.RS 4
+FIREWALL    : FirewallD related operations
+.RE
+.RS 4
+ADSL        : ADSL device operations
+.RE
+.RS 4
+BOND        : Bonding operations
+.RE
+.RS 4
+VLAN        : VLAN operations
+.RE
+.RS 4
+BRIDGE      : Bridging operations
+.RE
+.RS 4
+DBUS_PROPS  : D\-Bus property changes
+.RE
+.RS 4
+TEAM        : Teaming operations
+.RE
+.RS 4
+CONCHECK    : Connectivity check
+.RE
+.RS 4
+DCB         : Data Center Bridging (DCB) operations
+.RE
+.RS 4
+DISPATCH    : Dispatcher scripts
+.RE
+.RS 4
+ 
+.RE
+.RS 4
+NONE        : when given by itself logging is disabled
+.RE
+.RS 4
+ALL         : all log domains
+.RE
+.RS 4
+DEFAULT     : default log domains
+.RE
+.RS 4
+DHCP        : shortcut for "DHCP4,DHCP6"
+.RE
+.RS 4
+IP          : shortcut for "IP4,IP6"
+.RE
+.RS 4
+ 
+.RE
+.RS 4
+HW          : deprecated alias for "PLATFORM"
+.RE
+.RE
+.SH "CONNECTIVITY SECTION"
+.PP
+This section controls NetworkManager\*(Aqs optional connectivity checking functionality\&. This allows NetworkManager to detect whether or not the system can actually access the internet or whether it is behind a captive portal\&.
+.PP
+.PP
+\fIuri\fR
+.RS 4
+The URI of a web page to periodically request when connectivity is being checked\&. This page should return the header "X\-NetworkManager\-Status" with a value of "online"\&. Alternatively, it\*(Aqs body content should be set to "NetworkManager is online"\&. The body content check can be controlled by the
+response
+option\&. If this option is blank or missing, connectivity checking is disabled\&.
+.RE
+.PP
+\fIinterval\fR
+.RS 4
+Specified in seconds; controls how often connectivity is checked when a network connection exists\&. If set to 0 connectivity checking is disabled\&. If missing, the default is 300 seconds\&.
+.RE
+.PP
+\fIresponse\fR
+.RS 4
+If set controls what body content NetworkManager checks for when requesting the URI for connectivity checking\&. If missing, defaults to "NetworkManager is online"
+.RE
+.SH "PLUGINS"
+.PP
+\fIkeyfile\fR
+.RS 4
+The
+keyfile
+plugin is the generic plugin that supports all the connection types and capabilities that NetworkManager has\&. It writes files out in an \&.ini\-style format in /etc/NetworkManager/system\-connections\&.
+.sp
+The stored connection file may contain passwords and private keys, so it will be made readable only to root, and the plugin will ignore files that are readable or writeable by any user or group other than root\&.
+.sp
+This plugin is always active, and will automatically be used to store any connections that aren\*(Aqt supported by any other active plugin\&.
+.RE
+.PP
+\fIifcfg\-rh\fR
+.RS 4
+This plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read and write configuration from the standard
+/etc/sysconfig/network\-scripts/ifcfg\-*
+files\&. It currently supports reading Ethernet, Wi\-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections\&.
+.RE
+.PP
+\fIifcfg\-suse\fR
+.RS 4
+This plugin is only provided for simple backward compatibility with SUSE and OpenSUSE configuration\&. Most setups should be using the
+keyfile
+plugin instead\&. The
+ifcfg\-suse
+plugin supports reading Ethernet and Wi\-Fi connections, but does not support saving any connection types\&.
+.RE
+.PP
+\fIifupdown\fR
+.RS 4
+This plugin is used on the Debian and Ubuntu distributions, and reads Ethernet and Wi\-Fi connections from
+/etc/network/interfaces\&.
+.sp
+This plugin is read\-only; any connections (of any type) added from within NetworkManager when you are using this plugin will be saved using the
+keyfile
+plugin instead\&.
+.RE
+.SH "SEE ALSO"
+.PP
+\fBNetworkManager\fR(8),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(5),
+\fBnm-online\fR(1),
+\fBnm-settings\fR(5),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
deleted file mode 100644
index e595076a2..000000000
--- a/man/NetworkManager.conf.5.in
+++ /dev/null
@@ -1,266 +0,0 @@
-.\" NetworkManager.conf(5) manual page
-.\"
-.\" Copyright (C) 2010 - 2013 Red Hat, Inc.
-.\"
-.TH "NetworkManager.conf" "5" "17 January 2013" ""
-.SH NAME
-NetworkManager.conf \- NetworkManager configuration file
-.SH SYNOPSIS
-/etc/NetworkManager/NetworkManager.conf
-.br
-or
-.br
-\fI<SYSCONFDIR>\fP/NetworkManager/NetworkManager.conf
-.br
-where <SYSCONFDIR> depends on your distribution or build.
-.SH DESCRIPTION
-.P
-.I NetworkManager.conf
-is a configuration file for NetworkManager. It is used to set up various
-aspects of NetworkManager's behavior. The location of
-the file may be changed through use of the "\-\-config=" argument for
-\fBNetworkManager\fP (8).
-.SH "FILE FORMAT"
-.P
-The configuration file format is so-called key file (sort of ini-style format).
-It consists of sections (groups) of key-value pairs. Lines beginning with a '#' and blank
-lines are considered comments. Sections are started by a header line containing
-the section enclosed in '[' and ']', and ended implicitly by the start of
-the next section or the end of the file. Each key-value pair must be contained
-in a section.
-.br
-Minimal system settings configuration file looks like this:
-.P
-.nf
-[main]
-plugins=keyfile
-.fi
-.P
-Description of sections and available keys follows:
-.SS [main]
-This section is the only mandatory section of the configuration file.
-.TP
-.B plugins=\fIplugin1\fP,\fIplugin2\fP, ...
-List system settings plugin names separated by ','. These plugins are used to
-read/write system-wide connection. When more plugins are specified, the
-connections are read from all listed plugins. When writing connections, the
-plugins will be asked to save the connection in the order listed here. If the
-first plugin cannot write out that connection type, or can't write out any
-connections, the next plugin is tried. If none of the plugins can save the
-connection, the error is returned to the user.
-.P
-.RS
-.B "Available plugins:"
-.br
-.TP 
-.I keyfile
-plugin is the generic plugin that supports all the connection types and
-capabilities that NetworkManager has. It writes files out in a .ini-style format in
-/etc/NetworkManager/system-connections. For security, it will ignore files
-that are readable or writeable by any user or group other than
-.I root
-since private keys and passphrases may be stored in plaintext inside the file.
-.TP 
-.I ifcfg\-rh
-plugin is used on the Fedora and Red Hat Enterprise Linux distributions
-to read and write configuration from the standard /etc/sysconfig/network-scripts/ifcfg-* files.
-It currently supports reading wired, WiFi, and 802.1x connections, but does not yet support reading
-or writing mobile broadband, PPPoE, or VPN connections. To allow reading and writing of these
-add \fIkeyfile\fP plugin to your configuration as well.
-.TP
-.I ifupdown
-plugin is used on the Debian and Ubuntu distributions, and reads connections from
-/etc/network/interfaces. Since it cannot write connections out (that support isn't planned),
-it is usually paired with the \fIkeyfile\fP plugin to enable saving and editing of new connections.
-The \fIifupdown\fP plugin supports basic wired and WiFi connections, including WPA-PSK.
-.TP
-.I ifcfg\-suse
-plugin is only provided for simple backward compatibility with SUSE and OpenSUSE configuration.
-Most setups should be using the \fIkeyfile\fP plugin instead. The \fIifcfg\-suse\fP plugin supports
-reading wired and WiFi connections, but does not support saving any connection types.
-.RE
-.TP
-.B dhcp=\fIdhclient\fP | \fIdhcpcd\fP
-This key sets up what DHCP client NetworkManager will use. Presently
-\fIdhclient\fP and \fIdhcpcd\fP are supported. The client configured here should
-be available on your system too. If this key is missing, available DHCP clients
-are looked for in this order: dhclient, dhcpcd.
-.TP
-.B no-auto-default=\fI<hwaddr>\fP,\fI<hwaddr>\fP,... | \fI*\fP
-Set devices for which NetworkManager shouldn't create default wired connection
-(Auto eth0). NetworkManager creates a default wired connection for any wired
-device that is managed and doesn't have a connection configured. List a device
-in this option to inhibit creating the default connection for the device.
-.br
-When the default wired connection is deleted or saved to a new persistent connection
-by a plugin, the MAC address of the wired device is automatically added to this list
-to prevent creating the default connection for that device again.
-Devices are specified by their MAC addresses, in lowercase. Multiple
-entries are separated by commas. You can use the glob character \fI*\fP instead
-of listing addresses to specify all devices.
-.br
-Examples:
-.nf
-no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
-no-auto-default=*
-.fi
-.TP
-.B dns=\fIplugin1\fP,\fIplugin2\fP, ...
-List DNS plugin names separated by ','. DNS plugins are used to provide local
-caching nameserver functionality (which speeds up DNS queries) and to push
-DNS data to applications that use it.
-.P
-.RS
-.B "Available plugins:"
-.br
-.TP
-.I dnsmasq
-this plugin uses dnsmasq to provide local caching nameserver functionality.
-.RE
-.SS [keyfile]
-This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin.
-.TP
-.B hostname=\fI<hostname>\fP
-Set a persistent hostname when using the \fIkeyfile\fP plugin.
-.TP
-.B unmanaged-devices=\fImac:<hwaddr>\fP;\fImac:<hwaddr>\fP;...
-Set devices that should be ignored by NetworkManager when using the \fIkeyfile\fP
-plugin. Devices are specified in the following format: "mac:<hwaddr>", where
-<hwaddr> is MAC address of the device to be ignored, in hex-digits-and-colons notation.
-Multiple entries are separated by a semicolon. No spaces are allowed in the value.
-.br
-Example:
-.nf
-unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4
-.fi
-.SS [ifupdown]
-This section contains ifupdown-specific options and thus only has effect when using \fIifupdown\fP plugin.
-.TP
-.B managed=\fIfalse\fP | \fItrue\fP
-Controls whether interfaces listed in the 'interfaces' file are managed by NetworkManager.
-If set to \fItrue\fP, then interfaces listed in /etc/network/interfaces are managed by NetworkManager.
-If set to \fIfalse\fP, then any interface listed in /etc/network/interfaces will be
-ignored by NetworkManager. Remember that NetworkManager controls the default route,
-so because the interface is ignored, NetworkManager may assign the default route to
-some other interface.
-When the option is missing, \fIfalse\fP value is taken as default.
-.SS [logging]
-This section controls NetworkManager's logging.  Any settings here are
-overridden by the \-\-log\-level and \-\-log\-domains command-line options.
-.TP
-.B level=\fI<level>\fP
-One of [ERR, WARN, INFO, DEBUG].  The ERR level logs only critical errors.  WARN
-logs warnings that may reflect operation.  INFO logs various informational
-messages that are useful for tracking state and operations.  DEBUG enables
-verbose logging for debugging purposes.  Subsequent levels also log all messages
-from earlier levels; thus setting the log level to INFO also logs error and
-warning messages.
-.TP
-.B domains=\fI<domain1>,<domain2>, ...\fP
-The following log domains are available: [HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4,
-DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS,
-SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND,
-VLAN, BRIDGE].
-.br
-In addition to them, these special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP].
-.PP
-.RS
-NONE = when given by itself, logging is disabled
-.br
-ALL = all log domains will be switched on
-.br
-DEFAULT = default log domains
-.br
-DHCP = a shortcut for "DHCP4, DHCP6"
-.br
-IP = a shortcut for "IP4, IP6"
-.br
-.PP
-HW = Hardware related operations
-.br
-RFKILL = RFKill subsystem operations
-.br
-ETHER = Ethernet device operations
-.br
-WIFI = Wi-Fi device operations
-.br
-BT = Bluetooth
-.br
-MB = Mobile Broadband
-.br
-DHCP4 = DHCP for IPv4
-.br
-DHCP6 = DHCP for IPv6
-.br
-PPP = Point-to-point protocol operations
-.br
-WIFI_SCAN = Wi-Fi scanning operations
-.br
-IP4 = Domain for IPv4 logging
-.br
-IP6 = Domain for IPv6 logging
-.br
-AUTOIP4 = AutoIP (avahi) operations
-.br
-DNS = Domain Name System related operations
-.br
-VPN = Virtual Private Network connections and operaions
-.br
-SHARING = Connection sharing
-.br
-SUPPLICANT = WPA supplicant related operations
-.br
-AGENTS = Secret agents operations and communication
-.br
-SETTINGS = Settings/config service operations
-.br
-SUSPEND = Suspend/resume
-.br
-CORE = Core daemon operations
-.br
-DEVICE = Activation and general interface operations
-.br
-OLPC = OLPC Mesh device operations
-.br
-WIMAX = Wimax device operations
-.br
-INFINIBAND = InfiniBand device operations
-.br
-FIREWALL = FirewallD related operations
-.br
-ADSL = ADSL device operations
-.br
-BOND = Bonding device operations
-.br
-VLAN = VLAN device operations
-.br
-BRIDGE = Bridging device operations
-.br
-.SS [connectivity]
-This section controls NetworkManager's optional connectivity checking
-functionality.  This allows NetworkManager to detect whether or not the system
-can actually access the internet or whether it is behind a captive portal.
-.TP
-.B uri=\fI<uri>\fP
-The URI of a web page to periodically request when connectivity is being checked.
-This page should return the header "X-NetworkManager-Status" with a value of
-"online".  Alternatively, it's body content should be set to "NetworkManager
-is online".  The body content check can be controlled by the \fIresponse\fP
-option.  If this option is blank or missing, connectivity checking is disabled.
-.TP
-.B interval=\fI<seconds>\fP
-Controls how often connectivity is checked when a network connection exists. If
-set to 0 connectivity checking is disabled.  If missing, the default is 300
-seconds.
-.TP
-.B response=\fI<response>\fP
-If set controls what body content NetworkManager checks for when requesting the
-URI for connectivity checking.  If missing, defaults to "NetworkManager is online"
-.SH "SEE ALSO"
-.BR http://live.gnome.org/NetworkManager/SystemSettings
-.sp
-.BR NetworkManager (8),
-.BR nmcli (1),
-.BR nm\-tool (1),
-.BR nm\-online (1),
-.BR nm\-settings (5).
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index 3acb4de49..f56f5dafe 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -19,9 +19,9 @@
 .\" with this manual; if not, write to the Free Software Foundation, Inc.,
 .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
-.\" Copyright (C) 2010 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2014 Red Hat, Inc.
 .\"
-.TH NM-ONLINE "1" "11 July 2013"
+.TH NM-ONLINE "1" "25 March 2014"
 
 .SH NAME
 nm-online \- ask NetworkManager whether the network is connected
@@ -35,7 +35,12 @@ is a utility to find out whether we are online. It is done by asking
 NetworkManager about its status. When run, \fInm\-online\fP waits until
 NetworkManager reports an active connection, or specified timeout expires. On
 exit, the returned status code should be checked (see the return codes bellow).
-
+.P
+By default NetworkManager waits for IPv4 dynamic addressing to complete but does
+not wait for the "auto" IPv6 dynamic addressing.  To wait for IPv6 addressing to
+complete, either (1) change the network connection's IPv6 "may-fail" setting to "no",
+and/or (2) change the IPv6 addressing method to "manual" or "dhcp", to indicate that
+IPv6 connectivity is expected.
 .SH OPTIONS
 .TP
 .B \-t, \-\-timeout <timeout_value>
@@ -47,6 +52,15 @@ Exit immediately if NetworkManager is not running or connecting.
 .TP
 .B \-q, \-\-quiet
 Don't print anything.
+.TP
+.B \-s, \-\-wait-for-startup
+Wait for NetworkManager startup to complete, rather than waiting for
+network connectivity specifically. Startup is considered complete once
+NetworkManager has activated (or attempted to activate) every
+auto-activate connection which is available given the current network
+state. (This is generally only useful at boot time; after startup has
+completed, \fInm-online -s\fP will just return immediately, regardless
+of the current network state.)
 
 .SH EXIT STATUS
 
@@ -58,6 +72,5 @@ Offline or not online within given timeout
 Unspecified error
 
 .SH SEE ALSO
-.BR nm\-tool (1),
 .BR nmcli (1),
 .BR NetworkManager(8).
diff --git a/man/nm-settings.5 b/man/nm-settings.5
new file mode 100644
index 000000000..6f6aaf8e1
--- /dev/null
+++ b/man/nm-settings.5
@@ -0,0 +1,3029 @@
+'\" t
+.\"     Title: nm-settings
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03 July 2014
+.\"    Manual: Configuration
+.\"    Source: NetworkManager 0.9.10.0
+.\"  Language: English
+.\"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 0\&.9\&.10\&.0" "Configuration"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nm-settings \- Description of settings and properties of NetworkManager connection profiles
+.SH "DESCRIPTION"
+.PP
+NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only\&. These connection profiles contain a network configuration\&. When NetworkManager activates a connection profile on a network device the configuration will be applied and an active network connection will be established\&. Users are free to create as many connection profiles as they see fit\&. Thus they are flexible in having various network configurations for different networking needs\&. The connection profiles are handled by NetworkManager via
+\fIsettings service\fR
+and are exported on D\-Bus (\fI/org/freedesktop/NetworkManager/Settings/<num>\fR
+objects)\&. The conceptual objects can be described as follows:
+.PP
+Connection (profile)
+.RS 4
+A specific, encapsulated, independent group of settings describing all the configuration required to connect to a specific network\&. It is referred to by a unique identifier called the UUID\&. A connection is tied to a one specific device type, but not necessarily a specific hardware device\&. It is composed of one or more
+\fISettings\fR
+objects\&.
+.RE
+.PP
+Setting
+.RS 4
+A group of related key/value pairs describing a specific piece of a
+\fIConnection (profile)\fR\&. Settings keys and allowed values are described in the tables below\&. Keys are also reffered to as properties\&. Developers can find the setting objects and their properties in the libnm\-util sources\&. Look for the
+\fBclass_init\fR
+functions near the bottom of each setting source file\&.
+.RE
+.PP
+The settings and properties shown in tables below list all available connection configuration options\&. However, note that not all settings are applicable to all connection types\&. NetworkManager provides a command\-line tool
+\fInmcli\fR
+that allows direct configuration of the settings and properties according to a connection profile type\&.
+\fInmcli\fR
+connection editor has also a built\-in
+\fIdescribe\fR
+command that can display description of particular settings and properties of this page\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&1.\ \&802-1x setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+802\-1x
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+eap
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+The allowed EAP method to be used when authenticating to the network with 802\&.1x\&. Valid methods are: \*(Aqleap\*(Aq, \*(Aqmd5\*(Aq, \*(Aqtls\*(Aq, \*(Aqpeap\*(Aq, \*(Aqttls\*(Aq, \*(Aqpwd\*(Aq, and \*(Aqfast\*(Aq\&. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations\&.
+T}
+T{
+identity
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Identity string for EAP authentication methods\&.  Often the user\*(Aqs user or login name\&.
+T}
+T{
+anonymous\-identity
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Anonymous identity string for EAP authentication methods\&.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP\-TTLS\&.
+T}
+T{
+pac\-file
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+UTF\-8 encoded file path containing PAC for EAP\-FAST\&.
+T}
+T{
+ca\-cert
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the CA certificate if used by the EAP method specified in the \*(Aqeap\*(Aq property\&.  Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&.  When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&.  When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.  This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
+T}
+T{
+ca\-path
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \*(Aqca\-cert\*(Aq property\&.
+T}
+T{
+subject\-match
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Substring to be matched against the subject of the certificate presented by the authentication server\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&.
+T}
+T{
+altsubject\-matches
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of strings to be matched against the altSubjectName of the certificate presented by the authentication server\&. If the list is empty, no verification of the server certificate\*(Aqs altSubjectName is performed\&.
+T}
+T{
+client\-cert
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the client certificate if used by the EAP method specified in the \*(Aqeap\*(Aq property\&.  Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&.  When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&.  When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.
+T}
+T{
+phase1\-peapver
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Forces which PEAP version is used when PEAP is set as the EAP method in \*(Aqeap\*(Aq property\&.  When unset, the version reported by the server will be used\&.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version\&.  To do so, this property may be set to \*(Aq0\*(Aq or \*(Aq1\*(Aq to force that specific PEAP version\&.
+T}
+T{
+phase1\-peaplabel
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Forces use of the new PEAP label during key derivation\&.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1\&.  Set to \*(Aq1\*(Aq to force use of the new PEAP label\&.  See the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase1\-fast\-provisioning
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Enables or disables in\-line provisioning of EAP\-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property\&. Allowed values are \*(Aq0\*(Aq (disabled), \*(Aq1\*(Aq (allow unauthenticated provisioning), \*(Aq2\*(Aq (allow authenticated provisioning), and \*(Aq3\*(Aq (allow both authenticated and unauthenticated provisioning)\&.  See the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase2\-auth
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Specifies the allowed \*(Aqphase 2\*(Aq inner non\-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \*(Aqeap\*(Aq property\&. Recognized non\-EAP phase2 methods are \*(Aqpap\*(Aq, \*(Aqchap\*(Aq, \*(Aqmschap\*(Aq, \*(Aqmschapv2\*(Aq, \*(Aqgtc\*(Aq, \*(Aqotp\*(Aq, \*(Aqmd5\*(Aq, and \*(Aqtls\*(Aq\&.  Each \*(Aqphase 2\*(Aq inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase2\-autheap
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Specifies the allowed \*(Aqphase 2\*(Aq inner EAP\-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \*(Aqeap\*(Aq property\&. Recognized EAP\-based \*(Aqphase 2\*(Aq methods are \*(Aqmd5\*(Aq, \*(Aqmschapv2\*(Aq, \*(Aqotp\*(Aq, \*(Aqgtc\*(Aq, and \*(Aqtls\*(Aq\&. Each \*(Aqphase 2\*(Aq inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details\&.
+T}
+T{
+phase2\-ca\-cert
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the \*(Aqphase 2\*(Aq CA certificate if used by the EAP method specified in the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq properties\&.  Certificate data is specified using a \*(Aqscheme\*(Aq; two are currentlysupported: blob and path\&. When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&. When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.  This property can be unset even if the EAP method supports CA certificates, but this allows man\-in\-the\-middle attacks and is NOT recommended\&.
+T}
+T{
+phase2\-ca\-path
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+UTF\-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the \*(Aqphase2\-ca\-cert\*(Aq property\&.
+T}
+T{
+phase2\-subject\-match
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Substring to be matched against the subject of the certificate presented by the authentication server during the inner \*(Aqphase2\*(Aq authentication\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&.
+T}
+T{
+phase2\-altsubject\-matches
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner \*(Aqphase 2\*(Aq authentication\&. If the list is empty, no verification of the server certificate\*(Aqs altSubjectName is performed\&.
+T}
+T{
+phase2\-client\-cert
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the \*(Aqphase 2\*(Aq client certificate if used by the EAP method specified in the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq properties\&. Certificate data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&.  When using the blob scheme (which is backwards compatible with NM 0\&.7\&.x) this property should be set to the certificate\*(Aqs DER encoded data\&.  When using the path scheme, this property should be set to the full UTF\-8 encoded path of the certificate, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.
+T}
+T{
+password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+UTF\-8 encoded password used for EAP authentication methods\&.
+T}
+T{
+password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the 802\&.1x password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+password\-raw
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF\-8 to be used\&.  If both \*(Aqpassword\*(Aq and \*(Aqpassword\-raw\*(Aq are given, \*(Aqpassword\*(Aq is preferred\&.
+T}
+T{
+password\-raw\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the 802\&.1x password byte array\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+private\-key
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the private key when the \*(Aqeap\*(Aq property is set to \*(Aqtls\*(Aq\&.  Key data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \*(Aqprivate\-key\-password\*(Aq property must be set to password used to decrypt the PKCS#12 certificate and key\&.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and and ending with a terminating NULL byte, and as with the blob scheme the \*(Aqprivate\-key\-password\*(Aq property must be set to the password used to decode the PKCS#12 private key and certificate\&.
+T}
+T{
+private\-key\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The password used to decrypt the private key specified in the \*(Aqprivate\-key\*(Aq property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key\&.
+T}
+T{
+private\-key\-password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the 802\&.1x private key password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+phase2\-private\-key
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Contains the \*(Aqphase 2\*(Aq inner private key when the \*(Aqphase2\-auth\*(Aq or \*(Aqphase2\-autheap\*(Aq property is set to \*(Aqtls\*(Aq\&.  Key data is specified using a \*(Aqscheme\*(Aq; two are currently supported: blob and path\&. When using the blob scheme and private keys, this property should be set to the key\*(Aqs encrypted PEM encoded data\&. When using private keys with the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and ending with a terminating NULL byte\&.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the \*(Aqphase2\-private\-key\-password\*(Aq property must be set to password used to decrypt the PKCS#12 certificate and key\&.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF\-8 encoded path of the key, prefixed with the string \*(Aqfile://\*(Aq and and ending with a terminating NULL byte, and as with the blob scheme the \*(Aqphase2\-private\-key\-password\*(Aq property must be set to the password used to decode the PKCS#12 private key and certificate\&.
+T}
+T{
+phase2\-private\-key\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The password used to decrypt the \*(Aqphase 2\*(Aq private key specified in the \*(Aqprivate\-key\*(Aq property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key\&.
+T}
+T{
+phase2\-private\-key\-password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the 802\&.1x phase2 private key password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+pin
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+PIN used for EAP authentication methods\&.
+T}
+T{
+pin\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the 802\&.1x PIN\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+system\-ca\-certs
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When TRUE, overrides \*(Aqca\-path\*(Aq and \*(Aqphase2\-ca\-path\*(Aq properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the \*(Aqca\-cert\*(Aq and \*(Aqphase2\-ca\-cert\*(Aq properties\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&2.\ \&adsl setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+adsl
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+username
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Username used to authenticate with the pppoa service\&.
+T}
+T{
+password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Password used to authenticate with the pppoa service\&.
+T}
+T{
+password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the ADSL password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+protocol
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+ADSL connection protocol\&.
+T}
+T{
+encapsulation
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Encapsulation of ADSL connection
+T}
+T{
+vpi
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+VPI of ADSL connection
+T}
+T{
+vci
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+VCI of ADSL connection
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&3.\ \&bluetooth setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+bluetooth
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+bdaddr
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+The Bluetooth address of the device
+T}
+T{
+type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Either \*(Aqdun\*(Aq for Dial\-Up Networking connections or \*(Aqpanu\*(Aq for Personal Area Networking connections\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&4.\ \&bond setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+bond
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The name of the virtual in\-kernel bonding network interface
+T}
+T{
+options
+T}:T{
+dict of (string::string)
+T}:T{
+\ \&
+T}:T{
+Dictionary of key/value pairs of bonding options\&.  Both keys and values must be strings\&.  Option names must contain only alphanumeric characters (ie, [a\-zA\-Z0\-9])\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&5.\ \&bridge setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+bridge
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The name of the virtual in\-kernel bridging network interface
+T}
+T{
+mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+The MAC address of the bridge
+T}
+T{
+stp
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&.
+T}
+T{
+priority
+T}:T{
+uint32
+T}:T{
+32768
+T}:T{
+Sets the Spanning Tree Protocol (STP) priority for this bridge\&.  Lower values are \*(Aqbetter\*(Aq; the lowest priority bridge will be elected the root bridge\&.
+T}
+T{
+forward\-delay
+T}:T{
+uint32
+T}:T{
+15
+T}:T{
+The Spanning Tree Protocol (STP) forwarding delay, in seconds\&.
+T}
+T{
+hello\-time
+T}:T{
+uint32
+T}:T{
+2
+T}:T{
+The Spanning Tree Protocol (STP) hello time, in seconds\&.
+T}
+T{
+max\-age
+T}:T{
+uint32
+T}:T{
+20
+T}:T{
+The Spanning Tree Protocol (STP) maximum message age, in seconds\&.
+T}
+T{
+ageing\-time
+T}:T{
+uint32
+T}:T{
+300
+T}:T{
+The Ethernet MAC address aging time, in seconds\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&6.\ \&bridge-port setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+bridge\-port
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+priority
+T}:T{
+uint32
+T}:T{
+32
+T}:T{
+The Spanning Tree Protocol (STP) priority of this bridge port
+T}
+T{
+path\-cost
+T}:T{
+uint32
+T}:T{
+100
+T}:T{
+The Spanning Tree Protocol (STP) port cost for destinations via this port\&.
+T}
+T{
+hairpin\-mode
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+Enables or disabled \*(Aqhairpin mode\*(Aq for the port, which allows frames to be sent back out through the port the frame was received on\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&7.\ \&cdma setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+cdma
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+number
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Number to dial when establishing a PPP data session with the CDMA\-based mobile broadband network\&.  If not specified, the default number (#777) is used when required\&.
+T}
+T{
+username
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Username used to authenticate with the network, if required\&.  Note that many providers do not require a username or accept any username\&.
+T}
+T{
+password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Password used to authenticate with the network, if required\&.  Note that many providers do not require a password or accept any password\&.
+T}
+T{
+password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the CDMA password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&8.\ \&connection setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+connection
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+id
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+User\-readable connection identifier/name\&.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it\&.
+T}
+T{
+uuid
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Universally unique connection identifier\&.  Must be in the format \*(Aq2815492f\-7e56\-435e\-b2e9\-246bd7cdc664\*(Aq (ie, contains only hexadecimal characters and \*(Aq\-\*(Aq)\&. The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network\&.  For example, it should not be changed when the user changes the connection\*(Aqs \*(Aqid\*(Aq, but should be recreated when the Wi\-Fi SSID, mobile broadband network provider, or the connection type changes\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Interface name this connection is bound to\&. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings)\&. For connection types where interface names cannot easily be made persistent (e\&.g\&. mobile broadband or USB Ethernet), this property should not be used\&. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface\&.
+T}
+T{
+type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Base type of the connection\&.  For hardware\-dependent connections, should contain the setting name of the hardware\-type specific setting (ie, \*(Aq802\-3\-ethernet\*(Aq or \*(Aq802\-11\-wireless\*(Aq or \*(Aqbluetooth\*(Aq, etc), and for non\-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \*(Aqvpn\*(Aq or \*(Aqbridge\*(Aq, etc)\&.
+T}
+T{
+permissions
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+An array of strings defining what access a given user has to this connection\&.  If this is NULL or empty, all users are allowed to access this connection\&.  Otherwise a user is allowed to access this connection if and only if they are in this array\&. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the \*(Aquser\*(Aq [type] is allowed\&.  Any other values are ignored and reserved for future use\&.  [id] is the username that this permission refers to, which may not contain the \*(Aq:\*(Aq character\&.  Any [reserved] information (if present) must be ignored and is reserved for future use\&.  All of [type], [id], and [reserved] must be valid UTF\-8\&.
+T}
+T{
+autoconnect
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, NetworkManager will activate this connection when its network resources are available\&.  If FALSE, the connection must be manually activated by the user or some other mechanism\&.
+T}
+T{
+timestamp
+T}:T{
+uint64
+T}:T{
+0
+T}:T{
+Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated\&.  NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp\&. The property is only meant for reading (changes to this property will not be preserved)\&.
+T}
+T{
+read\-only
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the connection is read\-only and cannot be changed by the user or any other mechanism\&.  This is normally set for system connections whose plugin cannot yet write updated connections back out\&.
+T}
+T{
+zone
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The trust level of a the connection\&.Free form case\-insensitive string (for example "Home", "Work", "Public")\&.  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall\&.
+T}
+T{
+master
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Interface name of the master device or UUID of the master connection
+T}
+T{
+slave\-type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Setting name describing the type of slave this connection is (ie, \*(Aqbond\*(Aq) or NULL if this connection is not a slave\&.
+T}
+T{
+secondaries
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of connection UUIDs that should be activated when the base connection itself is activated\&.  Currently only VPN connections are supported\&.
+T}
+T{
+gateway\-ping\-timeout
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&9.\ \&dcb setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+dcb
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+app\-fcoe\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies the flags for the DCB FCoE application\&. Flags may be any combination of 0x1 (enable), 0x2 (advertise), and 0x4 (willing)\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+app\-fcoe\-priority
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+The highest User Priority (0 \- 7) which FCoE frames should use, or \-1 for default priority\&. Only used when the \*(Aqapp\-fcoe\-flags\*(Aq property includes the \*(Aqenabled\*(Aq flag\&.
+T}
+T{
+app\-fcoe\-mode
+T}:T{
+string
+T}:T{
+"fabric"
+T}:T{
+The FCoe controller mode; either \*(Aqfabric\*(Aq (default) or \*(Aqvn2vn\*(Aq\&.
+T}
+T{
+app\-iscsi\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies the flags for the DCB iSCSI application\&. Flags may be any combination of 0x1 (enable), 0x2 (advertise), and 0x4 (willing)\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+app\-iscsi\-priority
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+The highest User Priority (0 \- 7) which iSCSI frames should use, or \-1 for default priority\&. Only used when the \*(Aqapp\-iscsi\-flags\*(Aq property includes the \*(Aqenabled\*(Aq flag\&.
+T}
+T{
+app\-fip\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies the flags for the DCB FIP application\&. Flags may be any combination of 0x1 (enable), 0x2 (advertise), and 0x4 (willing)\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+app\-fip\-priority
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+The highest User Priority (0 \- 7) which FIP frames should use, or \-1 for default priority\&. Only used when the \*(Aqapp\-fip\-flags\*(Aq property includes the \*(Aqenabled\*(Aq flag\&.
+T}
+T{
+priority\-flow\-control\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies the flags for DCB Priority Flow Control\&. Flags may be any combination of 0x1 (enable), 0x2 (advertise), and 0x4 (willing)\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+priority\-flow\-control
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the User Priority (0 \- 7) and the value indicates whether or not the corresponding priority should transmit priority pause\&.  Allowed values are 0 (do not transmit pause) and 1 (transmit pause)\&.
+T}
+T{
+priority\-group\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Specifies the flags for DCB Priority Groups\&. Flags may be any combination of 0x1 (enable), 0x2 (advertise), and 0x4 (willing)\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+priority\-group\-id
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the User Priority (0 \- 7) and the value indicates the Priority Group ID\&. Allowed Priority Group ID values are 0 \- 7 or 15 for the unrestricted group\&.
+T}
+T{
+priority\-group\-bandwidth
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the Priority Group ID (0 \- 7) and the value indicates the percentage of link bandwidth allocated to that group\&.  Allowed values are 0 \- 100, and the sum of all values must total 100 percent\&.
+T}
+T{
+priority\-bandwidth
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the User Priority (0 \- 7) and the value indicates the percentage of bandwidth of the priority\*(Aqs assigned group that the priority may use\&.  The sum of all percentages for priorities which belong to the same group must total 100 percent\&.
+T}
+T{
+priority\-strict\-bandwidth
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the User Priority (0 \- 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group\&. Allowed values are 0 (the priority may not utilize all bandwidth) or 1 (the priority may utilize all bandwidth)\&.
+T}
+T{
+priority\-traffic\-class
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+An array of 8 uint values, where the array index corresponds to the User Priority (0 \- 7) and the value indicates the traffic class (0 \- 7) to which the priority is mapped\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&10.\ \&gsm setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+gsm
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+number
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Number to dial when establishing a PPP data session with the GSM\-based mobile broadband network\&.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically\&.
+T}
+T{
+username
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Username used to authenticate with the network, if required\&.  Note that many providers do not require a username or accept any username\&.
+T}
+T{
+password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Password used to authenticate with the network, if required\&.  Note that many providers do not require a password or accept any password\&.
+T}
+T{
+password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the GSM password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+apn
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM\-based network\&.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider\-specific walled\-garden, so it is important to use the correct APN for the user\*(Aqs mobile broadband plan\&.  The APN may only be composed of the characters a\-z, 0\-9, \&., and \- per GSM 03\&.60 Section 14\&.9\&.
+T}
+T{
+network\-id
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The Network ID (GSM LAI format, ie MCC\-MNC) to force specific network registration\&.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network\&.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible\&.
+T}
+T{
+network\-type
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+Network preference to force the device to only use specific network technologies\&.  The permitted values are: \-1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only\&. Notes: This property is deprecated and NetworkManager from 0\&.9\&.10 onwards doesn\*(Aqt use this property when talking to ModemManager\&.Also, not all devices allow network preference control\&.
+T}
+T{
+pin
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If the SIM is locked with a PIN it must be unlocked before any other operations are requested\&.  Specify the PIN here to allow operation of the device\&.
+T}
+T{
+pin\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the GSM SIM PIN\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+allowed\-bands
+T}:T{
+uint32
+T}:T{
+1
+T}:T{
+Bitfield of allowed frequency bands\&.Notes: This property is deprecated and NetworkManager from 0\&.9\&.10 onwards doesn\*(Aqt use this property when talking to ModemManager\&.Also, not all devices allow frequency band control\&.
+T}
+T{
+home\-only
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When TRUE, only connections to the home network will be allowed\&.  Connections to roaming networks will not be made\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&11.\ \&infiniband setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+infiniband
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches\&.  This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&.
+T}
+T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames\&.
+T}
+T{
+transport\-mode
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The IPoIB transport mode\&. Either \*(Aqdatagram\*(Aq or \*(Aqconnected\*(Aq\&.
+T}
+T{
+p\-key
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+The InfiniBand P_Key\&. Either \-1 for the default, or a 16\-bit unsigned integer\&.
+T}
+T{
+parent
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The interface name of the parent device, or NULL
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&12.\ \&ipv4 setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+ipv4
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+method
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+IPv4 configuration method\&.  If \*(Aqauto\*(Aq is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset\&.  If \*(Aqlink\-local\*(Aq is specified, then a link\-local address in the 169\&.254/16 range will be assigned to the interface\&.  If \*(Aqmanual\*(Aq is specified, static IP addressing is used and at least one IP address must be given in the \*(Aqaddresses\*(Aq property\&.  If \*(Aqshared\*(Aq is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10\&.42\&.x\&.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT\-ed to the current default network connection\&.  \*(Aqdisabled\*(Aq means IPv4 will not be used on this connection\&.  This property must be set\&.
+T}
+T{
+dns
+T}:T{
+array of uint32
+T}:T{
+\ \&
+T}:T{
+List of DNS servers (network byte order)\&. For the \*(Aqauto\*(Aq method, these DNS servers are appended to those (if any) returned by automatic configuration\&.  DNS servers cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as there is no upstream network\&.  In all other methods, these DNS servers are used as the only DNS servers for this connection\&.
+T}
+T{
+dns\-search
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of DNS search domains\&.  For the \*(Aqauto\*(Aq method, these search domains are appended to those returned by automatic configuration\&. Search domains cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as there is no upstream network\&.  In all other methods, these search domains are used as the only search domains for this connection\&.
+T}
+T{
+addresses
+T}:T{
+array of array of uint32
+T}:T{
+\ \&
+T}:T{
+Array of IPv4 address structures\&.  Each IPv4 address structure is composed of 3 32\-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 \- 32), and last the IPv4 gateway (network byte order)\&. The gateway may be left as 0 if no gateway exists for that subnet\&.  For the \*(Aqauto\*(Aq method, given IP addresses are appended to those returned by automatic configuration\&.  Addresses cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as addressing is either automatic or disabled with these methods\&.
+T}
+T{
+address\-labels
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+Internal use only
+T}
+T{
+routes
+T}:T{
+array of array of uint32
+T}:T{
+\ \&
+T}:T{
+Array of IPv4 route structures\&.  Each IPv4 route structure is composed of 4 32\-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 \- 32), the third being the next\-hop (network byte order) if any, and the fourth being the route metric\&. For the \*(Aqauto\*(Aq method, given IP routes are appended to those returned by automatic configuration\&.  Routes cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq, methods as there is no upstream network\&.
+T}
+T{
+ignore\-auto\-routes
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When the method is set to \*(Aqauto\*(Aq and this property to TRUE, automatically configured routes are ignored and only routes specified in the \*(Aqroutes\*(Aq property, if any, are used\&.
+T}
+T{
+ignore\-auto\-dns
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When the method is set to \*(Aqauto\*(Aq and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \*(Aqdns\*(Aq and \*(Aqdns\-search\*(Aq properties, if any, are used\&.
+T}
+T{
+dhcp\-client\-id
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&.
+T}
+T{
+dhcp\-send\-hostname
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, a hostname is sent to the DHCP server when acquiring a lease\&.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer\&.  If the \*(Aqdhcp\-hostname\*(Aq property is empty and this property is TRUE, the current persistent hostname of the computer is sent\&.
+T}
+T{
+dhcp\-hostname
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If the \*(Aqdhcp\-send\-hostname\*(Aq property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease\&.
+T}
+T{
+never\-default
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager\&.
+T}
+T{
+may\-fail
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out\&. Note that at least one IP configuration must succeed or overall network configuration will still fail\&.  For example, in IPv6\-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&13.\ \&ipv6 setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+ipv6
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+method
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+IPv6 configuration method\&.  If \*(Aqauto\*(Aq is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset\&.  To force the use of DHCP only, specify \*(Aqdhcp\*(Aq; this method is only valid for Ethernet\-based hardware\&.  If \*(Aqlink\-local\*(Aq is specified, then an IPv6 link\-local address will be assigned to the interface\&.  If \*(Aqmanual\*(Aq is specified, static IP addressing is used and at least one IP address must be given in  the \*(Aqaddresses\*(Aq property\&.  If \*(Aqignore\*(Aq is specified, IPv6 configuration is not done\&. This property must be set\&.  Note: the \*(Aqshared\*(Aq method is not yet supported\&.
+T}
+T{
+dhcp\-hostname
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The specified name will be sent to the DHCP server when acquiring a lease\&.
+T}
+T{
+dns
+T}:T{
+array of byte array
+T}:T{
+\ \&
+T}:T{
+Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order)\&. For the \*(Aqauto\*(Aq method, these DNS servers are appended to those (if any) returned by automatic configuration\&.  DNS servers cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as there is no usptream network\&.  In all other methods, these DNS servers are used as the only DNS servers for this connection\&.
+T}
+T{
+dns\-search
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of DNS search domains\&.  For the \*(Aqauto\*(Aq method, these search domains are appended to those returned by automatic configuration\&. Search domains cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as there is no upstream network\&.  In all other methods, these search domains are used as the only search domains for this connection\&.
+T}
+T{
+addresses
+T}:T{
+array of (byte array, uint32, byte array)
+T}:T{
+\ \&
+T}:T{
+Array of IPv6 address structures\&.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32\-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any\&. If no gateway is given, the third element should be given as all zeros\&.  For the \*(Aqauto\*(Aq method, given IP addresses are appended to those returned by automatic configuration\&.  Addresses cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods as the interface is automatically assigned an address with these methods\&.
+T}
+T{
+routes
+T}:T{
+array of (byte array, uint32, byte array, uint32)
+T}:T{
+\ \&
+T}:T{
+Array of IPv6 route structures\&.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next\-hop IPv6 address (network byte order) if any, and the fourth being the route metric\&. For the \*(Aqauto\*(Aq method, given IP routes are appended to those returned by automatic configuration\&.  Routes cannot be used with the \*(Aqshared\*(Aq or \*(Aqlink\-local\*(Aq methods because there is no upstream network\&.
+T}
+T{
+ignore\-auto\-routes
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When the method is set to \*(Aqauto\*(Aq or \*(Aqdhcp\*(Aq and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the \*(Aqroutes\*(Aq property, if any, are used\&.
+T}
+T{
+ignore\-auto\-dns
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+When the method is set to \*(Aqauto\*(Aq or \*(Aqdhcp\*(Aq and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \*(Aqdns\*(Aq and \*(Aqdns\-search\*(Aq properties, if any, are used\&.
+T}
+T{
+never\-default
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager\&.
+T}
+T{
+may\-fail
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out\&. Note that at least one IP configuration must succeed or overall network configuration will still fail\&.  For example, in IPv4\-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully\&.
+T}
+T{
+ip6\-privacy
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941\&.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI\-64\&.  This enhances privacy, but could cause problems in some applications, on the other hand\&.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses)\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&14.\ \&802-11-olpc-mesh setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+802\-11\-olpc\-mesh
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+ssid
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+SSID of the mesh network to join\&.
+T}
+T{
+channel
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Channel on which the mesh network to join is located\&.
+T}
+T{
+dhcp\-anycast\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+Anycast DHCP MAC address used when requesting an IP address via DHCP\&.  The specific anycast address used determines which DHCP server class answers the the request\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&15.\ \&ppp setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+ppp
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+noauth
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client\&.  If FALSE, require authentication from the remote side\&.  In almost all cases, this should be TRUE\&.
+T}
+T{
+refuse\-eap
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the EAP authentication method will not be used\&.
+T}
+T{
+refuse\-pap
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the PAP authentication method will not be used\&.
+T}
+T{
+refuse\-chap
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the CHAP authentication method will not be used\&.
+T}
+T{
+refuse\-mschap
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the MSCHAP authentication method will not be used\&.
+T}
+T{
+refuse\-mschapv2
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, the MSCHAPv2 authentication method will not be used\&.
+T}
+T{
+nobsdcomp
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, BSD compression will not be requested\&.
+T}
+T{
+nodeflate
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, \*(Aqdeflate\*(Aq compression will not be requested\&.
+T}
+T{
+no\-vj\-comp
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, Van Jacobsen TCP header compression will not be requested\&.
+T}
+T{
+require\-mppe
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, MPPE (Microsoft Point\-to\-Point Encrpytion) will be required for the PPP session\&.  If either 64\-bit or 128\-bit MPPE is not available the session will fail\&.  Note that MPPE is not used on mobile broadband connections\&.
+T}
+T{
+require\-mppe\-128
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, 128\-bit MPPE (Microsoft Point\-to\-Point Encrpytion) will be required for the PPP session, and the \*(Aqrequire\-mppe\*(Aq property must also be set to TRUE\&.  If 128\-bit MPPE is not available the session will fail\&.
+T}
+T{
+mppe\-stateful
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, stateful MPPE is used\&.  See pppd documentation for more information on stateful MPPE\&.
+T}
+T{
+crtscts
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals\&.  This value should normally be set to FALSE\&.
+T}
+T{
+baud
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, instruct pppd to set the serial port to the specified baudrate\&.  This value should normally be left as 0 to automatically choose the speed\&.
+T}
+T{
+mru
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, instruct pppd to request that the peer send packets no larger than the specified size\&.  If non\-zero, the MRU should be between 128 and 16384\&.
+T}
+T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, instruct pppd to send packets no larger than the specified size\&.
+T}
+T{
+lcp\-echo\-failure
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo\-requests go unanswered by the peer\&.  The \*(Aqlcp\-echo\-interval\*(Aq property must also be set to a non\-zero value if this property is used\&.
+T}
+T{
+lcp\-echo\-interval
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, instruct pppd to send an LCP echo\-request frame to the peer every n seconds (where n is the specified value)\&.  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&16.\ \&pppoe setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+pppoe
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+service
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified service\&.  For most providers, this should be left blank\&.  It is only required if there are multiple access concentrators or a specific service is known to be required\&.
+T}
+T{
+username
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Username used to authenticate with the PPPoE service\&.
+T}
+T{
+password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Password used to authenticate with the PPPoE service\&.
+T}
+T{
+password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the PPPoE password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&17.\ \&serial setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+serial
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+baud
+T}:T{
+uint32
+T}:T{
+57600
+T}:T{
+Speed to use for communication over the serial port\&.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed\&.
+T}
+T{
+bits
+T}:T{
+uint32
+T}:T{
+8
+T}:T{
+Byte\-width of the serial communication\&.  The 8 in \*(Aq8n1\*(Aq for example\&.
+T}
+T{
+parity
+T}:T{
+gchar
+T}:T{
+110
+T}:T{
+Parity setting of the serial port\&.  Either \*(AqE\*(Aq for even parity, \*(Aqo\*(Aq for odd parity, or \*(Aqn\*(Aq for no parity\&.
+T}
+T{
+stopbits
+T}:T{
+uint32
+T}:T{
+1
+T}:T{
+Number of stop bits for communication on the serial port\&.  Either 1 or 2\&.  The 1 in \*(Aq8n1\*(Aq for example\&.
+T}
+T{
+send\-delay
+T}:T{
+uint64
+T}:T{
+0
+T}:T{
+Time to delay between each byte sent to the modem, in microseconds\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&18.\ \&team setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+team
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The name of the virtual in\-kernel team network interface
+T}
+T{
+config
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+JSON configuration for the team network interface\&. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd\&. If not specified, the default configuration is used\&. See man teamd\&.conf for the format details\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&19.\ \&team-port setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+team\-port
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+config
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+JSON configuration for the team port\&. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd\&. If not specified, the dafault configuration is used\&. See man teamd\&.conf for the format details\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&20.\ \&vlan setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+vlan
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+interface\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If given, specifies the kernel name of the VLAN interface\&. If not given, a default name will be constructed from the interface described by the parent interface and the \*(Aqid\*(Aq property, ex \*(Aqeth2\&.1\*(Aq\&. The parent interface may be given by the \*(Aqparent\*(Aq property or by the \*(Aqmac\-address\*(Aq property of a \*(Aqwired\*(Aq setting\&.
+T}
+T{
+parent
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created\&.  If this property is not specified, the connection must contain a \*(Aqwired\*(Aq setting with a \*(Aqmac\-address\*(Aq property\&.
+T}
+T{
+id
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+The VLAN indentifier the interface created by this connection should be assigned\&.
+T}
+T{
+flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+One or more flags which control the behavior and features of the VLAN interface\&.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device\*(Aqs operating state (0x04)\&.
+T}
+T{
+ingress\-priority\-map
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+For incoming packets, a list of mappings from 802\&.1p priorities to Linux SKB priorities\&.  The mapping is given in the format \*(Aqfrom:to\*(Aq where both \*(Aqfrom\*(Aq and \*(Aqto\*(Aq are unsigned integers, ie \*(Aq7:3\*(Aq\&.
+T}
+T{
+egress\-priority\-map
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+For outgoing packets, a list of mappings from Linux SKB priorities to 802\&.1p priorities\&.  The mapping is given in the format \*(Aqfrom:to\*(Aq where both \*(Aqfrom\*(Aq and \*(Aqto\*(Aq are unsigned integers, ie \*(Aq7:3\*(Aq\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&21.\ \&vpn setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+vpn
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+service\-type
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+D\-Bus service name of the VPN plugin that this setting uses to connect to its network\&.  i\&.e\&. org\&.freedesktop\&.NetworkManager\&.vpnc for the vpnc plugin\&.
+T}
+T{
+user\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If the VPN connection requires a user name for authentication, that name should be provided here\&.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty\&.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection\&.
+T}
+T{
+data
+T}:T{
+dict of (string::string)
+T}:T{
+\ \&
+T}:T{
+Dictionary of key/value pairs of VPN plugin specific data\&.  Both keys and values must be strings\&.
+T}
+T{
+secrets
+T}:T{
+dict of (string::string)
+T}:T{
+\ \&
+T}:T{
+Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys\&.  Both keys and values must be strings\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&22.\ \&wimax setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+wimax
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+network\-name
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Network Service Provider (NSP) name of the WiMAX network this connection should use\&.
+T}
+T{
+mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, this connection will only apply to the WiMAX device whose MAC address matches\&.  This property does not change the MAC address of the device (known as MAC spoofing)\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&23.\ \&802-3-ethernet setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+802\-3\-ethernet
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+port
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Specific port type to use if multiple the device supports multiple attachment methods\&.  One of \*(Aqtp\*(Aq (Twisted Pair), \*(Aqaui\*(Aq (Attachment Unit Interface), \*(Aqbnc\*(Aq (Thin Ethernet) or \*(Aqmii\*(Aq (Media Independent Interface\&.  If the device supports only one port type, this setting is ignored\&.
+T}
+T{
+speed
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, request that the device use only the specified speed\&.  In Mbit/s, ie 100 == 100Mbit/s\&.
+T}
+T{
+duplex
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If specified, request that the device only use the specified duplex mode\&.  Either \*(Aqhalf\*(Aq or \*(Aqfull\*(Aq\&.
+T}
+T{
+auto\-negotiate
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+If TRUE, allow auto\-negotiation of port speed and duplex mode\&.  If FALSE, do not allow auto\-negotiation,in which case the \*(Aqspeed\*(Aq and \*(Aqduplex\*(Aq properties should be set\&.
+T}
+T{
+mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches\&.  This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&.
+T}
+T{
+cloned\-mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, request that the device use this MAC address instead of its permanent MAC address\&.  This is known as MAC cloning or spoofing\&.
+T}
+T{
+mac\-address\-blacklist
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list\&.  Each MAC address is in the standard hex\-digits\-and\-colons notation (00:11:22:33:44:55)\&.
+T}
+T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames\&.
+T}
+T{
+s390\-subchannels
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host\&.  Like the \*(Aqmac\-address\*(Aq property for non\-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels\&. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (\&.) character\&.
+T}
+T{
+s390\-nettype
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+s390 network device type; one of \*(Aqqeth\*(Aq, \*(Aqlcs\*(Aq, or \*(Aqctc\*(Aq, representing the different types of virtual network devices available on s390 systems\&.
+T}
+T{
+s390\-options
+T}:T{
+dict of (string::string)
+T}:T{
+\ \&
+T}:T{
+Dictionary of key/value pairs of s390\-specific device options\&.  Both keys and values must be strings\&.  Allowed keys include \*(Aqportno\*(Aq, \*(Aqlayer2\*(Aq, \*(Aqportname\*(Aq, \*(Aqprotocol\*(Aq, among others\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&24.\ \&802-11-wireless setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+802\-11\-wireless
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+ssid
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+SSID of the Wi\-Fi network\&.  Must be specified\&.
+T}
+T{
+mode
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Wi\-Fi network mode; one of \*(Aqinfrastructure\*(Aq, \*(Aqadhoc\*(Aq or \*(Aqap\*(Aq\&.  If blank, infrastructure is assumed\&.
+T}
+T{
+band
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+802\&.11 frequency band of the network\&.  One of \*(Aqa\*(Aq for 5GHz 802\&.11a or \*(Aqbg\*(Aq for 2\&.4GHz 802\&.11\&.  This will lock associations to the Wi\-Fi network to the specific band, i\&.e\&. if \*(Aqa\*(Aq is specified, the device will not associate with the same network in the 2\&.4GHz band even if the network\*(Aqs settings are compatible\&.  This setting depends on specific driver capability and may not work with all drivers\&.
+T}
+T{
+channel
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Wireless channel to use for the Wi\-Fi connection\&.  The device will only join (or create for Ad\-Hoc networks) a Wi\-Fi network on the specified channel\&.  Because channel numbers overlap between bands, this property also requires the \*(Aqband\*(Aq property to be set\&.
+T}
+T{
+bssid
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, directs the device to only associate with the given access point\&.  This capability is highly driver dependent and not supported by all devices\&.  Note: this property does not control the BSSID used when creating an Ad\-Hoc network and is unlikely to in the future\&.
+T}
+T{
+rate
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, directs the device to only use the specified bitrate for communication with the access point\&.  Units are in Kb/s, ie 5500 = 5\&.5 Mbit/s\&.  This property is highly driver dependent and not all devices support setting a static bitrate\&.
+T}
+T{
+tx\-power
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, directs the device to use the specified transmit power\&.  Units are dBm\&.  This property is highly driver dependent and not all devices support setting a static transmit power\&.
+T}
+T{
+mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, this connection will only apply to the Wi\-Fi device whose permanent MAC address matches\&.  This property does not change the MAC address of the device (i\&.e\&. MAC spoofing)\&.
+T}
+T{
+cloned\-mac\-address
+T}:T{
+byte array
+T}:T{
+[]
+T}:T{
+If specified, request that the Wi\-Fi device use this MAC address instead of its permanent MAC address\&.  This is known as MAC cloning or spoofing\&.
+T}
+T{
+mac\-address\-blacklist
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+A list of permanent MAC addresses of Wi\-Fi devices to which this connection should never apply\&.  Each MAC address should be given in the standard hex\-digits\-and\-colons notation (eg \*(Aq00:11:22:33:44:55\*(Aq)\&.
+T}
+T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames\&.
+T}
+T{
+seen\-bssids
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55\*(Aq) that have been detected as part of the Wi\-Fi network\&. NetworkManager internally tracks previously seen BSSIDs\&. The property is only meant for reading and reflects the BSSID list of NetworkManager\&. The changes you make to this property will not be preserved\&.
+T}
+T{
+security
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+If the wireless connection has any security restrictions, like 802\&.1x, WEP, or WPA, set this property to \*(Aq802\-11\-wireless\-security\*(Aq and ensure the connection contains a valid 802\-11\-wireless\-security setting\&.
+T}
+T{
+hidden
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+If TRUE, indicates this network is a non\-broadcasting network that hides its SSID\&.  In this case various workarounds may take place, such as probe\-scanning the SSID for more reliable network discovery\&.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&25.\ \&802-11-wireless-security setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+name
+T}:T{
+string
+T}:T{
+802\-11\-wireless\-security
+T}:T{
+The setting\*(Aqs name; these names are defined by the specification and cannot be changed after the object has been created\&.  Each setting class has a name, and all objects of that class share the same name\&.
+T}
+T{
+key\-mgmt
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Key management used for the connection\&.  One of \*(Aqnone\*(Aq (WEP), \*(Aqieee8021x\*(Aq (Dynamic WEP), \*(Aqwpa\-none\*(Aq (WPA\-PSK Ad\-Hoc), \*(Aqwpa\-psk\*(Aq (infrastructure WPA\-PSK), or \*(Aqwpa\-eap\*(Aq (WPA\-Enterprise)\&.  This property must be set for any Wi\-Fi connection that uses security\&.
+T}
+T{
+wep\-tx\-keyidx
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+When static WEP is used (ie, key\-mgmt = \*(Aqnone\*(Aq) and a non\-default WEP key index is used by the AP, put that WEP key index here\&.  Valid values are 0 (default key) through 3\&.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 \- 4\&.
+T}
+T{
+auth\-alg
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+When WEP is used (ie, key\-mgmt = \*(Aqnone\*(Aq or \*(Aqieee8021x\*(Aq) indicate the 802\&.11 authentication algorithm required by the AP here\&.  One of \*(Aqopen\*(Aq for Open System, \*(Aqshared\*(Aq for Shared Key, or \*(Aqleap\*(Aq for Cisco LEAP\&.  When using Cisco LEAP (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq) the \*(Aqleap\-username\*(Aq and \*(Aqleap\-password\*(Aq properties must be specified\&.
+T}
+T{
+proto
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+List of strings specifying the allowed WPA protocol versions to use\&.  Each element may be one \*(Aqwpa\*(Aq (allow WPA) or \*(Aqrsn\*(Aq (allow WPA2/RSN)\&.  If not specified, both WPA and RSN connections are allowed\&.
+T}
+T{
+pairwise
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+A list of pairwise encryption algorithms which prevents connections to Wi\-Fi networks that do not utilize one of the algorithms in the list\&. For maximum compatibility leave this property empty\&.  Each list element may be one of \*(Aqtkip\*(Aq or \*(Aqccmp\*(Aq\&.
+T}
+T{
+group
+T}:T{
+array of string
+T}:T{
+\ \&
+T}:T{
+A list of group/broadcast encryption algorithms which prevents connections to Wi\-Fi networks that do not utilize one of the algorithms in the list\&.  For maximum compatibility leave this property empty\&.  Each list element may be one  of \*(Aqwep40\*(Aq, \*(Aqwep104\*(Aq, \*(Aqtkip\*(Aq, or \*(Aqccmp\*(Aq\&.
+T}
+T{
+leap\-username
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The login username for legacy LEAP connections (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq)\&.
+T}
+T{
+wep\-key0
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Index 0 WEP key\&.  This is the WEP key used in most networks\&.  See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&.
+T}
+T{
+wep\-key1
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Index 1 WEP key\&.  This WEP index is not used by most networks\&.  See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&.
+T}
+T{
+wep\-key2
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Index 2 WEP key\&.  This WEP index is not used by most networks\&.  See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&.
+T}
+T{
+wep\-key3
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Index 3 WEP key\&.  This WEP index is not used by most networks\&.  See the \*(Aqwep\-key\-type\*(Aq property for a description of how this key is interpreted\&.
+T}
+T{
+wep\-key\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the WEP keys\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+wep\-key\-type
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Controls the interpretation of WEP keys\&.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases)\&.  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length\&.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length\&.  If set to 2, the passphrase is hashed using  the de\-facto MD5 method to derive the actual WEP key\&.
+T}
+T{
+psk
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Pre\-Shared\-Key for WPA networks\&.  If the key is 64\-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key\&.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802\&.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA\-PSK used when connecting to the Wi\-Fi network\&.
+T}
+T{
+psk\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the WPA PSK key\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+T{
+leap\-password
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The login password for legacy LEAP connections (ie, key\-mgmt = \*(Aqieee8021x\*(Aq and auth\-alg = \*(Aqleap\*(Aq)\&.
+T}
+T{
+leap\-password\-flags
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating how to handle the LEAP password\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+.TE
+.sp 1
+.SS "Secret flag types:"
+.PP
+Each secret property in a setting has an associated
+\fIflags\fR
+property that describes how to handle that secret\&. The
+\fIflags\fR
+property is a bitfield that contains zero or more of the following values logically OR\-ed together\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+0x0 (none) \- the system is responsible for providing and storing this secret\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+0x1 (agent\-owned) \- a user\-session secret agent is responsible for providing and storing this secret; when it is required, agents will be asked to provide it\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+0x2 (not\-saved) \- this secret should not be saved but should be requested from the user each time it is required\&. This flag should be used for One\-Time\-Pad secrets, PIN codes from hardware tokens, or if the user simply does not want to save the secret\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+0x4 (not\-required) \- in some situations it cannot be automatically determined that a secret is required or not\&. This flag hints that the secret is not required and should not be requested from the user\&.
+.RE
+.SH "AUTHOR"
+.PP
+NetworkManager developers
+.SH "FILES"
+.PP
+/etc/NetworkManager/system\-connections
+.PP
+or distro plugin\-specific location
+.SH "SEE ALSO"
+.PP
+https://live\&.gnome\&.org/NetworkManagerConfiguration
+.PP
+NetworkManager(8), nmcli(1), nmcli\-examples(5), NetworkManager\&.conf(5)
diff --git a/man/nm-system-settings.conf.5.in b/man/nm-system-settings.conf.5.in
index e48d0c8e6..172db1125 100644
--- a/man/nm-system-settings.conf.5.in
+++ b/man/nm-system-settings.conf.5.in
@@ -22,5 +22,4 @@ file <SYSCONFDIR>\fP/NetworkManager/NetworkManager.conf\fP instead, falling back
 to nm\-system\-settings.conf if NetworkManager.conf does not exist.
 .SH "SEE ALSO"
 .BR NetworkManager (8),
-.BR NetworkManager.conf (5),
-.BR nm\-tool (1).
+.BR NetworkManager.conf (5).
diff --git a/man/nm-tool.1.in b/man/nm-tool.1.in
deleted file mode 100644
index 0db23a20f..000000000
--- a/man/nm-tool.1.in
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" nm-tool(1) manual page
-.\"
-.\" Copyright (C) 2005 - 2009 Red Hat, Inc.
-.\" Copyright (C) 2005 - 2009 Novell, Inc.
-.\" Copyright (C) 2005 Robert Love
-.\"
-.TH NM-TOOL "1"
-.SH NAME
-nm-tool \- utility to report NetworkManager state and devices
-.SH SYNOPSIS
-.B nm-tool
-.SH DESCRIPTION
-The \fInm-tool\fP utility provides information about NetworkManager, device,
-and wireless networks.
-.SH SEE ALSO
-.BR NetworkManager (8),
-.BR nm\-applet (1),
-.BR nm\-connection\-editor (1).
-
diff --git a/man/nmcli-examples.5 b/man/nmcli-examples.5
new file mode 100644
index 000000000..7145d682c
--- /dev/null
+++ b/man/nmcli-examples.5
@@ -0,0 +1,676 @@
+'\" t
+.\"     Title: nmcli-examples
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 16 June 2014
+.\"    Manual: Examples
+.\"    Source: NetworkManager 0.9.10
+.\"  Language: English
+.\"
+.TH "NMCLI\-EXAMPLES" "5" "" "NetworkManager 0\&.9\&.10" "Examples"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nmcli-examples \- usage examples of nmcli
+.SH "SYNOPSIS"
+.HP \w'\fBnmcli\ \fR\fB[OPTIONS...]\fR\ 'u
+\fBnmcli \fR\fB[OPTIONS...]\fR
+.SH "DESCRIPTION"
+.PP
+\fInmcli\fR
+is a command\-line client for NetworkManager\&. It allows controlling NetworkManager and reporting its status\&. For more information please refer to
+\fBnmcli\fR(1)
+manual page\&.
+.PP
+The purpose of this manual page is to provide you with various examples and usage scenarios of
+\fInmcli\fR\&.
+.PP
+Note: this page has "work\-in\-progress" status\&.
+.SH "EXAMPLES"
+.PP
+\fBExample\ \&1.\ \&Listing available Wi-Fi APs\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli device wifi list
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+*  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
+   netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
+*  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
+   LoremCorp          Infra   1     54 Mbit/s  62      ▂▄▆_  WPA2 802\&.1X
+   Internet           Infra   6     54 Mbit/s  29      ▂___  WPA1
+   HPB110a\&.F2672A     Ad\-Hoc  6     54 Mbit/s  22      ▂___  \-\-
+   Jozinet            Infra   1     54 Mbit/s  19      ▂___  WEP
+   VOIP               Infra   1     54 Mbit/s  20      ▂___  WEP
+   MARTINA            Infra   4     54 Mbit/s  32      ▂▄__  WPA2
+   N24PU1             Infra   7     11 Mbit/s  22      ▂___  \-\-
+   alfa               Infra   1     54 Mbit/s  67      ▂▄▆_  WPA2
+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows how to list available Wi\-Fi networks (APs)\&. You can also use
+\fI\-\-fields\fR
+option for displaying different columns\&.
+\fBnmcli \-f all dev wifi list\fR
+will show all of them\&.
+.PP
+\fBExample\ \&2.\ \&Showing general information and properties for a Wi-Fi interface\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli \-p \-f general,wifi\-properties device show wlan0
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL\&.DEVICE:                         wlan0
+GENERAL\&.TYPE:                           wifi
+GENERAL\&.VENDOR:                         Intel Corporation
+GENERAL\&.PRODUCT:                        PRO/Wireless 5100 AGN [Shiloh] Network Connection
+GENERAL\&.DRIVER:                         iwlwifi
+GENERAL\&.DRIVER\-VERSION:                 3\&.8\&.13\-100\&.fc17\&.x86_64
+GENERAL\&.FIRMWARE\-VERSION:               8\&.83\&.5\&.1 build 33692
+GENERAL\&.HWADDR:                         00:1E:65:37:A1:D3
+GENERAL\&.MTU:                            1500
+GENERAL\&.STATE:                          100 (connected)
+GENERAL\&.REASON:                         0 (No reason given)
+GENERAL\&.UDI:                            /sys/devices/pci0000:00/0000:00:1c\&.1/0000:03:00\&.0/net/wlan0
+GENERAL\&.IP\-IFACE:                       wlan0
+GENERAL\&.NM\-MANAGED:                     yes
+GENERAL\&.AUTOCONNECT:                    yes
+GENERAL\&.FIRMWARE\-MISSING:               no
+GENERAL\&.CONNECTION:                     My Alfa WiFi
+GENERAL\&.CON\-UUID:                       85194f4c\-d496\-4eec\-bae0\-d880b4cbcf26
+GENERAL\&.CON\-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/10
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+WIFI\-PROPERTIES\&.WEP:                    yes
+WIFI\-PROPERTIES\&.WPA:                    yes
+WIFI\-PROPERTIES\&.WPA2:                   yes
+WIFI\-PROPERTIES\&.TKIP:                   yes
+WIFI\-PROPERTIES\&.CCMP:                   yes
+WIFI\-PROPERTIES\&.AP:                     no
+WIFI\-PROPERTIES\&.ADHOC:                  yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows information about a Wi\-Fi device\&.
+.PP
+\fBExample\ \&3.\ \&Listing NetworkManager polkit permissions\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli general permissions
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+PERMISSION                                                VALUE
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-network     yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wifi        yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wwan        yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wimax       yes
+org\&.freedesktop\&.NetworkManager\&.sleep\-wake                 no
+org\&.freedesktop\&.NetworkManager\&.network\-control            yes
+org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.protected       yes
+org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.open            yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.system     yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.own        yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.hostname   auth
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows configured polkit permissions for various NetworkManager operations\&. These permissions or actions (using polkit language) are configured by a system administrator and are not meant to be changed by users\&. The usual place for the polkit configuration is /usr/share/polkit\-1/actions/org\&.freedesktop\&.NetworkManager\&.policy\&.
+\fIpkaction\fR
+command can display description for polkit actions\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+      pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+More information about polkit can be found at http://www\&.freedesktop\&.org/wiki/Software/polkit\&.
+.PP
+\fBExample\ \&4.\ \&Listing NetworkManager log level and domains\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli general logging
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+LEVEL  DOMAINS
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows current NetworkManager logging status\&.
+.PP
+\fBExample\ \&5.\ \&Changing NetworkManager logging\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli g log level DEBUG domains CORE,ETHER,IP
+$ nmcli g log level INFO domains DEFAULT
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and IP domains\&. The second command restores the default logging state\&. Please refer to the
+\fBNetworkManager.conf\fR(5)
+manual page for available logging levels and domains\&.
+.PP
+\fBExample\ \&6.\ \&Adding a bonding master and two slave connection profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type bond ifname mybond0 mode active\-backup
+$ nmcli con add type bond\-slave ifname eth1 master mybond0
+$ nmcli con add type bond\-slave ifname eth2 master mybond0
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a bond master connection and two slaves\&. The first command adds a master bond connection, naming the bonding interface
+\fImybond0\fR
+and using
+\fIactive\-backup\fR
+mode\&. The next two commands add slaves connections, both enslaved to
+\fImybond0\fR\&. The first slave will be bound to
+\fIeth1\fR
+interface, the second to
+\fIeth2\fR\&.
+.PP
+\fBExample\ \&7.\ \&Adding a team master and two slave connection profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf
+$ nmcli con add type team\-slave con\-name Team1\-slave1 ifname em1 master Team1
+$ nmcli con add type team\-slave con\-name Team1\-slave2 ifname em2 master Team1
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a team master connection profile and two slaves\&. It is very similar to the bonding example\&. The first command adds a master team profile, naming the team interface and the profile
+\fITeam1\fR\&. The team configuration for the master is read from
+\fIteam1\-master\-json\&.conf\fR
+file\&. Later, you can change the configuration with
+\fImodify\fR
+command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to
+\fITeam1\fR\&. The first slave will be bound to
+\fIem1\fR
+interface, the second to
+\fIem2\fR\&. The slaves don\*(Aqt specify
+\fIconfig\fR
+and thus
+\fIteamd\fR
+will use its default configuration\&. You will activate the whole setup by activating both slaves:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con up Team1\-slave1
+$ nmcli con up Team1\-slave2
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&.
+.PP
+\fBExample\ \&8.\ \&Adding a bridge and two slave profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge
+$ nmcli con add type bridge\-slave con\-name br\-slave\-1 ifname ens3 master TowerBridge
+$ nmcli con add type bridge\-slave con\-name br\-slave\-2 ifname ens4 master TowerBridge
+$ nmcli con modify TowerBridge bridge\&.stp no
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as
+\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to
+\fITowerBridge\fR\&. The first slave will be tied to
+\fIens3\fR
+interface, the second to
+\fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&.
+.PP
+\fBExample\ \&9.\ \&Adding an ethernet connection profile with manual IP configuration\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli con add con\-name my\-con\-em1 ifname em1 type ethernet ip4 192\&.168\&.100\&.100/24 gw4 192\&.168\&.100\&.1 ip4 1\&.2\&.3\&.4 ip6 abbe::cafe
+$ nmcli con mod my\-con\-em1 ipv4\&.dns "8\&.8\&.8\&.8 8\&.8\&.4\&.4"
+$ nmcli con mod my\-con\-em1 ipv6\&.dns "2001:4860:4860::8888 2001:4860:4860::8844"
+$ nmcli \-p con show my\-con\-em1
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The first command adds an Ethernet connection profile named
+\fImy\-con\-em1\fR
+that is bound to interface name
+\fIem1\fR\&. The profile is configured with static IP addresses\&. Three addresses are added, two IPv4 addresses and one IPv6\&. The first IP 192\&.168\&.100\&.100 has a prefix of 24 (netmask equivalent of 255\&.255\&.255\&.0)\&. Gateway entry for the first IP address will become the default route if this profile is activated on em1 interface (and there is no connection with higher priority)\&. The second two addresses don\*(Aqt specify a prefix, so a default prefix will be used, i\&.e\&. 32 for IPv4 and 128 for IPv6\&. The second and third commands modify DNS parameters of the new connection profile\&. The last
+\fIcon show\fR
+command displays the profile so that all parameters can be reviewed\&.
+.PP
+\fBExample\ \&10.\ \&Escaping colon characters in tabular mode\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli \-t \-f general \-e yes \-m tab dev show eth0
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2\&.1\&.4\-k:1\&.8\-3:00\e:22\e:68\e:15\e:29\e:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\e:00/0000\e:00\e:19\&.0/net/eth0:eth0:yes:yes:no:ethernet\-13:89cbcbc6\-dc85\-456c\-9c8b\-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&.
+.PP
+\fBExample\ \&11.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+#!/bin/bash
+export LC_ALL=C
+
+enable_disable_wifi ()
+{
+	result=$(nmcli dev | grep "ethernet" | grep \-w "connected")
+	if [ \-n "$result" ]; then
+		nmcli radio wifi off
+	else
+		nmcli radio wifi on
+	fi
+}
+
+if [ "$2" = "up" ]; then
+	enable_disable_wifi
+fi
+
+if [ "$2" = "down" ]; then
+	enable_disable_wifi
+fi
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This dispatcher script makes Wi\-Fi mutually exclusive with wired networking\&. When a wired interface is connected, Wi\-Fi will be set to airplane mode (rfkilled)\&. When the wired interface is disconnected, Wi\-Fi will be turned back on\&. Name this script e\&.g\&. 70\-wifi\-wired\-exclusive\&.sh and put it into /etc/NetworkManager/dispatcher\&.d/ directory\&. See
+\fBNetworkManager\fR(8)
+manual page for more information about NetworkManager dispatcher scripts\&.
+.PP
+\fBExample sessions of interactive connection editor\fR
+.PP
+\fBExample\ \&12.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli connection edit type ethernet
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+
+===| nmcli interactive connection editor |===
+
+Adding a new \*(Aq802\-3\-ethernet\*(Aq connection
+
+Type \*(Aqhelp\*(Aq or \*(Aq?\*(Aq for available commands\&.
+Type \*(Aqdescribe [<setting>\&.<prop>]\*(Aq for detailed property description\&.
+
+You may edit the following settings: connection, 802\-3\-ethernet (ethernet), 802\-1x, ipv4, ipv6, dcb
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     auto
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            auto
+ipv4\&.dns:                               
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         
+ipv4\&.routes:                            
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.routes:                            
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> goto ethernet
+You may edit the following properties: port, speed, duplex, auto\-negotiate, mac\-address, cloned\-mac\-address, mac\-address\-blacklist, mtu, s390\-subchannels, s390\-nettype, s390\-options
+nmcli 802\-3\-ethernet> set mtu 1492
+nmcli 802\-3\-ethernet> b
+nmcli> goto ipv4\&.addresses
+nmcli ipv4\&.addresses> desc
+
+=== [addresses] ===
+[NM property description]
+Array of IPv4 address structures\&.  Each IPv4 address structure is composed of 3 32\-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 \- 32), and last the IPv4 gateway (network byte order)\&. The gateway may be left as 0 if no gateway exists for that subnet\&.  For the \*(Aqauto\*(Aq method, given IP addresses are appended to those returned by automatic configuration\&.  Addresses cannot be used with the \*(Aqshared\*(Aq, \*(Aqlink\-local\*(Aq, or \*(Aqdisabled\*(Aq methods as addressing is either automatic or disabled with these methods\&.
+
+[nmcli specific description]
+Enter a list of IPv4 addresses formatted as:
+  ip[/prefix] [gateway], ip[/prefix] [gateway],\&.\&.\&.
+Missing prefix is regarded as prefix of 32\&.
+
+Example: 192\&.168\&.1\&.5/24 192\&.168\&.1\&.1, 10\&.0\&.0\&.11/24
+
+nmcli ipv4\&.addresses> set 192\&.168\&.1\&.100/24 192\&.168\&.1\&.1
+Do you also want to set \*(Aqipv4\&.method\*(Aq to \*(Aqmanual\*(Aq? [yes]: yes
+nmcli ipv4\&.addresses>
+nmcli ipv4\&.addresses> print
+addresses: { ip = 192\&.168\&.1\&.100/24, gw = 192\&.168\&.1\&.1 }
+nmcli ipv4\&.addresses> back
+nmcli ipv4> b
+nmcli> verify
+Verify connection: OK
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     1492
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            manual
+ipv4\&.dns:                               
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         { ip = 192\&.168\&.1\&.100/24, gw = 192\&.168\&.1\&.1 }
+ipv4\&.routes:                            
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.routes:                            
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> set ipv4\&.dns 8\&.8\&.8\&.8 8\&.8\&.4\&.4
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     1492
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            manual
+ipv4\&.dns:                               8\&.8\&.8\&.8, 8\&.8\&.4\&.4
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         { ip = 192\&.168\&.1\&.100/24, gw = 192\&.168\&.1\&.1 }
+ipv4\&.routes:                            
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.routes:                            
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> verify
+Verify connection: OK
+nmcli> save
+Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully saved\&.
+nmcli> quit
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Example session in the nmcli interactive connection editor\&. The scenario creates an Ethernet connection (configuration) with static addressing (IPs and DNS)\&.
+.SH "SEE ALSO"
+.PP
+\fBnmcli\fR(1),
+\fBNetworkManager\fR(8),
+\fBNetworkManager.conf\fR(5),
+\fBnm-settings\fR(5),
+\fBnm-online\fR(1),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index ee48aba6d..08f07b4ab 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -19,9 +19,9 @@
 .\" with this manual; if not, write to the Free Software Foundation, Inc.,
 .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
-.\" Copyright (C) 2010 - 2013 Red Hat, Inc.
+.\" Copyright (C) 2010 - 2014 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "17 January 2013"
+.TH NMCLI "1" "28 February 2014"
 
 .SH NAME
 nmcli \- command\(hyline tool for controlling NetworkManager
@@ -33,7 +33,8 @@ nmcli \- command\(hyline tool for controlling NetworkManager
 .sp
 
 .IR OBJECT " := { "
-.BR nm " | " con " | " dev " } "
+.BR general " | " networking " | " radio " | " connection " | " device
+.RI " }"
 .sp
 
 .IR OPTIONS " := { "
@@ -48,6 +49,12 @@ nmcli \- command\(hyline tool for controlling NetworkManager
 .br
 \fB\-e\fR[\fIscape\fR] yes | no
 .br
+\fB\-n\fR[\fIocheck\fR]
+.br
+\fB\-a\fR[\fIsk\fR]
+.br
+\fB\-w\fR[\fIait\fR] <seconds>
+.br
 \fB\-v\fR[\fIersion\fR]
 .br
 \fB\-h\fR[\fIelp\fR]
@@ -56,27 +63,23 @@ nmcli \- command\(hyline tool for controlling NetworkManager
 
 .SH DESCRIPTION
 .B nmcli
-is a command\(hyline tool for controlling NetworkManager and reporting on its status.
-It is not meant as a full replacement for \fInm\(hyapplet\fP or other similar clients
-but as a complementary utility to those programs.
-The main usage for \fInmcli\fP is on servers, headless machines or for power users
-who prefer the command line.
+is a command\(hyline tool for controlling NetworkManager and reporting network
+status. It can be utilized as a replacement for \fInm\(hyapplet\fP or other
+graphical clients. \fInmcli\fP is used to create, display, edit, delete, activate,
+and deactivate network connections, as well as control and display network device
+status.
 .P
-Typical applications include:
-.IP \(em 4
-Initscripts: ifup/ifdown can utilize NetworkManager via \fInmcli\fP instead of
-having to manage connections itself and possibly interfere with NetworkManager.
+Typical uses include:
 .IP \(em 4
-Servers, headless machines: No GUI is available; then \fInmcli\fP can be used
-to activate/deactivate connections.  However, if a connection requires a secret
-in order 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 secrets to NetworkManager.
+Scripts: utilize NetworkManager via \fInmcli\fP instead of managing network
+connections manually.  \fInmcli\fP supports a terse output format which is better
+suited for script processing. Note that NetworkManager can also execute scripts,
+called "dispatcher scripts", in response to network events. See
+\fBNetworkManager\fP for details about these dispatcher scripts.
 .IP \(em 4
-User sessions: \fInmcli\fP can be used to activate/deactivate connections from
-the command line, but a client with a secret agent (like \fInm\(hyapplet\fP) is needed
-for supplying secrets not stored at the system level. Keyring dialogs and
-password prompts may appear if this happens.
+Servers, headless machines, and terminals:  \fInmcli\fP can be used to control
+NetworkManager without a GUI, including creating, editing, starting and stopping
+network connections and viewing network status.
 .SS \fIOPTIONS\fP
 .TP
 .B \-t, \-\-terse
@@ -91,11 +94,11 @@ for humans, i.e. values are aligned, headers are printed, etc.
 Switch between \fItabular\fP and \fImultiline\fP output.
 If omitted, default is \fItabular\fP for most commands. For the commands
 producing more structured information, that cannot be displayed on a single
-line, default is \fImultiline\fP. Currenly, they are:
+line, default is \fImultiline\fP. Currently, they are:
 .br
 .nf
-  'nmcli con list id|uuid <name>'
-  'nmcli dev list'
+  'nmcli connection show <ID>'
+  'nmcli device show'
 .fi
 \fItabular\fP   \(en Output is a table where each line describes a single entry.
 Columns define particular properties of the entry.
@@ -120,6 +123,22 @@ Whether to escape ':' and '\\' characters in terse tabular mode.  The escape
 character is '\\'.
 If omitted, default is \fIyes\fP.
 .TP
+.B \-n, \-\-nocheck
+This option can be used to force \fInmcli\fP to skip checking \fInmcli\fP and
+\fINetworkManager\fP version compatibility. Use it with care, because using
+incompatible versions may produce incorrect results.
+.TP
+.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.
+.TP
+.B \-w, \-\-wait <seconds>
+This option sets a timeout period for which \fInmcli\fP will wait for \fINetworkManager\fP
+to finsh operations. It is especially useful for commands that may take a longer time to
+complete, e.g. connection activation.
+Specifying a value of \fB0\fP instructs \fInmcli\fP not to wait but to exit immediately
+with a status of success. The default value depends on the executed command.
+.TP
 .B \-v, \-\-version
 Show \fInmcli\fP version.
 .TP
@@ -127,261 +146,591 @@ Show \fInmcli\fP version.
 Print help information.
 .SS \fIOBJECT\fP
 .TP
-.B nm
-NetworkManager
+.B general \- general \fINetworkManager\fP status and operations
 .br
-Use this object to inquire and change state of NetworkManager.
+Use this object to show NetworkManager status and permissions. You can also get
+and change system hostname, as well as NetworkManager logging level and domains.
 .TP
-.SS \fICOMMAND\fP := { status | permissions | enable | sleep | wifi | wwan | wimax }
+.SS \fICOMMAND\fP := { status | hostname | permissions | logging }
 .sp
 .RS
 .TP
 .B status
 .br
-Show overall status of NetworkManager. This is the default action, when no
-command is provided to \fInm\fP object.
+Show overall status of NetworkManager. This is the default action, when no additional
+command is provided for \fIgeneral\fP object.
+.TP
+.B hostname [<hostname>]
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+Get and change system hostname. With no arguments, this prints currently configured hostname.
+When you pass a hostname, it will be handed over to NetworkManager to be set as a new system
+hostname.
+.br
+Note that the term \fBsystem\fP hostname may also be referred to as \fBpersistent\fP or
+\fBstatic\fP by other programs or tools. The hostname is stored in /etc/hostname
+file in most distributions. For example, systemd-hostnamed service uses the term
+\fBstatic\fP hostname and it only reads the /etc/hostname file when it starts.
 .TP
 .B permissions
 .br
 Show the permissions a caller has for various authenticated operations that
-NetworkManager provides, like enable/disable networking, changing Wi\(hyFi, WWAN,
-and WiMAX state, modifying connections, etc.
+NetworkManager provides, like enable and disable networking, changing Wi\(hyFi,
+WWAN, and WiMAX state, modifying connections, etc.
+.TP
+.B logging [level <log level>] [domains <log domains>]
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    GetPermissions
-arguments: none
-.fi
+Get and change \fINetworkManager\fP logging level and domains. Without any argument
+current logging level and domains are shown. In order to change logging state, provide
+\fIlevel\fP and, or, \fIdomain\fP parameters. See \fBNetworkManager.conf\fP for available
+level and domain values.
+.RE
+
+.TP
+.B networking \- get or set general networking state of NetworkManager
+.br
+Use this object to show NetworkManager networking status, or to enable and disable
+networking. Disabling networking removes the configuration from all devices and
+changes them to the 'unmanaged' state.
+.TP
+.SS \fICOMMAND\fP := { [ on | off | connectivity ] }
+.sp
+.RS
 .TP
-.B enable [true|false]
+.B [ on | off ]
 .br
-Get networking\(hyenabled status or enable/disable networking by NetworkManager.
+Get networking\(hyenabled status or enable and disable networking by NetworkManager.
 All interfaces managed by NetworkManager are deactivated when networking has
 been disabled.
-.br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    Enable
-arguments: TRUE or FALSE
-.fi
 .TP
-.B sleep [true|false]
+.B connectivity [check]
 .br
-Get sleep status or put to sleep/awake NetworkManager. All interfaces managed
-by NetworkManager are deactivated when it falls asleep. This command is not
-meant for user to enable/disable networking, use \fIenable\fP for that. D\(hyBus
-\fISleep\fP method is designed to put NetworkManager to sleep or awake for
-suspending/resuming the computer.
+Get network connectivity state.
+The optional \fIcheck\fP argument tells NetworkManager to re-check the connectivity,
+else the most recent known connectivity state is displayed without re-checking.
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    Sleep
-arguments: TRUE or FALSE
-.fi
+Possible states are:
+.RS
+.PP
+.IP \fInone\fP 9
+\(en the host is not connected to any network
+.IP \fIportal\fP 9
+\(en the host is behind a captive portal and cannot reach the full Internet
+.IP \fIlimited\fP 9
+\(en the host is connected to a network, but it has no access to the Internet
+.IP \fIfull\fP 9
+\(en the host is connected to a network and has full access to the Internet
+.IP \fIunknown\fP 9
+\(en the connectivity status cannot be found out
+.RE
+.RE
+
 .TP
-.B wifi [on|off]
+.B radio \- get or set radio switch states
 .br
-Inquire or set status of Wi\(hyFi in NetworkManager. If no arguments are supplied,
-Wi\(hyFi status is printed; \fIon\fP enables Wi\(hyFi; \fIoff\fP disables Wi\(hyFi.
-.br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+Use this object to show radio switches status, or enable and disable
+the switches.
 .TP
-.B wwan [on|off]
-.br
-Inquire or set status of WWAN in NetworkManager. If no arguments are supplied,
-WWAN status is printed; \fIon\fP enables WWAN; \fIoff\fP disables WWAN.
+.SS \fICOMMAND\fP := { all | wifi | wwan | wimax }
+.sp
+.RS
+.TP
+.B wifi [ on | off ]
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+Show or set status of Wi\(hyFi in NetworkManager. If no arguments are supplied,
+Wi\(hyFi status is printed; \fIon\fP enables Wi\(hyFi; \fIoff\fP disables Wi\(hyFi.
 .TP
-.B wimax [on|off]
+.B wwan [ on | off ]
 .br
-Inquire or set status of WiMAX in NetworkManager. If no arguments are supplied,
-WiMAX status is printed; \fIon\fP enables WiMAX; \fIoff\fP disables WiMAX.
+Show or set status of WWAN (mobile broadband) in NetworkManager. If no arguments
+are supplied, mobile broadband status is printed; \fIon\fP enables mobile broadband,
+\fIoff\fP disables it.
+.TP
+.B wimax [ on | off ]
 .br
-Note: WiMAX support is a compile\(hytime decision, so it may be unavailable on some
+Show or set status of WiMAX in NetworkManager. If no arguments are supplied,
+WiMAX status is printed; \fIon\fP enables WiMAX; \fIoff\fP disables WiMAX.  Note:
+WiMAX support is a compile\(hytime decision, so it may be unavailable on some
 installations.
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+.TP
+.B all [ on | off ]
+.br
+Show or set all previously mentioned radio switches at the same time.
 .RE
 
 .TP
-.B con
-Connections
-.br
-Get information about NetworkManager's connections.
+.B connection \- start, stop, and manage network connections
+.sp
+NetworkManager stores all network configuration as \fIconnections\fP, which are
+collections of data (Layer2 details, IP addressing, etc.) that describe
+how to create or connect to a network.  A connection is \fIactive\fP when
+a device uses that connection's configuration to create or connect to a network.
+There may be multiple connections that apply to a device, but only one of them
+can be active on that device at any given time. The additional connections can
+be used to allow quick switching between different networks and configurations.
+.sp
+Consider a machine which is usually connected to a DHCP-enabled network, but
+sometimes connected to a testing network which uses static IP addressing.  Instead
+of manually reconfiguring eth0 each time the network is changed, the settings can
+be saved as two connections which both apply to eth0, one for DHCP (called
+"default") and one with the static addressing details (called "testing").  When
+connected to the DHCP-enabled network the user would run "nmcli con up default"
+, and when connected to the static network the user would run "nmcli con up testing".
 .TP
-.SS \fICOMMAND\fP := { list | status | up | down | delete }
+.SS \fICOMMAND\fP := { show | up | down | add | edit | modify | delete | reload | load }
 .sp
 .RS
 .TP
-.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'.
+.B show [--active]
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+List in-memory and on-disk connection profiles, some of which may also be
+active if a device is using that connection profile. Without a parameter, all
+profiles are listed. When --active option is specified, only the active profiles
+are shown.
 .TP
-.B status
+.B show [--active] [ id | uuid | path | apath ] <ID> ...
+.br
+Show details for specified connections. By default, both static configuration
+and active connection data are displayed.  When --active option is specified,
+only the active profiles are taken into
+account.
+\fIid\fP, \fIuuid\fP, \fIpath\fP and \fIapath\fP keywords can be used if
+\fI<ID>\fP is ambiguous.
+.RS
+.PP
+Optional <ID>-specifying keywords are:
+.IP \fIid\fP 13
+\(en the <ID> denotes a connection name
+.IP \fIuuid\fP 13
+\(en the <ID> denotes a connection UUID
+.IP \fIpath\fP 13
+\(en the <ID> denotes a D-Bus static connection path
+in the format of /org/freedesktop/NetworkManager/Settings/<num> or just <num>
+.IP \fIapath\fP 13
+\(en the <ID> denotes a D-Bus active connection path
+in the format of /org/freedesktop/NetworkManager/ActiveConnection/<num> or just <num>
+.PP
+It is possible to filter the output using the global \fI--fields\fP option. Use the following
+values:
+.RE
+.RS
+.PP
+.IP \fIprofile\fP 13
+\(en only shows static profile configuration
+.IP \fIactive\fP 13
+\(en only shows active connection data (when the profile is active)
+.PP
+You can also specify particular fields. For static configuration, use setting and property names
+as described in \fInm-settings\fP(5) manual page. For active data use GENERAL, IP4, DHCP4, IP6,
+DHCP6, VPN.
+.PP
+When no command is given to the \fIconnection\fP object, the default action
+is 'nmcli connection show'.
+.RE
+.TP
+.B up [ id | uuid | path ] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>]
+.RE
+.RS
+.B up ifname <ifname> [ap <BSSID>] [nsp <name>]
+.RS
 .br
-Print status of active connections.
+Activate a connection.  The connection is identified by its name, UUID or D-Bus
+path. If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP or \fIpath\fP can be
+used.  When requiring a particular device to activate the connection on, the
+\fIifname\fP option with interface name should be given.  If the <ID> is not
+given an \fIifname\fP is required, and NetworkManager will activate the best
+available connection for the given \fIifname\fP.  In case of a VPN connection,
+the \fIifname\fP option specifies the device of the base connection. The
+\fIap\fP option specify what particular AP should be used in case of a Wi\(hyFi
+connection.
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
-.TP
-.B up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [nsp <name>] [\-\-nowait] [\-\-timeout <timeout>]
+If '--wait' option is not specified, the default timeout will be 90 seconds.
 .br
-Activate a connection.  The connection is identified by its name using \fIid\fP
-or UUID using \fIuuid\fP. When requiring a particular device to activate the
-connection on, the \fIiface\fP option with interface name should be given. In
-case of a VPN connection, the \fIiface\fP option specify the device of the base
-connection. The \fIap\fP option specify what particular AP should be used in case
-of a Wi\(hyFi connection.
+See \fBconnection show\fP above for the description of the <ID>-specifying keywords.
 .RS
 .PP
 Available options are:
-.IP \fIiface\fP 13
+.IP \fIifname\fP 13
 \(en interface that will be used for activation
 .IP \fIap\fP 13
 \(en BSSID of the AP which the command should connect to (for Wi\(hyFi connections)
 .IP \fInsp\fP 13
 \(en NSP (Network Service Provider) which the command should connect to (for WiMAX connections)
-.IP \fI\-\-nowait\fP 13
-\(en exit immediately without waiting for command completion
-.IP \fI\-\-timeout\fP 13
-\(en how long to wait for command completion (default is 90 s)
-.PP
-.br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    ActivateConnection
-arguments: according to arguments
-.fi
 .RE
-
+.RE
 .TP
-.B down id <id> | uuid <id>
+.B down [ id | uuid | path | apath ] <ID>
 .br
-Deactivate a connection.
-The connection is identified by its name using \fIid\fP
-or UUID using \fIuuid\fP.
+Deactivate a connection from a device without preventing the device from
+further auto-activation.
+.sp
+Be aware that this command deactivates the specified active connection. The device
+on which the connection was active, is still ready to connect and will perform
+auto-activation by looking for a suitable connection that has the 'autoconnect'
+flag set. This includes the just deactivated connection, so if the connection is set
+to auto-connect, it will be automatically started on the disconnected device again.
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    DeactivateConnection
-arguments: according to arguments
-.fi
+In most cases you may want to use \fIdevice disconnect\fP command instead.
+.sp
+The connection is identified by its name, UUID or D-Bus path.
+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.
 .TP
-.B delete id <id> | uuid <id>
+.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS
 .br
-Delete a configured connection. The connection to delete is specified with
-\fIid\fP (connection name) or \fIuuid\fP (connection UUID).
+Add a connection for NetworkManager. Arguments differ according to connection types, see below.
+.RS
+.TP
+.B COMMON_OPTIONS:
+.IP "\fItype <type>\fP" 42
+\(en connection type; see below \fBTYPE_SPECIFIC_OPTIONS\fP for allowed values; (mandatory)
+.IP "\fIifname <ifname> | \(dq\&*\(dq\&\fP" 42
+\(en interface to bind the connection to. The connection will only be applicable to this
+interface name. A special value of "\fB*\fP" can be used for interface-independent connections.
+The \fIifname\fP argument is mandatory for all connection types except bond, team, bridge and vlan.
+Note: use quotes around \fB*\fP to suppress shell expansion.
+.IP "\fI[con-name <connection name>]\fP" 42
+\(en connection name (when not provided a default name is generated: <type>[-<ifname>][-<num>])
+.IP "\fI[autoconnect yes|no]\fP" 42
+\(en whether the connection profile can be automatically activated (default: yes)
+.IP "\fI[save yes|no]\fP" 42
+\(en whether the connection should be persistent, i.e. NetworkManager should store it on disk (default: yes)
+.RE
+.RS
+.TP
+.B TYPE_SPECIFIC_OPTIONS:
+.TP
+.B ethernet:
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the device this connection is locked to
+.IP "\fI[cloned-mac <cloned MAC address>]\fP" 42
+\(en cloned MAC
+.IP "\fI[mtu <MTU>]\fP" 42
+\(en MTU
+.RE
+.RS
+.TP
+.B wifi:
+.IP "\fIssid <SSID>\fP" 42
+\(en SSID
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the device this connection is locked to
+.IP "\fI[cloned-mac <cloned MAC address>]\fP" 42
+\(en cloned MAC
+.IP "\fI[mtu <MTU>]\fP" 42
+\(en MTU
+.RE
+.RS
+.TP
+.B wimax:
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the device this connection is locked to
+.IP "\fI[nsp <NSP>]\fP" 42
+\(en Network Service Provider name
+.RE
+.RS
+.TP
+.B pppoe:
+.IP "\fIusername <PPPoE username>\fP" 42
+\(en PPPoE username
+.IP "\fI[password <PPPoE password>]\fP" 42
+\(en Password for the PPPoE username
+.IP "\fI[service <PPPoE service name>]\fP" 42
+\(en PPPoE service name (if required by concentrator)
+.IP "\fI[mtu <MTU>]\fP" 42
+\(en MTU
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the device this connection is locked to
+.RE
+.RS
+.TP
+.B gsm:
+.IP "\fIapn <APN>\fP" 42
+\(en APN - GSM Access Point Name
+.IP "\fI[user <username>]\fP" 42
+\(en user name
+.IP "\fI[password <password>]\fP" 42
+\(en password
+.RE
+.RS
+.TP
+.B cdma:
+.IP "\fI[user <username>]\fP" 42
+\(en user name
+.IP "\fI[password <password>]\fP" 42
+\(en password
+.RE
+.RS
+.TP
+.B infiniband:
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the device this connection is locked to (InfiniBand MAC is 20 bytes)
+.IP "\fI[mtu <MTU>]\fP" 42
+\(en MTU
+.IP "\fI[transport-mode datagram | connected]\fP" 42
+\(en InfiniBand transport mode
+.IP "\fI[parent <interface name>]\fP" 42
+\(en the interface name of the parent device (if any)
+.IP "\fI[p-key <IPoIB P_Key>]\fP" 42
+\(en the InfiniBand P_Key (16-bit unsigned integer)
+.RE
+.RS
+.TP
+.B bluetooth:
+.IP "\fI[addr <bluetooth address>]\fP" 42
+\(en Bluetooth device address (MAC)
+.IP "\fI[bt-type panu|dun-gsm|dun-cdma]\fP" 42
+\(en Bluetooth connection type
+.RE
+.RS
+.TP
+.B vlan:
+.IP "\fIdev <parent device (connection UUID, ifname, or MAC)>\fP" 42
+\(en parent device this VLAN is on
+.IP "\fIid <VLAN ID>\fP" 42
+\(en VLAN ID in range <0-4095>
+.IP "\fI[flags <VLAN flags>]\fP" 42
+\(en flags
+.IP "\fI[ingress <ingress priority mapping>]\fP" 42
+\(en VLAN ingress priority mapping
+.IP "\fI[egress <egress priority mapping>]\fP" 42
+\(en VLAN egress priority mapping
+.IP "\fI[mtu <MTU>]\fP" 42
+\(en MTU
+.RE
+.RS
+.TP
+.B bond:
+.IP "\fI[mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\fP"
+.IP "\fI      802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\fP" 42
+\(en bonding mode (default: balance-rr)
+.IP "\fI[primary <ifname>]\fP" 42
+\(en primary interface name (for "active-backup" mode)
+.IP "\fI[miimon <num>]\fP" 42
+\(en miimon (default: 100)
+.IP "\fI[downdelay <num>]\fP" 42
+\(en downdelay (default: 0)
+.IP "\fI[updelay <num>]\fP" 42
+\(en updelay (default: 0)
+.IP "\fI[arp-interval <num>]\fP" 42
+\(en ARP interval (default: 0)
+.IP "\fI[arp-ip-target <num>]\fP" 42
+\(en ARP IP target
+.RE
+.RS
+.TP
+.B bond-slave:
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
+\(en master bond interface name, or connection UUID or ID of bond master connection profile.
+The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
+.RE
+.RS
+.TP
+.B team:
+.IP "\fI[config <file>|<raw JSON data>]\fP" 42
+\(en JSON configuration for team
+.RE
+.RS
+.TP
+.B team-slave:
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
+\(en master team interface name, or connection UUID or ID of team master connection profile.
+The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
+.IP "\fI[config <file>|<raw JSON data>]\fP" 42
+\(en JSON configuration for team
+.RE
+.RS
+.TP
+.B bridge:
+.IP "\fI[stp yes|no]\fP" 42
+\(en controls whether Spanning Tree Protocol (STP) is enabled for this bridge (default: yes)
+.IP "\fI[priority <num>]\fP" 42
+\(en sets STP priority (default: 128)
+.IP "\fI[forward-delay <2-30>]\fP" 42
+\(en STP forwarding delay, in seconds (default: 15)
+.IP "\fI[hello-time <1-10>]\fP" 42
+\(en STP hello time, in seconds (default: 2)
+.IP "\fI[max-age <6-42>]\fP" 42
+\(en STP maximum message age, in seconds (default: 20)
+.IP "\fI[ageing-time <0-1000000>]\fP" 42
+\(en the Ethernet MAC address aging time, in seconds (default: 300)
+.IP "\fI[mac <MAC address>]\fP" 42
+\(en MAC address of the bridge (note: this requires a recent kernel feature,
+originally introduced in 3.15 upstream kernel)
+.RE
+.RS
+.TP
+.B bridge-slave:
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
+\(en master bridge interface name, or connection UUID or ID of bridge master connection profile.
+The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
+.IP "\fI[priority <0-63>]\fP" 42
+\(en STP priority of this slave (default: 32)
+.IP "\fI[path-cost <1-65535>]\fP" 42
+\(en STP port cost for destinations via this slave (default: 100)
+.IP "\fI[hairpin yes|no]\fP" 42
+\(en 'hairpin mode' for the slave, which allows frames
+to be sent back out through the slave the frame was received on (default: yes)
+.RE
+.RS
+.TP
+.B vpn:
+.IP "\fIvpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\fP" 42
+\(en VPN type
+.IP "\fI[user <username>]\fP" 42
+\(en VPN username
+.RE
+.RS
+.TP
+.B olpc-mesh:
+.IP "\fIssid <SSID>\fP" 42
+\(en SSID
+.IP "\fI[channel <1-13>]\fP" 42
+\(en channel to use for the network
+.IP "\fI[dhcp-anycast <MAC address>]\fP" 42
+\(en anycast DHCP MAC address used when requesting an IP address via DHCP
+.RE
+.RS
+.TP
+.B IP_OPTIONS:
+.IP "\fI[ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\fP" 42
+\(en IPv4 addresses
+.IP "\fI[ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\fP" 42
+\(en IPv6 addresses
+.RE
+.TP
+.B edit [id | uuid | path ] <ID>  - edit an existing connection
+.RE
+.RS
+.B edit [type <new connection type>] [con-name <new connection name>]  - add a new connection
+.RS
+Edit an existing connection or add a new one, using an interactive editor.
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager.Settings.Connection
-method:    Delete
-arguments: none
-.fi
+The existing connection is identified by its name, UUID or D-Bus path.
+If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP, or \fIpath\fP can be used.
+See \fBconnection show\fP above for the description of the <ID>-specifying keywords.
+Not providing an <ID> means that a new connection will be added.
+.sp
+The interactive editor will guide you through the connection editing and
+allow you to change connection parameters according to your needs by means of
+a simple menu-driven interface. The editor indicates what settings and
+properties can be modified and provides in-line help.
+.sp
+.PP
+Available options:
+.IP \fItype\fP 13
+\(en type of the new connection; valid types are the same as for \fIconnection add\fP command
+.IP \fIcon-name\fP 13
+\(en name for the new connection. It can be changed later in the editor.
+.RE
+.RS
+.sp
+See also \fInm-settings\fP(5) for all NetworkManager settings and property names, and their
+descriptions; and \fInmcli-examples\fP(5) for sample editor sessions.
+.RE
+.TP
+.B modify [--temporary] [ id | uuid | path ] <ID> [+|-]<setting>.<property> <value>
+.B [+|-]<setting>.<property> <value> ...
+.br
+Modify one or more properties in the connection profile.
+.br
+The connection is identified by its name, UUID or D-Bus path. If <ID> is
+ambiguous, a keyword \fIid\fP, \fIuuid\fP or \fIpath\fP can be used.  See
+\fInm-settings\fP(5) for setting and property names, their descriptions and
+default values. This command supports abbreviations for \fIsetting name\fP and
+\fIproperty name\fP provided they are unique. Empty \fIvalue\fP ("") removes
+the property value (sets the property to the default value).  The provided
+value overwrites the existing property value.
+.br
+If you want to append an item to the existing value, use \fI+\fP prefix for the
+property name. If you want to remove just one item from container-type
+property, use \fI-\fP prefix for the property name and specify a value or an
+zero-based index of the item to remove (or option name for properties with
+named options) as \fIvalue\fP. Of course, \fI+|-\fP only have a real effect for
+multi-value (container) properties like ipv4.dns, ipv4.addresses, bond.options,
+etc.
+.br
+The changes to the connection profile will be saved persistently by
+NetworkManager, unless \fI--temporary\fP option is provided, in which case the
+changes won't persist over NetworkManager restart.
+.TP
+.B delete [ id | uuid | path ] <ID> ...
+.br
+Delete a configured connection. The connection to be deleted is identified by
+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.
+.TP
+.B reload
+.br
+Reload all connection files from disk. \fINetworkManager\fP does not monitor
+changes to connection files by default. So you need to use this command in order
+to tell \fINetworkManager\fP to re-read the connection profiles from disk when
+a change was made to them. However, the auto-loading feature can be enabled and
+then \fINetworkManager\fP will reload connection files any time they change
+(monitor-connection-files=true in \fINetworkManager.conf\fP(5)).
+.TP
+.B load <filename> [<filename>...]
+.br
+Load/reload one or more connection files from disk. Use this after manually
+editing a connection file to ensure that \fBNetworkManager\fP is aware
+of its latest state.
 .RE
 
 .TP
-.B dev
-Devices
+.B device - show and manage network interfaces
 .br
-Get information about devices.
 .TP
-.SS \fICOMMAND\fP := { status | list | disconnect | wifi }
+.SS \fICOMMAND\fP := { status | show | connect | disconnect | wifi | wimax }
 .sp
 .RS
 .TP
 .B status
 .br
-Print status of devices.  This is the default action, when no command
-is specified to \fIdev\fP object.
+Print status of devices.
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+This is the default action if no command is specified to \fIdevice\fP object.
 .TP
-.B list [iface <iface>]
+.B show [<ifname>]
 .br
-Get detailed information about devices.  Without an argument, all devices are
-examined. To get information for a specific device, the \fIiface\fP argument
-with the interface name should be provided.
+Show detailed information about devices.  Without an argument, all devices are
+examined. To get information for a specific device, the interface name has
+to be provided.
+.TP
+.B connect <ifname>
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
+Connect the device. NetworkManager will try to find a suitable connection that
+will be activated. It will also consider connections that are not set to auto connect.
+.br
+If '--wait' option is not specified, the default timeout will be 90 seconds.
 .TP
-.B disconnect iface <iface> [\-\-nowait] [\-\-timeout <timeout>]
+.B disconnect <ifname>
 .br
 Disconnect a device and prevent the device from automatically activating further
 connections without user/manual intervention.
-.RS
-.PP
-Available options are:
-.IP \fI\-\-nowait\fP 13
-\(en exit immediately without waiting for command completion
-.IP \fI\-\-timeout\fP 13
-\(en how long to wait for command completion (default is 10 s)
-.PP
 .br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager.Device
-method:    Disconnect
-arguments: none
-.fi
-.RE
+If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
-.B wifi [list [iface <iface>] [bssid <BSSID>]]
+.B wifi [list [ifname <ifname>] [bssid <BSSID>]]
 .br
-List available Wi\(hyFi access points. The \fIiface\fP and \fIbssid\fP options
+List available Wi\(hyFi access points. The \fIifname\fP and \fIbssid\fP options
 can be used to list APs for a particular interface or with a specific BSSID,
 respectively.
-.br
-.nf
-\fBReference to D\(hyBus:\fP
-No simple reference.
-.fi
 .TP
-.B wifi connect <(B)SSID> [password <password>] [wep\-key\-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>] [\-\-private] [\-\-nowait] [\-\-timeout <timeout>]
+.B wifi connect <(B)SSID> [password <password>] [wep\-key\-type key|phrase] [ifname <ifname>] [bssid <BSSID>] [name <name>] [private yes|no]
 .br
 Connect to a Wi\(hyFi network specified by SSID or BSSID. The command creates a new
 connection and then activates it on a device. This is a command\(hyline counterpart
 of clicking an SSID in a GUI client. The command always creates a new connection
 and thus it is mainly useful for connecting to new Wi\(hyFi networks. If a connection
-for the network already exists, it's better to connect through it using
-\fInmcli con up id <name>\fP. Note that only open, WEP and WPA\(hyPSK networks are
-supported at the moment. It is also supposed that IP configuration is obtained via
+for the network already exists, it is better to bring up (activate) the existing connection
+as follows: \fInmcli con up id <name>\fP. Note that only open, WEP and WPA\(hyPSK networks
+are supported at the moment. It is also supposed that IP configuration is obtained via
 DHCP.
+.br
+If '--wait' option is not specified, the default timeout will be 90 seconds.
 .RS
 .PP
 Available options are:
@@ -389,27 +738,29 @@ Available options are:
 \(en password for secured networks (WEP or WPA)
 .IP \fIwep\-key\-type\fP 13
 \(en type of WEP secret, either \fIkey\fP for ASCII/HEX key or \fIphrase\fP for passphrase
-.IP \fIiface\fP 13
+.IP \fIifname\fP 13
 \(en interface that will be used for activation
 .IP \fIbssid\fP 13
 \(en if specified, the created connection will be restricted just for the BSSID
 .IP \fIname\fP 13
 \(en if specified, the connection will use the name (else NM creates a name itself)
-.IP \fI\-\-private\fP 13
-\(en the connection will only be visible to the user who created it (else the connection is system\(hywide)
-.IP \fI\-\-nowait\fP 13
-\(en exit immediately without waiting for command completion
-.IP \fI\-\-timeout\fP 13
-\(en how long to wait for command completion (default is 90 s)
-.PP
-.br
-.nf
-\fBReference to D\(hyBus:\fP
-interface: org.freedesktop.NetworkManager
-method:    AddAndActivateConnection
-arguments: according to arguments
-.fi
+.IP \fIprivate\fP 13
+\(en if set to \fByes\fP, the connection will only be visible to the user who created it.
+Otherwise the connection is system\(hywide, which is the default.
 .RE
+.TP
+.B wifi rescan [[ifname] <ifname>]
+.br
+Request that \fINetworkManager\fP immediately re-scan for available access points.
+NetworkManager scans Wi\(hyFi networks periodically, but in some cases it can be
+useful to start scanning manually (e.g. after resuming the computer).
+This command does not show the APs, use 'nmcli device wifi list' for that.
+.TP
+.B wimax [list [ifname <ifname>] [nsp <name>]]
+.br
+List available WiMAX NSP. The \fIifname\fP and \fInsp\fP options
+can be used to list networks for a particular interface or with a specific
+NSP, respectively.
 
 .SH ENVIRONMENT VARIABLES
 \fInmcli\fP's behavior is affected by the following environment variables.
@@ -425,7 +776,7 @@ or null.
 .RE
 Internationalization notes:
 .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 is why the output depends on
 your environment. This is important to realize especially when you parse the
 output.
 .br
@@ -447,7 +798,7 @@ Unknown or unspecified error
 .IP "2" 4
 Invalid user input, wrong \fInmcli\fP invocation
 .IP "3" 4
-Timeout expired (see commands with \fI\-\-timeout\fP option)
+Timeout expired (see \fI\-\-wait\fP option)
 .IP "4" 4
 Connection activation failed
 .IP "5" 4
@@ -460,56 +811,79 @@ Connection deletion failed
 NetworkManager is not running
 .IP "9" 4
 \fInmcli\fP and \fINetworkManager\fP versions mismatch
+.IP "10" 4
+Connection, device, or access point does not exist.
 
 .SH EXAMPLES
-.IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP"
+.PP
+This section presents various examples of nmcli usage. If you want even more,
+please refer to \fInmcli-examples\fP(5) manual page.
+.sp
+.IP "\fB\f(CWnmcli \-t \-f RUNNING general\fP\fP"
 .IP
 tells you whether NetworkManager is running or not.
 
-.IP "\fB\f(CWnmcli \-t \-f STATE nm\fP\fP"
+.IP "\fB\f(CWnmcli \-t \-f STATE general\fP\fP"
 .IP
 shows the overall status of NetworkManager.
 
-.IP "\fB\f(CWnmcli nm wifi off\fP\fP"
+.IP "\fB\f(CWnmcli radio wifi off\fP\fP"
 .IP
 switches Wi\(hyFi off.
 
-.IP "\fB\f(CWnmcli \-p con list\fP\fP"
+.IP "\fB\f(CWnmcli connection show\fP\fP"
 .IP
 lists all connections NetworkManager has.
 
-.IP "\fB\f(CWnmcli \-f name,autoconnect con list\fP\fP"
+.IP "\fB\f(CWnmcli \-p \-m multiline \-f all con show\fP\fP"
 .IP
-lists all connections' names and their autoconnect settings.
+shows all configured connections in multi-line mode.
 
-.IP "\fB\f(CWnmcli con list id \(dq\&My wired connection\(dq\&\fP\fP"
+.IP "\fB\f(CWnmcli connection show --active\fP\fP"
 .IP
-lists all details of the connection with "My wired connection" name.
+lists all currently active connections.
 
-.IP "\fB\f(CWnmcli \-p con up id \(dq\&My wired connection\(dq\& iface eth0\fP\fP"
+.IP "\fB\f(CWnmcli \-f name,autoconnect c s\fP\fP"
 .IP
-activates the connection with name "My wired connection" on interface eth0.
+shows all connection profile names and their auto-connect property.
+
+.IP "\fB\f(CWnmcli \-p connection show \(dq\&My default em1\(dq\&\fP\fP"
+.IP
+shows details for "My default em1" connection profile.
+
+.IP "\fB\f(CWnmcli \-f active connection show \(dq\&My default em1\(dq\&\fP\fP"
+.IP
+shows details for "My default em1" active connection, like IP, DHCP
+information, etc.
+
+.IP "\fB\f(CWnmcli -f profile con s \(dq\&My wired connection\(dq\&\fP\fP"
+.IP
+shows static configuration details of the connection profile with "My wired connection" name.
+
+.IP "\fB\f(CWnmcli \-p con up \(dq\&My wired connection\(dq\& ifname eth0\fP\fP"
+.IP
+activates the connection profile with name "My wired connection" on interface eth0.
 The \-p option makes nmcli show progress of the activation.
 
-.IP "\fB\f(CWnmcli con up uuid 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 ap 00:3A:98:7C:42:D3\fP\fP"
+.IP "\fB\f(CWnmcli con up 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 ap 00:3A:98:7C:42:D3\fP\fP"
 .IP
 connects the Wi\(hyFi connection with UUID 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 to the AP
 with BSSID 00:3A:98:7C:42:D3.
 
-.IP "\fB\f(CWnmcli dev status\fP\fP"
+.IP "\fB\f(CWnmcli device status\fP\fP"
 .IP
 shows the status for all devices.
 
-.IP "\fB\f(CWnmcli dev disconnect iface em2\fP\fP"
+.IP "\fB\f(CWnmcli dev disconnect em2\fP\fP"
 .IP
 disconnects a connection on interface em2 and marks the device as unavailable for
-auto\(hyconnecting. That's why no connection will automatically be activated on the
-device until the device's "autoconnect" is set to TRUE or user manually activates
+auto\(hyconnecting. As a result, no connection will automatically be activated on the
+device until the device's 'autoconnect' is set to TRUE or the user manually activates
 a connection.
 
-.IP "\fB\f(CWnmcli \-f GENERAL,WIFI\-PROPERTIES dev list iface wlan0\fP\fP"
+.IP "\fB\f(CWnmcli \-f GENERAL,WIFI\-PROPERTIES dev show wlan0\fP\fP"
 .IP
-lists details for wlan0 interface; only GENERAL and WIFI\-PROPERTIES sections will be shown.
+shows details for wlan0 interface; only GENERAL and WIFI\-PROPERTIES sections will be shown.
 
 .IP "\fB\f(CWnmcli dev wifi\fP\fP"
 .IP
@@ -518,18 +892,63 @@ lists available Wi\(hyFi access points known to NetworkManager.
 .IP "\fB\f(CWnmcli dev wifi con \(dq\&Cafe Hotspot 1\(dq\& password caffeine name \(dq\&My cafe\(dq\&\fP\fP"
 .IP
 creates a new connection named "My cafe" and then connects it to "Cafe Hotspot 1" SSID
-using "caffeine" password. This is mainly useful when connecting to "Cafe Hotspot 1" for
+using password "caffeine". This is mainly useful when connecting to "Cafe Hotspot 1" for
 the first time. Next time, it is better to use 'nmcli con up id "My cafe"' so that the
 existing connection profile can be used and no additional is created.
 
+.IP "\fB\f(CWnmcli connection add type ethernet autoconnect no ifname eth0\fP\fP"
+.IP
+non-interactively adds an Ethernet connection tied to eth0 interface with automatic IP configuration (DHCP),
+and disables the connection's "autoconnect" flag.
+
+.IP "\fB\f(CWnmcli c a ifname Maxipes\(hyfik type vlan dev eth0 id 55\fP\fP"
+.IP
+non-interactively adds a VLAN connection with ID 55. The connection will use eth0 and the VLAN interface
+will be named Maxipes\(hyfik.
+
+.IP "\fB\f(CWnmcli connection edit ethernet\-em1\-2\fP\fP"
+.IP
+edits existing "ethernet\(hyem1\(hy2" connection in the interactive editor.
+
+.IP "\fB\f(CWnmcli connection edit type ethernet con-name \(dq\&yet another Ethernet connection\(dq\&\fP\fP"
+.IP
+adds a new Ethernet connection in the interactive editor.
+
+.IP "\fB\f(CWnmcli con mod ethernet\-2 connection.autoconnect no\fP\fP"
+.IP
+modifies 'autoconnect' property in the 'connection' setting of 'ethernet\(hy2' connection.
+
+.IP "\fB\f(CWnmcli con mod \(dq\&Home Wi\-Fi\(dq\& wifi.mtu 1350\fP\fP"
+.IP
+modifies 'mtu' property in the 'wifi' setting of 'Home Wi\(hyFi' connection.
+
+.IP "\fB\f(CWnmcli con mod em1-1 ipv4.method manual ipv4.addr \(dq\&192.168.1.23/24 192.168.1.1, 10.10.1.5/8, 10.0.0.11\(dq\&\fP\fP"
+.IP
+sets manual addressing and the addresses in em1-1 profile.
+
+.IP "\fB\f(CWnmcli con modify ABC +ipv4.dns 8.8.8.8\fP\fP"
+.IP
+appends a Google public DNS server to DNS servers in ABC profile.
+
+.IP "\fB\f(CWnmcli con modify ABC -ipv4.addresses \(dq\&192.168.100.25/24 192.168.1.1\(dq\&\fP\fP"
+.IP
+removes the specified IP address from (static) profile ABC.
+
+.SH NOTES
+\fInmcli\fP accepts abbreviations, as long as they are a unique prefix in the set
+of possible options. As new options get added, these abbreviations are not guaranteed
+to stay unique. For scripting and long term compatiblity it is therefore strongly
+advised to spell out the full option names.
+
 .SH BUGS
 There are probably some bugs.  If you find a bug, please report it to
 https://bugzilla.gnome.org/ \(em product \fINetworkManager\fP.
 
 .SH SEE ALSO
-.BR nm\-tool (1),
+.BR nmcli\-examples (5),
 .BR nm\-online (1),
 .BR NetworkManager (8),
+.BR NetworkManager.conf (5),
 .BR nm\-settings (5),
-.BR nm\applet (1),
+.BR nm\-applet (1),
 .BR nm\-connection\-editor (1).