Imported Upstream version 1.1.93 upstream/1.1.93

29 files changed, 6468 insertions, 2460 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 65d8d007..ce84194c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -17,10 +17,16 @@ XSLTPROC_MAN_FLAGS = \
 
 if ENABLE_GTK_DOC
 
-%.8: %.xml
+%.1: %.xml common.ent
 	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
-%.5: %.xml
+%.5: %.xml common.ent
+	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+%.7: %.xml common.ent
+	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+%.8: %.xml common.ent
 	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
 endif
@@ -38,25 +44,13 @@ NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in
 if BUILD_SETTING_DOCS
 
 nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml
-	$(AM_V_GEN) xsltproc \
-		--output $@ \
-		--stringparam version $(NM_VERSION) \
-		--stringparam date "`date +'%d %B %Y'`" \
-		$^
+	$(AM_V_GEN) xsltproc --output $@ $^
 
 nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml
-	$(AM_V_GEN) xsltproc \
-		--output $@ \
-		--stringparam version $(NM_VERSION) \
-		--stringparam date "`date +'%d %B %Y'`" \
-		$^
+	$(AM_V_GEN) xsltproc --output $@ $^
 
 nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml
-	$(AM_V_GEN) xsltproc \
-		--output $@ \
-		--stringparam version $(NM_VERSION) \
-		--stringparam date "`date +'%d %B %Y'`" \
-		$^
+	$(AM_V_GEN) xsltproc --output $@ $^
 
 CLEANFILES +=				\
 	nm-settings.xml			\
@@ -65,63 +59,78 @@ CLEANFILES +=				\
 
 endif
 
-configure_generated_man_pages =		\
-	nmcli.1				\
-	nmtui.1				\
-	nm-online.1			\
-	nm-system-settings.conf.5
-
-docbook_generated_man_pages =		\
-	NetworkManager.8		\
-	NetworkManager.conf.5		\
-	nmcli-examples.5
+man_pages =			\
+	nmcli.1			\
+	nmtui.1			\
+	nm-online.1		\
+	NetworkManager.conf.5	\
+	nmcli-examples.7	\
+	NetworkManager.8
 
-docbook_autogenerated_man_pages =	\
-	nm-settings.5			\
+autogenerated_man_pages =	\
+	nm-settings.5		\
 	nm-settings-keyfile.5
 
 if CONFIG_PLUGIN_IFCFG_RH
-docbook_autogenerated_man_pages += nm-settings-ifcfg-rh.5
+autogenerated_man_pages += nm-settings-ifcfg-rh.5
 else
 EXTRA_DIST += nm-settings-ifcfg-rh.5
 endif
 
-EXTRA_DIST +=								\
-	nm-settings.xml							\
-	nm-settings.xsl							\
-	nm-settings-keyfile.xml						\
-	nm-settings-keyfile.xsl						\
-	nm-settings-ifcfg-rh.xml					\
-	nm-settings-ifcfg-rh.xsl					\
-	$(addsuffix .xml,$(basename $(docbook_generated_man_pages)))	\
-	$(docbook_generated_man_pages) \
-	$(docbook_autogenerated_man_pages)
-
-man_MANS += $(configure_generated_man_pages)
-
-links = nmtui-edit nmtui-connect nmtui-hostname
+EXTRA_DIST +=						\
+	nm-settings.xml					\
+	nm-settings.xsl					\
+	nm-settings-keyfile.xml				\
+	nm-settings-keyfile.xsl				\
+	nm-settings-ifcfg-rh.xml			\
+	nm-settings-ifcfg-rh.xsl			\
+	$(addsuffix .xml,$(basename $(man_pages)))	\
+	$(man_pages)					\
+	$(autogenerated_man_pages)
+
+nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
+NetworkManager_conf_links = nm-system-settings.conf
+
+# Implement a || condition
+if INSTALL_PREGEN_MANPAGES
+install_manpages = true
+else
+if ENABLE_GTK_DOC
+install_manpages = true
+endif
+endif
 
 install-data-hook:
-	for link in $(links); do \
-		ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
-	done
+	if test -n "$(install_manpages)"; then \
+		for link in $(nmtui_links); do \
+			ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
+		done; \
+		for link in $(NetworkManager_conf_links); do \
+			ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \
+		done; \
+	fi
 
 uninstall-hook:
-	for link in $(links); do \
-		rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
-	done
+	if test -n "$(install_manpages)"; then \
+		for link in $(nmtui_links); do \
+			rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
+		done; \
+		for link in $(NetworkManager_conf_links); do \
+			rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \
+		done; \
+	fi
 
 if ENABLE_GTK_DOC
-man_MANS += $(docbook_generated_man_pages)
-CLEANFILES += $(docbook_generated_man_pages)
+man_MANS += $(man_pages)
+CLEANFILES += $(man_pages)
 if SETTING_DOCS_AVAILABLE
-man_MANS += $(docbook_autogenerated_man_pages)
-CLEANFILES += $(docbook_autogenerated_man_pages)
+man_MANS += $(autogenerated_man_pages)
+CLEANFILES += $(autogenerated_man_pages)
 endif
 else
 if INSTALL_PREGEN_MANPAGES
 man_MANS +=					\
-	$(docbook_generated_man_pages)		\
-	$(docbook_autogenerated_man_pages)
+	$(man_pages)		\
+	$(autogenerated_man_pages)
 endif
 endif
diff --git a/man/Makefile.in b/man/Makefile.in
index 07c8d369..551f1a90 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -94,13 +94,13 @@ host_triplet = @host@
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = nm-settings-ifcfg-rh.5
 @CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_3 = nm-settings-ifcfg-rh.5
-@ENABLE_GTK_DOC_TRUE@am__append_4 = $(docbook_generated_man_pages)
-@ENABLE_GTK_DOC_TRUE@am__append_5 = $(docbook_generated_man_pages)
-@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_6 = $(docbook_autogenerated_man_pages)
-@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_7 = $(docbook_autogenerated_man_pages)
+@ENABLE_GTK_DOC_TRUE@am__append_4 = $(man_pages)
+@ENABLE_GTK_DOC_TRUE@am__append_5 = $(man_pages)
+@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_6 = $(autogenerated_man_pages)
+@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_7 = $(autogenerated_man_pages)
 @ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_8 = \
-@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@	$(docbook_generated_man_pages)		\
-@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@	$(docbook_autogenerated_man_pages)
+@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@	$(man_pages)		\
+@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@	$(autogenerated_man_pages)
 
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -122,8 +122,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = nm-system-settings.conf.5 nm-online.1 nmcli.1 \
-	nmtui.1
+CONFIG_CLEAN_FILES = common.ent
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -173,15 +172,14 @@ am__uninstall_files_from_dir = { \
   }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(man8dir)"
+	"$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"
 man5dir = $(mandir)/man5
+man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/nm-online.1.in \
-	$(srcdir)/nm-system-settings.conf.5.in $(srcdir)/nmcli.1.in \
-	$(srcdir)/nmtui.1.in
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/common.ent.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -446,17 +444,14 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 with_valgrind = @with_valgrind@
-man_MANS = $(configure_generated_man_pages) $(am__append_4) \
-	$(am__append_6) $(am__append_8)
+man_MANS = $(am__append_4) $(am__append_6) $(am__append_8)
 CLEANFILES = NetworkManager.conf.xml $(am__append_1) $(am__append_5) \
 	$(am__append_7)
 EXTRA_DIST = NetworkManager.conf.xml.in $(am__append_3) \
 	nm-settings.xml nm-settings.xsl nm-settings-keyfile.xml \
 	nm-settings-keyfile.xsl nm-settings-ifcfg-rh.xml \
 	nm-settings-ifcfg-rh.xsl $(addsuffix .xml,$(basename \
-	$(docbook_generated_man_pages))) \
-	$(docbook_generated_man_pages) \
-	$(docbook_autogenerated_man_pages)
+	$(man_pages))) $(man_pages) $(autogenerated_man_pages)
 XSLTPROC = xsltproc
 XSLTPROC_FLAGS = --xinclude --nonet
 XSLTPROC_MAN_FLAGS = \
@@ -468,20 +463,22 @@ XSLTPROC_MAN_FLAGS = \
 	--stringparam man.copyright.section.enabled 0 \
 	http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
-configure_generated_man_pages = \
-	nmcli.1				\
-	nmtui.1				\
-	nm-online.1			\
-	nm-system-settings.conf.5
+man_pages = \
+	nmcli.1			\
+	nmtui.1			\
+	nm-online.1		\
+	NetworkManager.conf.5	\
+	nmcli-examples.7	\
+	NetworkManager.8
 
-docbook_generated_man_pages = \
-	NetworkManager.8		\
-	NetworkManager.conf.5		\
-	nmcli-examples.5
-
-docbook_autogenerated_man_pages = nm-settings.5 nm-settings-keyfile.5 \
+autogenerated_man_pages = nm-settings.5 nm-settings-keyfile.5 \
 	$(am__append_2)
-links = nmtui-edit nmtui-connect nmtui-hostname
+nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
+NetworkManager_conf_links = nm-system-settings.conf
+@ENABLE_GTK_DOC_TRUE@@INSTALL_PREGEN_MANPAGES_FALSE@install_manpages = true
+
+# Implement a || condition
+@INSTALL_PREGEN_MANPAGES_TRUE@install_manpages = true
 all: all-am
 
 .SUFFIXES:
@@ -514,13 +511,7 @@ $(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):
-nm-system-settings.conf.5: $(top_builddir)/config.status $(srcdir)/nm-system-settings.conf.5.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
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nmtui.1: $(top_builddir)/config.status $(srcdir)/nmtui.1.in
+common.ent: $(top_builddir)/config.status $(srcdir)/common.ent.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -614,6 +605,49 @@ uninstall-man5:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-man7: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man7dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.7[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man7:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man7dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.7[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
 install-man8: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
@@ -698,7 +732,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -769,7 +803,7 @@ install-info: install-info-am
 
 install-info-am:
 
-install-man: install-man1 install-man5 install-man8
+install-man: install-man1 install-man5 install-man7 install-man8
 
 install-pdf: install-pdf-am
 
@@ -800,7 +834,8 @@ ps-am:
 uninstall-am: uninstall-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
+uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
+	uninstall-man8
 
 .MAKE: install-am install-data-am install-strip uninstall-am
 
@@ -811,20 +846,27 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	install-data-hook install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-man1 install-man5 \
-	install-man8 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-hook \
-	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
+	install-man7 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-hook uninstall-man uninstall-man1 \
+	uninstall-man5 uninstall-man7 uninstall-man8
 
 .PRECIOUS: Makefile
 
 
-@ENABLE_GTK_DOC_TRUE@%.8: %.xml
+@ENABLE_GTK_DOC_TRUE@%.1: %.xml common.ent
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+@ENABLE_GTK_DOC_TRUE@%.5: %.xml common.ent
+@ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
+
+@ENABLE_GTK_DOC_TRUE@%.7: %.xml common.ent
 @ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
-@ENABLE_GTK_DOC_TRUE@%.5: %.xml
+@ENABLE_GTK_DOC_TRUE@%.8: %.xml common.ent
 @ENABLE_GTK_DOC_TRUE@	$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in
 	 $(AM_V_GEN)  sed \
@@ -835,35 +877,33 @@ NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in
 		$< >$@
 
 @BUILD_SETTING_DOCS_TRUE@nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml
-@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc \
-@BUILD_SETTING_DOCS_TRUE@		--output $@ \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam version $(NM_VERSION) \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam date "`date +'%d %B %Y'`" \
-@BUILD_SETTING_DOCS_TRUE@		$^
+@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc --output $@ $^
 
 @BUILD_SETTING_DOCS_TRUE@nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml
-@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc \
-@BUILD_SETTING_DOCS_TRUE@		--output $@ \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam version $(NM_VERSION) \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam date "`date +'%d %B %Y'`" \
-@BUILD_SETTING_DOCS_TRUE@		$^
+@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc --output $@ $^
 
 @BUILD_SETTING_DOCS_TRUE@nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml
-@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc \
-@BUILD_SETTING_DOCS_TRUE@		--output $@ \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam version $(NM_VERSION) \
-@BUILD_SETTING_DOCS_TRUE@		--stringparam date "`date +'%d %B %Y'`" \
-@BUILD_SETTING_DOCS_TRUE@		$^
+@BUILD_SETTING_DOCS_TRUE@	$(AM_V_GEN) xsltproc --output $@ $^
 
 install-data-hook:
-	for link in $(links); do \
-		ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
-	done
+	if test -n "$(install_manpages)"; then \
+		for link in $(nmtui_links); do \
+			ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
+		done; \
+		for link in $(NetworkManager_conf_links); do \
+			ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \
+		done; \
+	fi
 
 uninstall-hook:
-	for link in $(links); do \
-		rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
-	done
+	if test -n "$(install_manpages)"; then \
+		for link in $(nmtui_links); do \
+			rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
+		done; \
+		for link in $(NetworkManager_conf_links); do \
+			rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \
+		done; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 42768d74..35594cfe 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/29/2016
+.\"      Date: 04/05/2016
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.2
+.\"    Source: NetworkManager 1.1.93
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.1\&.93" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -301,7 +301,7 @@ to enable debug logging inside NetworkManager itself\&.
 .PP
 \fBNetworkManager.conf\fR(5),
 \fBnmcli\fR(1),
-\fBnmcli-examples\fR(5),
+\fBnmcli-examples\fR(7),
 \fBnm-online\fR(1),
 \fBnm-settings\fR(5),
 \fBnm-applet\fR(1),
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index d0f9acbb..72fbf38f 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,7 +2,7 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/29/2016
+.\"      Date: 04/05/2016
 .\"    Manual: Configuration
 .\"    Source: NetworkManager 1.2
 .\"  Language: English
@@ -109,7 +109,7 @@ keyfile\&.
 .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\&.
+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\&. Automatic reloading is not advised because there are race conditions involved and it depends on the way how the editor updates the file\&. In some situations, NetworkManager might first delete and add the connection anew, instead of updating the existing one\&. Also, NetworkManager might pick up incomplete settings while the user is still editing the files\&.
 .RE
 .PP
 \fIauth\-polkit\fR
@@ -898,7 +898,7 @@ interface\-name:vboxnet*,except:interface\-name:vboxnet2
 .PP
 \fBNetworkManager\fR(8),
 \fBnmcli\fR(1),
-\fBnmcli-examples\fR(5),
+\fBnmcli-examples\fR(7),
 \fBnm-online\fR(1),
 \fBnm-settings\fR(5),
 \fBnm-applet\fR(1),
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 597f373f..3427cd64 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -138,7 +138,13 @@ plugins-=remove-me
         the connection files at startup, and when explicitly requested
         via the ReloadConnections D-Bus call. If this key is set to
         '<literal>true</literal>', then NetworkManager will reload
-        connection files any time they changed.</para></listitem>
+        connection files any time they changed.
+        Automatic reloading is not advised because there are race conditions
+        involved and it depends on the way how the editor updates the file.
+        In some situations, NetworkManager might first delete and add the
+        connection anew, instead of updating the existing one. Also, NetworkManager
+        might pick up incomplete settings while the user is still editing the files.
+        </para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>auth-polkit</varname></term>
@@ -1004,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
     <para>
       <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 2a847f8f..2736065e 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -138,7 +138,13 @@ plugins-=remove-me
         the connection files at startup, and when explicitly requested
         via the ReloadConnections D-Bus call. If this key is set to
         '<literal>true</literal>', then NetworkManager will reload
-        connection files any time they changed.</para></listitem>
+        connection files any time they changed.
+        Automatic reloading is not advised because there are race conditions
+        involved and it depends on the way how the editor updates the file.
+        In some situations, NetworkManager might first delete and add the
+        connection anew, instead of updating the existing one. Also, NetworkManager
+        might pick up incomplete settings while the user is still editing the files.
+        </para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>auth-polkit</varname></term>
@@ -1004,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
     <para>
       <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 39dfe484..3c4b733e 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml version='1.0'?>
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
 
 <!--
  Copyright 2005 - 2014 Red Hat, Inc.
@@ -19,7 +22,7 @@
     <manvolnum>8</manvolnum>
     <refmiscinfo class="source">NetworkManager</refmiscinfo>
     <refmiscinfo class="manual">Network management daemons</refmiscinfo>
-    <refmiscinfo class="version">1.2</refmiscinfo>
+    <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -455,7 +458,7 @@
     <para>
       <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/common.ent.in b/man/common.ent.in
new file mode 100644
index 00000000..cd43b8d8
--- /dev/null
+++ b/man/common.ent.in
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!ENTITY NM_VERSION "@NM_VERSION@">
diff --git a/man/nm-online.1 b/man/nm-online.1
new file mode 100644
index 00000000..94e6406c
--- /dev/null
+++ b/man/nm-online.1
@@ -0,0 +1,96 @@
+'\" t
+.\"     Title: nm-online
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 04/05/2016
+.\"    Manual: General Commands Manual
+.\"    Source: NetworkManager 1.1.93
+.\"  Language: English
+.\"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.1\&.93" "General Commands Manual"
+.\" -----------------------------------------------------------------
+.\" * 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-online \- ask NetworkManager whether the network is connected
+.SH "SYNOPSIS"
+.HP \w'\fBnm\-online\fR\ 'u
+\fBnm\-online\fR [\fIOPTIONS\fR...]
+.SH "DESCRIPTION"
+.PP
+\fBnm\-online\fR
+is a utility to find out whether we are online\&. It is done by asking NetworkManager about its status\&. When run,
+\fBnm\-online\fR
+waits until NetworkManager reports an active connection, or specified timeout expires\&. On exit, the returned status code should be checked (see the return codes below)\&.
+.PP
+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\*(Aqs 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"
+.PP
+\fB\-t\fR | \fB\-\-timeout\fR \fIseconds\fR
+.RS 4
+Time to wait for a connection, in seconds\&. If the option is not provided, the default timeout is 30 seconds\&.
+.RE
+.PP
+\fB\-x\fR | \fB\-\-exit\fR
+.RS 4
+Exit immediately if NetworkManager is not running or connecting\&.
+.RE
+.PP
+\fB\-q\fR | \fB\-\-quiet\fR
+.RS 4
+Don\*(Aqt print anything\&.
+.RE
+.PP
+\fB\-s\fR | \fB\-\-wait\-for\-startup\fR
+.RS 4
+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,
+\fBnm\-online \-s\fR
+will just return immediately, regardless of the current network state\&.)
+.RE
+.SH "EXIT STATUS"
+.PP
+\fBnm\-online\fR
+exits with status 0 if it succeeds, a value greater than 0 is returned if an error occurs\&.
+.PP
+\fB0\fR
+.RS 4
+Success \(en already online or connection established within given timeout\&.
+.RE
+.PP
+\fB1\fR
+.RS 4
+Offline or not online within given timeout\&.
+.RE
+.PP
+\fB2\fR
+.RS 4
+Unknown or unspecified error\&.
+.RE
+.SH "SEE ALSO"
+.PP
+\fBnmcli\fR(1),
+\fBNetworkManager\fR(8)\&.
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
deleted file mode 100644
index fbec3716..00000000
--- a/man/nm-online.1.in
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" nm-online (1) manual page
-.\"
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public Licence along
-.\" 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 - 2014 Red Hat, Inc.
-.\"
-.TH NM-ONLINE "1" "2014-03-25" "NetworkManager 1.2"
-
-.SH NAME
-nm-online \- ask NetworkManager whether the network is connected
-.SH SYNOPSIS
-.B nm-online
-.RI " [ " OPTIONS " ]
-
-.SH DESCRIPTION
-.B nm-online
-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>
-Time to wait for a connection, in seconds.  If the option is not provided,
-the default timeout is 30 seconds.
-.TP
-.B \-x, \-\-exit
-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
-
-.IP "0" 4
-Success - already online or connection established within given timeout
-.IP "1" 4
-Offline or not online within given timeout
-.IP "2" 4
-Unspecified error
-
-.SH SEE ALSO
-.BR nmcli (1),
-.BR NetworkManager(8).
diff --git a/man/nm-online.xml b/man/nm-online.xml
new file mode 100644
index 00000000..f1f7a0d4
--- /dev/null
+++ b/man/nm-online.xml
@@ -0,0 +1,171 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
+
+<!--
+  nm-online(1) manual page
+
+  This is free documentation; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License, or (at your option) any later version.
+
+  The GNU General Public License's references to "object code"
+  and "executables" are to be interpreted as the output of any
+  document formatting or typesetting system, including
+  intermediate and printed output.
+
+  This manual is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public Licence along
+  with this manual; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+  Copyright 2010 - 2016 Red Hat, Inc.
+-->
+
+<refentry id='nm-online'>
+
+  <refentryinfo>
+    <title>nm-online</title>
+    <author>NetworkManager developers</author>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>nm-online</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="source">NetworkManager</refmiscinfo>
+    <refmiscinfo class="manual">General Commands Manual</refmiscinfo>
+    <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>nm-online</refname>
+    <refpurpose>ask NetworkManager whether the network is connected</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>nm-online</command>
+      <arg choice="opt" rep="repeat"><replaceable>OPTIONS</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'><title>Description</title>
+    <para><command>nm-online</command> is a utility to find out whether we are
+    online. It is done by asking NetworkManager about its status. When run,
+    <command>nm-online</command> waits until NetworkManager reports an active
+    connection, or specified timeout expires. On exit, the returned status code
+    should be checked (see the return codes below).</para>
+
+    <para>By default NetworkManager waits for IPv4 dynamic addressing to complete
+    but does not wait for the <literal>auto</literal> IPv6 dynamic addressing. To
+    wait for IPv6 addressing to complete, either (1) change the network
+    connection's IPv6 <literal>may-fail</literal> setting to <literal>no</literal>,
+    and/or (2) change the IPv6 addressing method to <literal>manual</literal> or
+    <literal>dhcp</literal>, to indicate that IPv6 connectivity is expected.</para>
+  </refsect1>
+
+  <refsect1 id='options'><title>Options</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <group choice='plain'>
+            <arg choice='plain'><option>-t</option></arg>
+            <arg choice='plain'><option>--timeout</option></arg>
+          </group>
+          <arg choice='plain'><replaceable>seconds</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Time to wait for a connection, in seconds. If the option is not provided,
+          the default timeout is 30 seconds.</para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-x</option></arg>
+          <arg choice='plain'><option>--exit</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Exit immediately if NetworkManager is not running or connecting.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-q</option></arg>
+          <arg choice='plain'><option>--quiet</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Don't print anything.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-s</option></arg>
+          <arg choice='plain'><option>--wait-for-startup</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>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,
+          <command>nm-online -s</command> will just return immediately, regardless of the
+          current network state.)</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='exit_status'><title>Exit Status</title>
+
+    <para><command>nm-online</command> exits with status 0 if it succeeds, a value
+    greater than 0 is returned if an error occurs.</para>
+
+    <variablelist spacing='compact' termlength='3'>
+      <varlistentry>
+        <term><errorcode>0</errorcode></term>
+        <listitem>
+          <para>Success &ndash; already online or connection established within given timeout.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>1</errorcode></term>
+        <listitem>
+          <para>Offline or not online within given timeout.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>2</errorcode></term>
+        <listitem>
+          <para>Unknown or unspecified error.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='see_also'><title>See Also</title>
+    <para><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+  </refsect1>
+
+</refentry>
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 7b848128..6eef8eb8 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: nm-settings-ifcfg-rh
-.\"    Author: [see the "AUTHOR" section]
+.\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 29 March 2016
+.\"      Date: 04/05/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.92
+.\"    Source: NetworkManager 1.1.93
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.93" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -312,7 +312,7 @@ is used, NetworkManager assigns the interface 10\&.42\&.0\&.1, or it uses the fi
 .PP
 See the next section for detailed mapping of NetworkManager properties and
 \fIifcfg\-rh\fR
-variables\&. Variable names, format and usage differences in NetworkManager and initscripts are documented in the tables bellow\&.
+variables\&. Variable names, format and usage differences in NetworkManager and initscripts are documented in the tables below\&.
 .SH "DETAILS"
 .PP
 \fIifcfg\-rh\fR
@@ -2581,9 +2581,6 @@ ask
 unused
 \- 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/sysconfig/network\-scripts/ifcfg\-*
@@ -2597,6 +2594,9 @@ NetworkManager developers
 /usr/share/doc/initscripts/sysconfig\&.txt
 .SH "SEE ALSO"
 .PP
-https://developer\&.gnome\&.org/NetworkManager/unstable/ref\-settings\&.html
-.PP
-nm\-settings(5), nm\-settings\-keyfile(5), NetworkManager(8), NetworkManager\&.conf(5), nmcli(1), nmcli\-examples(5)
+\fBnm-settings\fR(5),
+\fBnm-settings-keyfile\fR(5),
+\fBNetworkManager\fR(8),
+\fBNetworkManager.conf\fR(5),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(7)
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index ef8e1df9..02b6bb14 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-ifcfg-rh"><refentryinfo><date>29 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.92</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para>
+<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.93</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -19,7 +19,7 @@
           The main reason for using <emphasis>ifcfg-rh</emphasis> plugin is the compatibility
           with legacy configurations for <emphasis>ifup</emphasis> and <emphasis>ifdown</emphasis>
           (initscripts).
-        </para></refsect1><refsect1><title>File Format</title><para>
+        </para></refsect1><refsect1 id="file_format"><title>File Format</title><para>
           The <emphasis>ifcfg-rh</emphasis> config format is a simple text file containing
           VARIABLE="value" lines. The format is described in <filename>sysconfig.txt</filename>
           of <emphasis>initscripts</emphasis> package. Note that the configuration files
@@ -131,7 +131,7 @@ DEVICETYPE=TeamPort
             The UUID values in the config files must be unique. You can use <emphasis>uuidgen</emphasis>
             command line tool to generate such values. Alternatively, you can leave out UUID
             entirely. In that case NetworkManager will generate a UUID based on the file name.
-          </para></formalpara></refsect1><refsect1><title>Differences against initscripts</title><para>
+          </para></formalpara></refsect1><refsect1 id="differences_against_initscripts"><title>Differences against initscripts</title><para>
           The main differences of NetworkManager ifcfg-rh plugin and traditional
           initscripts are:
           <variablelist class="NM-initscripts-differences"><varlistentry><term><emphasis role="bold">NM_CONTROLLED=yes|no</emphasis></term><listitem><para>
@@ -164,8 +164,8 @@ DEVICETYPE=TeamPort
                     if configured.</para></listitem></itemizedlist></para></listitem></varlistentry></variablelist></para><para>
           See the next section for detailed mapping of NetworkManager properties and
           <emphasis>ifcfg-rh</emphasis> variables. Variable names, format and usage
-          differences in NetworkManager and initscripts are documented in the tables bellow.
-        </para></refsect1><refsect1><title>DETAILS</title><para><emphasis>ifcfg-rh</emphasis> plugin variables marked with <emphasis>(+)</emphasis>
+          differences in NetworkManager and initscripts are documented in the tables below.
+        </para></refsect1><refsect1 id="details"><title>Details</title><para><emphasis>ifcfg-rh</emphasis> plugin variables marked with <emphasis>(+)</emphasis>
           are NetworkManager specific extensions not understood by traditional initscripts.
         </para><table><title>802-1x setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">eap</entry><entry align="left">IEEE_8021X_EAP_METHODS<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">EAP method for 802.1X authentication.<emphasis role="bold">
 
@@ -367,4 +367,9 @@ Allowed values: </emphasis>default, never, always</entry></row><row><entry align
               and storing this secret; when it is required, agents will be asked to provide it.</para></listitem><listitem><para><literal>ask</literal> - the associated password is not saved but it will be
               requested from the user each time it is required.</para></listitem><listitem><para><literal>unused</literal> - 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.</para></listitem></itemizedlist></refsect2></refsect1><refsect1><title>AUTHOR</title><para><author><firstname>NetworkManager developers</firstname></author></para></refsect1><refsect1><title>FILES</title><para><filename>/etc/sysconfig/network-scripts/ifcfg-*</filename></para><para><filename>/etc/sysconfig/network-scripts/keys-*</filename></para><para><filename>/etc/sysconfig/network-scripts/route-*</filename></para><para><filename>/etc/sysconfig/network-scripts/route6-*</filename></para><para><filename>/usr/share/doc/initscripts/sysconfig.txt</filename></para></refsect1><refsect1><title>SEE ALSO</title><para>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</para><para>nm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</para></refsect1></refentry>
+              not be requested from the user.</para></listitem></itemizedlist></refsect2></refsect1><refsect1 id="files"><title>Files</title><para><filename>/etc/sysconfig/network-scripts/ifcfg-*</filename></para><para><filename>/etc/sysconfig/network-scripts/keys-*</filename></para><para><filename>/etc/sysconfig/network-scripts/route-*</filename></para><para><filename>/etc/sysconfig/network-scripts/route6-*</filename></para><para><filename>/usr/share/doc/initscripts/sysconfig.txt</filename></para></refsect1><refsect1 id="see_also"><title>See Also</title><para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para></refsect1></refentry>
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index c648e65f..5a9f8d6a 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE stylesheet [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -12,28 +16,25 @@
       doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
       />
 
-  <xsl:param name="date"/>
-  <xsl:param name="version"/>
-
   <xsl:template match="nm-ifcfg-rh-docs">
     <xsl:variable name="unsupported" select="'adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn'"/>
     <refentry id="nm-settings-ifcfg-rh">
       <refentryinfo>
-        <date><xsl:value-of select="$date"/></date>
+        <title>nm-settings-ifcfg-rh</title>
+        <author>NetworkManager developers</author>
       </refentryinfo>
       <refmeta>
         <refentrytitle>nm-settings-ifcfg-rh</refentrytitle>
         <manvolnum>5</manvolnum>
         <refmiscinfo class="source">NetworkManager</refmiscinfo>
         <refmiscinfo class="manual">Configuration</refmiscinfo>
-        <refmiscinfo class="version"><xsl:value-of select="$version"/></refmiscinfo>
+        <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
       </refmeta>
       <refnamediv>
         <refname>nm-settings-ifcfg-rh</refname>
         <refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose>
       </refnamediv>
-      <refsect1>
-        <title>DESCRIPTION</title>
+      <refsect1 id='description'><title>Description</title>
         <para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle>
@@ -58,8 +59,7 @@
           (initscripts).
         </para>
       </refsect1>
-      <refsect1>
-        <title>File Format</title>
+      <refsect1 id='file_format'><title>File Format</title>
         <para>
           The <emphasis>ifcfg-rh</emphasis> config format is a simple text file containing
           VARIABLE="value" lines. The format is described in <filename>sysconfig.txt</filename>
@@ -205,8 +205,7 @@ DEVICETYPE=TeamPort
         </formalpara>
       </refsect1>
 
-      <refsect1>
-        <title>Differences against initscripts</title>
+      <refsect1 id='differences_against_initscripts'><title>Differences against initscripts</title>
         <para>
           The main differences of NetworkManager ifcfg-rh plugin and traditional
           initscripts are:
@@ -266,12 +265,11 @@ DEVICETYPE=TeamPort
         <para>
           See the next section for detailed mapping of NetworkManager properties and
           <emphasis>ifcfg-rh</emphasis> variables. Variable names, format and usage
-          differences in NetworkManager and initscripts are documented in the tables bellow.
+          differences in NetworkManager and initscripts are documented in the tables below.
         </para>
       </refsect1>
 
-      <refsect1>
-      <title>DETAILS</title>
+      <refsect1 id='details'><title>Details</title>
         <para>
           <emphasis>ifcfg-rh</emphasis> plugin variables marked with <emphasis>(+)</emphasis>
           are NetworkManager specific extensions not understood by traditional initscripts.
@@ -305,26 +303,20 @@ DEVICETYPE=TeamPort
         </refsect2>
       </refsect1>
 
-      <refsect1>
-        <title>AUTHOR</title>
-        <para>
-          <author>
-            <firstname>NetworkManager developers</firstname>
-          </author>
-        </para>
-      </refsect1>
-      <refsect1>
-        <title>FILES</title>
+      <refsect1 id='files'><title>Files</title>
         <para><filename>/etc/sysconfig/network-scripts/ifcfg-*</filename></para>
         <para><filename>/etc/sysconfig/network-scripts/keys-*</filename></para>
         <para><filename>/etc/sysconfig/network-scripts/route-*</filename></para>
         <para><filename>/etc/sysconfig/network-scripts/route6-*</filename></para>
         <para><filename>/usr/share/doc/initscripts/sysconfig.txt</filename></para>
       </refsect1>
-      <refsect1>
-        <title>SEE ALSO</title>
-        <para>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</para>
-        <para>nm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</para>
+      <refsect1 id='see_also'><title>See Also</title>
+        <para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para>
       </refsect1>
     </refentry>
   </xsl:template>
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index ef5069ff..aa258355 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: nm-settings-keyfile
-.\"    Author: [see the "AUTHOR" section]
+.\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 29 March 2016
+.\"      Date: 04/05/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.92
+.\"    Source: NetworkManager 1.1.93
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
+.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.93" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,7 +46,7 @@ The
 \fIkeyfile\fR
 config format is a simple \&.ini\-style format\&. It consists of sections (groups) of key\-value pairs\&. Each section corresponds to a setting name as described in the settings specification (\fBnm-settings\fR(5))\&. Each configuration key/value pair in the section is one of the properties listed in the settings specification\&. The majority of properties of the specification is written in the same format into the
 \fIkeyfile\fR
-too\&. However some values are inconvenient for people to use\&. These are stored in the files in more readable ways\&. These properties are described bellow\&. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1\&.2\&.3\&.4/12 1\&.2\&.3\&.254"\&. More information of the generic key file format can be found at
+too\&. However some values are inconvenient for people to use\&. These are stored in the files in more readable ways\&. These properties are described below\&. An example could be IP addresses that are not written as integer arrays, but more reasonably as "1\&.2\&.3\&.4/12 1\&.2\&.3\&.254"\&. More information of the generic key file format can be found at
 \m[blue]\fBGLib key file format\fR\m[]\&\s-2\u[1]\d\s+2
 (Lines beginning with a \*(Aq#\*(Aq are comments, lists are separated by character
 ;
@@ -207,7 +207,7 @@ id=4
 \fIkeyfile\fR
 plugin variables for the majority of NetworkManager properties have one\-to\-one mapping\&. It means a NetworkManager property is stored in the keyfile as a variable of the same name and in the same format\&. There are several exceptions to this rule, mainly for making keyfile syntax easier for humans\&. The exceptions handled specially by
 \fIkeyfile\fR
-plugin are listed bellow\&. Refer to
+plugin are listed below\&. Refer to
 \fBnm-settings\fR(5)
 for all available settings and properties and their description\&.
 .PP
@@ -251,7 +251,7 @@ mac\-address
 T}:T{
 mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 MAC address in traditional hex\-digits\-and\-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)\fB
 
@@ -284,7 +284,7 @@ mac\-address
 T}:T{
 mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 MAC address in traditional hex\-digits\-and\-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)\fB
 
@@ -535,7 +535,7 @@ mac\-address
 T}:T{
 mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;162)
 T}
@@ -544,7 +544,7 @@ cloned\-mac\-address
 T}:T{
 cloned\-mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 Cloned MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;178)\&.
 T}
@@ -600,7 +600,7 @@ mac\-address
 T}:T{
 mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;162)\&.
 T}
@@ -609,7 +609,7 @@ cloned\-mac\-address
 T}:T{
 cloned\-mac\-address
 T}:T{
-ususal hex\-digits\-and\-colons notation
+usual hex\-digits\-and\-colons notation
 T}:T{
 Cloned MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;178)\&.
 T}
@@ -679,17 +679,17 @@ variable is a decimal number (0 \- 7) defined as a sum of the following values:
 .\}
 4 \- (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/*
 .SH "SEE ALSO"
 .PP
-https://developer\&.gnome\&.org/NetworkManager/unstable/ref\-settings\&.html
-.PP
-nm\-settings(5), nm\-settings\-ifcfg\-rh(5), NetworkManager(8), NetworkManager\&.conf(5), nmcli(1), nmcli\-examples(5)
+\fBnm-settings\fR(5),
+\fBnm-settings-ifcfg-rh\fR(5),
+\fBNetworkManager\fR(8),
+\fBNetworkManager.conf\fR(5),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(7)
 .SH "NOTES"
 .IP " 1." 4
 GLib key file format
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index d8cdfe21..fe3c4423 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-keyfile"><refentryinfo><date>29 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.92</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para>
+<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.93</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -14,7 +14,7 @@
           For security, it will ignore files that are readable or writable by any user
           or group other than 'root' since private keys and passphrases may be stored
           in plaintext inside the file.
-        </para></refsect1><refsect1><title>File Format</title><para>
+        </para></refsect1><refsect1 id="file_format"><title>File Format</title><para>
           The <emphasis>keyfile</emphasis> config format is a simple .ini-style
           format. It consists of sections (groups) of key-value pairs. Each section
           corresponds to a setting name as described in the settings specification
@@ -23,7 +23,7 @@
           specification. The majority of properties of the specification is written
           in the same format into the <emphasis>keyfile</emphasis> too. However
           some values are inconvenient for people to use. These are stored in the
-          files in more readable ways. These properties are described bellow.
+          files in more readable ways. These properties are described below.
           An example could be IP addresses that are not written as integer arrays,
           but more reasonably as "1.2.3.4/12 1.2.3.254".
           More information of the generic key file format can be found at
@@ -122,12 +122,12 @@ type=vlan
 interface-name=VLAN-4A
 parent=eth0
 id=4
-            </programlisting></para></formalpara></refsect1><refsect1><title>DETAILS</title><para><emphasis>keyfile</emphasis> plugin variables for the majority of NetworkManager
+            </programlisting></para></formalpara></refsect1><refsect1 id="details"><title>Details</title><para><emphasis>keyfile</emphasis> plugin variables for the majority of NetworkManager
           properties have one-to-one mapping. It means a NetworkManager property is stored
           in the keyfile as a variable of the same name and in the same format.
           There are several exceptions to this rule, mainly for making keyfile syntax easier
           for humans. The exceptions handled specially by <emphasis>keyfile</emphasis>
-          plugin are listed bellow. Refer to
+          plugin are listed below. Refer to
           <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>
           for all available settings and properties and their description.
         </para><formalpara><title>Name aliases</title><para>
@@ -140,7 +140,7 @@ id=4
 
 
 <table><title>bridge setting (section)</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Keyfile Variable</entry><entry>Format</entry><entry>Description</entry></row></thead><tbody>
-<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)<emphasis role="bold">
+<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)<emphasis role="bold">
 
 Example: </emphasis>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;162;</entry></row>
 </tbody></tgroup></table>
@@ -150,7 +150,7 @@ Example: </emphasis>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;16
 
 
 <table><title>infiniband setting (section)</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Keyfile Variable</entry><entry>Format</entry><entry>Description</entry></row></thead><tbody>
-<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)<emphasis role="bold">
+<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)<emphasis role="bold">
 
 Example: </emphasis>mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01</entry></row>
 </tbody></tgroup></table>
@@ -208,8 +208,8 @@ Example: </emphasis>password=Popocatepetl</entry></row>
 
 
 <table><title>802-3-ethernet setting (section)</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Keyfile Variable</entry><entry>Format</entry><entry>Description</entry></row></thead><tbody>
-<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)</entry></row>
-<row><entry align="left">cloned-mac-address</entry><entry align="left">cloned-mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</entry></row>
+<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)</entry></row>
+<row><entry align="left">cloned-mac-address</entry><entry align="left">cloned-mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</entry></row>
 <row><entry align="left">mac-address-blacklist</entry><entry align="left">mac-address-blacklist</entry><entry align="left">list of MACs (separated with semicolons)</entry><entry align="left">MAC address blacklist.<emphasis role="bold">
 
 Example: </emphasis>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</entry></row>
@@ -219,8 +219,8 @@ Example: </emphasis>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</
 <row><entry align="left">ssid</entry><entry align="left">ssid</entry><entry align="left">string (or decimal-byte list - obsolete)</entry><entry align="left">SSID of Wi-Fi network.<emphasis role="bold">
 
 Example: </emphasis>ssid=Quick Net</entry></row>
-<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</entry></row>
-<row><entry align="left">cloned-mac-address</entry><entry align="left">cloned-mac-address</entry><entry align="left">ususal hex-digits-and-colons notation</entry><entry align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</entry></row>
+<row><entry align="left">mac-address</entry><entry align="left">mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</entry></row>
+<row><entry align="left">cloned-mac-address</entry><entry align="left">cloned-mac-address</entry><entry align="left">usual hex-digits-and-colons notation</entry><entry align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</entry></row>
 <row><entry align="left">mac-address-blacklist</entry><entry align="left">mac-address-blacklist</entry><entry align="left">list of MACs (separated with semicolons)</entry><entry align="left">MAC address blacklist.<emphasis role="bold">
 
 Example: </emphasis>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</entry></row>
@@ -234,4 +234,9 @@ Example: </emphasis>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</
               and storing this secret; when it is required, agents will be asked to provide it.</para></listitem><listitem><para>2 - (not-saved) - this secret should not be saved but should be requested
               from the user each time it is required.</para></listitem><listitem><para>4 - (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.</para></listitem></itemizedlist></refsect2></refsect1><refsect1><title>AUTHOR</title><para><author><firstname>NetworkManager developers</firstname></author></para></refsect1><refsect1><title>FILES</title><para><filename>/etc/NetworkManager/system-connections/*</filename></para></refsect1><refsect1><title>SEE ALSO</title><para>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</para><para>nm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</para></refsect1></refentry>
+              and should not be requested from the user.</para></listitem></itemizedlist></refsect2></refsect1><refsect1 id="files"><title>Files</title><para><filename>/etc/NetworkManager/system-connections/*</filename></para></refsect1><refsect1 id="see_also"><title>See Also</title><para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para></refsect1></refentry>
diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl
index 980a573c..41e7dcdb 100644
--- a/man/nm-settings-keyfile.xsl
+++ b/man/nm-settings-keyfile.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE stylesheet [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -8,27 +12,24 @@
       doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
       />
 
-  <xsl:param name="date"/>
-  <xsl:param name="version"/>
-
   <xsl:template match="nm-keyfile-docs">
     <refentry id="nm-settings-keyfile">
       <refentryinfo>
-        <date><xsl:value-of select="$date"/></date>
+        <title>nm-settings-keyfile</title>
+        <author>NetworkManager developers</author>
       </refentryinfo>
       <refmeta>
         <refentrytitle>nm-settings-keyfile</refentrytitle>
         <manvolnum>5</manvolnum>
         <refmiscinfo class="source">NetworkManager</refmiscinfo>
         <refmiscinfo class="manual">Configuration</refmiscinfo>
-        <refmiscinfo class="version"><xsl:value-of select="$version"/></refmiscinfo>
+        <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
       </refmeta>
       <refnamediv>
         <refname>nm-settings-keyfile</refname>
         <refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose>
       </refnamediv>
-      <refsect1>
-        <title>DESCRIPTION</title>
+      <refsect1 id='description'><title>Description</title>
         <para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle>
@@ -48,8 +49,7 @@
           in plaintext inside the file.
         </para>
       </refsect1>
-      <refsect1>
-        <title>File Format</title>
+      <refsect1 id='file_format'><title>File Format</title>
         <para>
           The <emphasis>keyfile</emphasis> config format is a simple .ini-style
           format. It consists of sections (groups) of key-value pairs. Each section
@@ -60,7 +60,7 @@
           specification. The majority of properties of the specification is written
           in the same format into the <emphasis>keyfile</emphasis> too. However
           some values are inconvenient for people to use. These are stored in the
-          files in more readable ways. These properties are described bellow.
+          files in more readable ways. These properties are described below.
           An example could be IP addresses that are not written as integer arrays,
           but more reasonably as "1.2.3.4/12 1.2.3.254".
           More information of the generic key file format can be found at
@@ -187,15 +187,14 @@ id=4
         </formalpara>
       </refsect1>
 
-      <refsect1>
-        <title>DETAILS</title>
+      <refsect1 id='details'><title>Details</title>
         <para>
           <emphasis>keyfile</emphasis> plugin variables for the majority of NetworkManager
           properties have one-to-one mapping. It means a NetworkManager property is stored
           in the keyfile as a variable of the same name and in the same format.
           There are several exceptions to this rule, mainly for making keyfile syntax easier
           for humans. The exceptions handled specially by <emphasis>keyfile</emphasis>
-          plugin are listed bellow. Refer to
+          plugin are listed below. Refer to
           <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>
           for all available settings and properties and their description.
         </para>
@@ -242,22 +241,17 @@ id=4
         </refsect2>
       </refsect1>
 
-      <refsect1>
-        <title>AUTHOR</title>
-        <para>
-          <author>
-            <firstname>NetworkManager developers</firstname>
-          </author>
-        </para>
-      </refsect1>
-      <refsect1>
-        <title>FILES</title>
+      <refsect1 id='files'><title>Files</title>
         <para><filename>/etc/NetworkManager/system-connections/*</filename></para>
       </refsect1>
-      <refsect1>
-        <title>SEE ALSO</title>
-        <para>https://developer.gnome.org/NetworkManager/unstable/ref-settings.html</para>
-        <para>nm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)</para>
+
+      <refsect1 id='see_also'><title>See Also</title>
+        <para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para>
       </refsect1>
     </refentry>
   </xsl:template>
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index d24d2fbe..d1c61ade 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: nm-settings
-.\"    Author: [see the "AUTHOR" section]
+.\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 29 March 2016
+.\"      Date: 04/05/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.92
+.\"    Source: NetworkManager 1.1.93
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.93" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -3849,16 +3849,13 @@ property is a bitfield that contains zero or more of the following values logica
 .\}
 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://wiki\&.gnome\&.org/Projects/NetworkManager/ConfigurationSpecification
-.PP
-NetworkManager(8), nmcli(1), nmcli\-examples(5), NetworkManager\&.conf(5)
+\fBNetworkManager\fR(8),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(7),
+\fBNetworkManager.conf\fR(5)
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 9b709621..b1ee7208 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings"><refentryinfo><date>29 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.92</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para>
+<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.93</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           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
@@ -412,4 +412,7 @@
               this secret; when it is required, agents will be asked to provide it.</para></listitem><listitem><para>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.</para></listitem><listitem><para>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.</para></listitem></itemizedlist></refsect2></refsect1><refsect1><title>AUTHOR</title><para><author><firstname>NetworkManager developers</firstname></author></para></refsect1><refsect1><title>FILES</title><para>/etc/NetworkManager/system-connections</para><para>or distro plugin-specific location</para></refsect1><refsect1><title>SEE ALSO</title><para>https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification</para><para>NetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5)</para></refsect1></refentry>
+              is required or not. This flag hints that the secret is not required and should not be requested from the user.</para></listitem></itemizedlist></refsect2></refsect1><refsect1 id="files"><title>Files</title><para><filename>/etc/NetworkManager/system-connections</filename> or distro plugin-specific location</para></refsect1><refsect1 id="see_also"><title>See Also</title><para><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></para></refsect1></refentry>
diff --git a/man/nm-settings.xsl b/man/nm-settings.xsl
index b6f564c7..0fe4cabe 100644
--- a/man/nm-settings.xsl
+++ b/man/nm-settings.xsl
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE stylesheet [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
@@ -8,27 +12,25 @@
       doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
       />
 
-  <xsl:param name="date"/>
-  <xsl:param name="version"/>
-
   <xsl:template match="nm-setting-docs">
     <refentry id="nm-settings">
       <refentryinfo>
-        <date><xsl:value-of select="$date"/></date>
+        <title>nm-settings</title>
+        <author>NetworkManager developers</author>
       </refentryinfo>
       <refmeta>
         <refentrytitle>nm-settings</refentrytitle>
         <manvolnum>5</manvolnum>
         <refmiscinfo class="source">NetworkManager</refmiscinfo>
         <refmiscinfo class="manual">Configuration</refmiscinfo>
-        <refmiscinfo class="version"><xsl:value-of select="$version"/></refmiscinfo>
+        <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
       </refmeta>
       <refnamediv>
         <refname>nm-settings</refname>
         <refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose>
       </refnamediv>
-      <refsect1>
-        <title>DESCRIPTION</title>
+
+      <refsect1 id='description'><title>Description</title>
         <para>
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
@@ -109,23 +111,16 @@
           </itemizedlist>
         </refsect2>
       </refsect1>
-      <refsect1>
-        <title>AUTHOR</title>
-        <para>
-          <author>
-            <firstname>NetworkManager developers</firstname>
-          </author>
-        </para>
-      </refsect1>
-      <refsect1>
-        <title>FILES</title>
-        <para>/etc/NetworkManager/system-connections</para>
-        <para>or distro plugin-specific location</para>
+
+      <refsect1 id='files'><title>Files</title>
+        <para><filename>/etc/NetworkManager/system-connections</filename> or distro plugin-specific location</para>
       </refsect1>
-      <refsect1>
-        <title>SEE ALSO</title>
-        <para>https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification</para>
-        <para>NetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5)</para>
+
+      <refsect1 id='see_also'><title>See Also</title>
+        <para><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
       </refsect1>
     </refentry>
   </xsl:template>
diff --git a/man/nm-system-settings.conf.5.in b/man/nm-system-settings.conf.5.in
deleted file mode 100644
index 172db112..00000000
--- a/man/nm-system-settings.conf.5.in
+++ /dev/null
@@ -1,25 +0,0 @@
-.\" nm-system-settings.conf(5) manual page
-.\"
-.\" Copyright (C) 2010 Red Hat, Inc.
-.\"
-.TH "nm-system-settings.conf" "5" "1 February 2010" ""
-.SH NAME
-nm\-system\-settings.conf \- Deprecated NetworkManager configuration file
-.SH SYNOPSIS
-/etc/NetworkManager/nm\-system\-settings.conf
-.br
-or
-.br
-\fI<SYSCONFDIR>\fP/NetworkManager/nm\-system\-settings.conf
-.br
-where <SYSCONFDIR> depends on your distribution or build.
-.SH DESCRIPTION
-.P
-.I nm\-system\-settings.conf
-is a deprecated configuration file for \fBNetworkManager\fP (5).  While this
-file can still be used, NetworkManager now defaults to reading the config
-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).
diff --git a/man/nmcli-examples.5 b/man/nmcli-examples.7
index e25f8717..2bb5bb77 100644
--- a/man/nmcli-examples.5
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 19 November 2014
+.\"      Date: 04/05/2016
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.2
+.\"    Source: NetworkManager 1.1.93
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "5" "" "NetworkManager 1\&.2" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.1\&.93" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -51,18 +51,7 @@ Note: this page has "work\-in\-progress" status\&.
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli device wifi list
-      \fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
+\fB$ nmcli device wifi list\fR
 *  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
    netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
 *  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
@@ -75,7 +64,6 @@ $ nmcli device wifi list
    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
@@ -93,51 +81,40 @@ will show all of them\&.
 .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\&.IS\-SOFTWARE:                    no
-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
-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
-      
+\fB$ nmcli \-p \-f general,wifi\-properties device show wlan0\fR
+===========================================================================
+                        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/net/wlan0
+GENERAL\&.IP\-IFACE:         wlan0
+GENERAL\&.IS\-SOFTWARE:      no
+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
@@ -151,18 +128,7 @@ This command shows information about a Wi\-Fi device\&.
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli general permissions
-      \fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
+\fB$ nmcli general permissions\fR
 PERMISSION                                                VALUE
 org\&.freedesktop\&.NetworkManager\&.enable\-disable\-network     yes
 org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wifi        yes
@@ -175,7 +141,6 @@ 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
@@ -190,8 +155,8 @@ command can display description for polkit actions\&.
 .\}
 .nf
 \fB
-pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose
-      \fR
+  pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose
+        \fR
 .fi
 .if n \{\
 .RE
@@ -205,21 +170,12 @@ More information about polkit can be found at http://www\&.freedesktop\&.org/wik
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli general logging
-      \fR
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
+\fB$ nmcli general logging\fR
 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
-      
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,A
+UTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,
+WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DC
+B,DISPATCH
 .fi
 .if n \{\
 .RE
@@ -233,10 +189,8 @@ This command shows current NetworkManager logging status\&.
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli g log level DEBUG domains CORE,ETHER,IP
-$ nmcli g log level INFO domains DEFAULT
-      \fR
+\fB$ nmcli g log level DEBUG domains CORE,ETHER,IP\fR
+\fB$ nmcli g log level INFO domains DEFAULT\fR
 .fi
 .if n \{\
 .RE
@@ -252,11 +206,9 @@ manual page for available logging levels and domains\&.
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli con add type bond ifname mybond0 mode active\-backup
-$ nmcli con add type ethernet ifname eth1 master mybond0
-$ nmcli con add type ethernet ifname eth2 master mybond0
-      \fR
+\fB$ nmcli con add type bond ifname mybond0 mode active\-backup\fR
+\fB$ nmcli con add type ethernet ifname eth1 master mybond0\fR
+\fB$ nmcli con add type ethernet ifname eth2 master mybond0\fR
 .fi
 .if n \{\
 .RE
@@ -278,11 +230,9 @@ interface, the second to
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf
-$ nmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1
-$ nmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1
-      \fR
+\fB$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf\fR
+\fB$ nmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1\fR
+\fB$ nmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1\fR
 .fi
 .if n \{\
 .RE
@@ -307,10 +257,8 @@ will use its default configuration\&. You will activate the whole setup by activ
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli con up Team1\-slave1
-$ nmcli con up Team1\-slave2
-      \fR
+  \fB$ nmcli con up Team1\-slave1\fR
+  \fB$ nmcli con up Team1\-slave2\fR
 .fi
 .if n \{\
 .RE
@@ -324,12 +272,10 @@ By default, the created profiles are marked for auto\-activation\&. But if anoth
 .RS 4
 .\}
 .nf
-\fB
-$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge
-$ nmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge
-$ nmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge
-$ nmcli con modify TowerBridge bridge\&.stp no
-      \fR
+\fB$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge\fR
+\fB$ nmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge\fR
+\fB$ nmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge\fR
+\fB$ nmcli con modify TowerBridge bridge\&.stp no\fR
 .fi
 .if n \{\
 .RE
@@ -348,14 +294,12 @@ interface, the second to
 .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 +ipv4\&.dns 1\&.2\&.3\&.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
-      
+\fB$ nmcli con add con\-name my\-con\-em1 ifname em1 type ethernet \e
+  ip4 192\&.168\&.100\&.100/24 gw4 192\&.168\&.100\&.1 ip4 1\&.2\&.3\&.4 ip6 abbe::cafe\fR
+\fB$ nmcli con mod my\-con\-em1 ipv4\&.dns "8\&.8\&.8\&.8 8\&.8\&.4\&.4"\fR
+\fB$ nmcli con mod my\-con\-em1 +ipv4\&.dns 1\&.2\&.3\&.4\fR
+\fB$ nmcli con mod my\-con\-em1 ipv6\&.dns "2001:4860:4860::8888 2001:4860:4860::8844"\fR
+\fB$ nmcli \-p con show my\-con\-em1\fR
 .fi
 .if n \{\
 .RE
@@ -374,21 +318,12 @@ command displays the profile so that all parameters can be reviewed\&.
 .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
-      
+\fB$ nmcli \-t \-f general \-e yes \-m tab dev show eth0\fR
+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 reas
+on 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/NetworkMa
+nager/ActiveConnection/9
 .fi
 .if n \{\
 .RE
@@ -440,19 +375,7 @@ manual page for more information about NetworkManager dispatcher scripts\&.
 .RS 4
 .\}
 .nf
-        \fB
-$ nmcli connection edit type ethernet
-        \fR
-      
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
+\fB$ nmcli connection edit type ethernet\fR
 
 ===| nmcli interactive connection editor |===
 
@@ -461,72 +384,75 @@ 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\&.autoconnect\-priority:        0
-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\&.gateway:                           \-\-
-ipv4\&.routes:                            
-ipv4\&.route\-metric:                      \-1
-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\&.gateway:                           \-\-
-ipv6\&.routes:                            
-ipv6\&.route\-metric:                      \-1
-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
+You may edit the following settings: connection, 802\-3\-ethernet (ethernet),
+802\-1x, ipv4, ipv6, dcb
+nmcli> \fBprint\fR
+===========================================================================
+                          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\&.autoconnect\-priority:    0
+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\&.gateway:                       \-\-
+ipv4\&.routes:
+ipv4\&.route\-metric:                  \-1
+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\&.gateway:                       \-\-
+ipv6\&.routes:
+ipv6\&.route\-metric:                  \-1
+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> \fBgoto ethernet\fR
+You may edit the following properties: port, speed, duplex, auto\-negotiate,
+ mac\-address, cloned\-mac\-address, mac\-address\-blacklist, mtu, s390\-subchann
+els, s390\-nettype, s390\-options
 nmcli 802\-3\-ethernet> set mtu 1492
 nmcli 802\-3\-ethernet> b
-nmcli> goto ipv4\&.addresses
+nmcli> \fBgoto ipv4\&.addresses\fR
 nmcli ipv4\&.addresses> desc
 
 === [addresses] ===
@@ -547,135 +473,135 @@ nmcli ipv4\&.addresses> print
 addresses: 192\&.168\&.1\&.100/24
 nmcli ipv4\&.addresses> back
 nmcli ipv4> b
-nmcli> set ipv4\&.gateway 192\&.168\&.1\&.1
-nmcli> verify
+nmcli> \fBset ipv4\&.gateway 192\&.168\&.1\&.1\fR
+nmcli> \fBverify\fR
 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\&.autoconnect\-priority:        0
-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:                         192\&.168\&.1\&.100/24
-ipv4\&.gateway:                           192\&.168\&.1\&.1
-ipv4\&.routes:                            
-ipv4\&.route\-metric:                      \-1
-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\&.route\-metric:                      \-1
-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\&.autoconnect\-priority:        0
-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:                         192\&.168\&.1\&.100/24
-ipv4\&.gateway:                           192\&.168\&.1\&.1
-ipv4\&.routes:                            
-ipv4\&.route\-metric:                      \-1
-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\&.gateway:                           \-\-
-ipv6\&.routes:                            
-ipv6\&.route\-metric:                      \-1
-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
+nmcli> \fBprint\fR
+===========================================================================
+                          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\&.autoconnect\-priority:    0
+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:                     192\&.168\&.1\&.100/24
+ipv4\&.gateway:                       192\&.168\&.1\&.1
+ipv4\&.routes:
+ipv4\&.route\-metric:                  \-1
+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\&.route\-metric:                  \-1
+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> \fBset ipv4\&.dns 8\&.8\&.8\&.8 8\&.8\&.4\&.4\fR
+nmcli> \fBprint\fR
+===========================================================================
+                          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\&.autoconnect\-priority:    0
+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:                     192\&.168\&.1\&.100/24
+ipv4\&.gateway:                       192\&.168\&.1\&.1
+ipv4\&.routes:
+ipv4\&.route\-metric:                  \-1
+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\&.gateway:                       \-\-
+ipv6\&.routes:
+ipv6\&.route\-metric:                  \-1
+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> \fBverify\fR
 Verify connection: OK
-nmcli> save
-Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully saved\&.
-nmcli> quit
-      
+nmcli> \fBsave\fR
+Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully
+ saved\&.
+nmcli> \fBquit\fR
 .fi
 .if n \{\
 .RE
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 0ce7dc72..9c28e15f 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -1,6 +1,10 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
 
 <!--
 Copyright 2013 - 2014 Red Hat, Inc.
@@ -9,16 +13,15 @@ Copyright 2013 - 2014 Red Hat, Inc.
 <refentry id="nmcli-examples">
   <refentryinfo>
     <title>nmcli-examples</title>
-    <date>19 November 2014</date>
     <author>NetworkManager developers</author>
   </refentryinfo>
 
   <refmeta>
     <refentrytitle>nmcli-examples</refentrytitle>
-    <manvolnum>5</manvolnum>
+    <manvolnum>7</manvolnum>
     <refmiscinfo class="source">NetworkManager</refmiscinfo>
     <refmiscinfo class="manual">Examples</refmiscinfo>
-    <refmiscinfo class="version">1.2</refmiscinfo>
+    <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -51,10 +54,7 @@ Copyright 2013 - 2014 Red Hat, Inc.
     <title>Examples</title>
 
     <example><title>Listing available Wi-Fi APs</title>
-      <synopsis><emphasis role="bold">
-$ nmcli device wifi list
-      </emphasis></synopsis>
-      <screen>
+<screen><userinput>$ nmcli device wifi list</userinput>
 *  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
    netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
 *  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
@@ -66,63 +66,56 @@ $ nmcli device wifi list
    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
-      </screen>
+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2</screen>
+      <para>
+        This command shows how to list available Wi-Fi networks (APs). You can also use
+        <emphasis>--fields</emphasis> option for displaying different columns.
+        <emphasis role="bold">nmcli -f all dev wifi list</emphasis> will show all of them.
+      </para>
     </example>
-    <para>
-      This command shows how to list available Wi-Fi networks (APs). You can also use
-      <emphasis>--fields</emphasis> option for displaying different columns.
-      <emphasis role="bold">nmcli -f all dev wifi list</emphasis> will show all of them.
-    </para>
 
     <example><title>Showing general information and properties for a Wi-Fi interface</title>
-      <synopsis><emphasis role="bold">
-$ nmcli -p -f general,wifi-properties device show wlan0
-      </emphasis></synopsis>
-      <screen>
-===============================================================================
-                            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.IS-SOFTWARE:                    no
-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
--------------------------------------------------------------------------------
-      </screen>
+<screen><userinput>$ nmcli -p -f general,wifi-properties device show wlan0</userinput>
+===========================================================================
+                        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/net/wlan0
+GENERAL.IP-IFACE:         wlan0
+GENERAL.IS-SOFTWARE:      no
+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
+---------------------------------------------------------------------------</screen>
+      <para>
+        This command shows information about a Wi-Fi device.
+      </para>
     </example>
-    <para>
-      This command shows information about a Wi-Fi device.
-    </para>
 
     <example><title>Listing NetworkManager polkit permissions</title>
-      <synopsis><emphasis role="bold">
-$ nmcli general permissions
-      </emphasis></synopsis>
-      <screen>
+<screen><userinput>$ nmcli general permissions</userinput>
 PERMISSION                                                VALUE
 org.freedesktop.NetworkManager.enable-disable-network     yes
 org.freedesktop.NetworkManager.enable-disable-wifi        yes
@@ -134,151 +127,134 @@ 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
-      </screen>
+org.freedesktop.NetworkManager.settings.modify.hostname   auth</screen>
+      <para>
+        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.
+        <emphasis>pkaction</emphasis> command can display description for polkit actions.
+        <synopsis><command>
+  pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
+        </command></synopsis>
+        More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit.
+      </para>
     </example>
-    <para>
-      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.
-      <emphasis>pkaction</emphasis> command can display description for polkit actions.
-      <synopsis><command>
-pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
-      </command></synopsis>
-      More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit.
-    </para>
 
     <example><title>Listing NetworkManager log level and domains</title>
-      <synopsis><emphasis role="bold">
-$ nmcli general logging
-      </emphasis></synopsis>
-      <screen>
+<screen><userinput>$ nmcli general logging</userinput>
 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
-      </screen>
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,A
+UTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,
+WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DC
+B,DISPATCH</screen>
+      <para>
+        This command shows current NetworkManager logging status.
+      </para>
     </example>
-    <para>
-      This command shows current NetworkManager logging status.
-    </para>
 
     <example><title>Changing NetworkManager logging</title>
-      <synopsis><emphasis role="bold">
-$ nmcli g log level DEBUG domains CORE,ETHER,IP
-$ nmcli g log level INFO domains DEFAULT
-      </emphasis></synopsis>
+<screen><userinput>$ nmcli g log level DEBUG domains CORE,ETHER,IP</userinput>
+<userinput>$ nmcli g log level INFO domains DEFAULT</userinput></screen>
+      <para>
+        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
+        <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> manual page
+        for available logging levels and domains.
+      </para>
     </example>
-    <para>
-      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
-      <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> manual page
-      for available logging levels and domains.
-    </para>
 
     <example><title>Adding a bonding master and two slave connection profiles</title>
-      <synopsis><emphasis role="bold">
-$ nmcli con add type bond ifname mybond0 mode active-backup
-$ nmcli con add type ethernet ifname eth1 master mybond0
-$ nmcli con add type ethernet ifname eth2 master mybond0
-      </emphasis></synopsis>
+<screen><userinput>$ nmcli con add type bond ifname mybond0 mode active-backup</userinput>
+<userinput>$ nmcli con add type ethernet ifname eth1 master mybond0</userinput>
+<userinput>$ nmcli con add type ethernet ifname eth2 master mybond0</userinput></screen>
+      <para>
+        This example demonstrates adding a bond master connection and two slaves. The
+        first command adds a master bond connection, naming the bonding interface
+        <emphasis>mybond0</emphasis> and using <emphasis>active-backup</emphasis> mode.
+        The next two commands add slaves connections, both enslaved to <emphasis>mybond0</emphasis>.
+        The first slave will be bound to <emphasis>eth1</emphasis> interface, the second to
+        <emphasis>eth2</emphasis>.
+      </para>
     </example>
-    <para>
-      This example demonstrates adding a bond master connection and two slaves. The
-      first command adds a master bond connection, naming the bonding interface
-      <emphasis>mybond0</emphasis> and using <emphasis>active-backup</emphasis> mode.
-      The next two commands add slaves connections, both enslaved to <emphasis>mybond0</emphasis>.
-      The first slave will be bound to <emphasis>eth1</emphasis> interface, the second to
-      <emphasis>eth2</emphasis>. 
-    </para>
 
     <example><title>Adding a team master and two slave connection profiles</title>
-      <synopsis><emphasis role="bold">
-$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
-$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
-$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
-      </emphasis></synopsis>
+<screen><userinput>$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf</userinput>
+<userinput>$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1</userinput>
+<userinput>$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1</userinput></screen>
+      <para>
+        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 <emphasis>Team1</emphasis>. The team configuration
+        for the master is read from <emphasis>team1-master-json.conf</emphasis> file. Later, you can
+        change the configuration with <emphasis>modify</emphasis> command
+        (<emphasis role="bold">nmcli con modify Team1 team.config team1-master-another-json.conf</emphasis>).
+        The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>.
+        The first slave will be bound to <emphasis>em1</emphasis> interface, the second to
+        <emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus
+        <emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup
+        by activating both slaves:
+<screen>  <userinput>$ nmcli con up Team1-slave1</userinput>
+  <userinput>$ nmcli con up Team1-slave2</userinput></screen>
+        By default, the created profiles are marked for auto-activation. But if another
+        connection has been activated on the device, the new profile won't activate
+        automatically and you need to activate it manually.
+      </para>
     </example>
-    <para>
-      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 <emphasis>Team1</emphasis>. The team configuration
-      for the master is read from <emphasis>team1-master-json.conf</emphasis> file. Later, you can
-      change the configuration with <emphasis>modify</emphasis> command
-      (<emphasis role="bold">nmcli con modify Team1 team.config team1-master-another-json.conf</emphasis>).
-      The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>.
-      The first slave will be bound to <emphasis>em1</emphasis> interface, the second to
-      <emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus
-      <emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup
-      by activating both slaves:
-      <synopsis><emphasis role="bold">
-$ nmcli con up Team1-slave1
-$ nmcli con up Team1-slave2
-      </emphasis></synopsis>
-      By default, the created profiles are marked for auto-activation. But if another
-      connection has been activated on the device, the new profile won't activate
-      automatically and you need to activate it manually.
-    </para>
 
     <example><title>Adding a bridge and two slave profiles</title>
-      <synopsis><emphasis role="bold">
-$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
-$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
-$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
-$ nmcli con modify TowerBridge bridge.stp no
-      </emphasis></synopsis>
+<screen><userinput>$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge</userinput>
+<userinput>$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge</userinput>
+<userinput>$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge</userinput>
+<userinput>$ nmcli con modify TowerBridge bridge.stp no</userinput></screen>
+      <para>
+        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 <emphasis>TowerBridge</emphasis>.
+        The next two commands add slaves profiles, both will be enslaved to
+        <emphasis>TowerBridge</emphasis>.
+        The first slave will be tied to <emphasis>ens3</emphasis> interface, the second to
+        <emphasis>ens4</emphasis>.
+        The last command will disable 802.1D STP for the TowerBridge profile.
+      </para>
     </example>
-    <para>
-      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 <emphasis>TowerBridge</emphasis>.
-      The next two commands add slaves profiles, both will be enslaved to
-      <emphasis>TowerBridge</emphasis>.
-      The first slave will be tied to <emphasis>ens3</emphasis> interface, the second to
-      <emphasis>ens4</emphasis>. 
-      The last command will disable 802.1D STP for the TowerBridge profile.
-    </para>
 
     <example><title>Adding an ethernet connection profile with manual IP configuration</title>
-      <synopsis>
-        <emphasis role="bold">
-$ 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 +ipv4.dns 1.2.3.4
-$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
-$ nmcli -p con show my-con-em1
-        </emphasis>
-      </synopsis>
+<screen><userinput>$ 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</userinput>
+<userinput>$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"</userinput>
+<userinput>$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4</userinput>
+<userinput>$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"</userinput>
+<userinput>$ nmcli -p con show my-con-em1</userinput></screen>
+      <para>
+        The first command adds an Ethernet connection profile named <emphasis>my-con-em1</emphasis>
+        that is bound to interface name <emphasis>em1</emphasis>. 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 will become the default route if this profile is activated on em1 interface
+        (and there is no connection with higher priority). The next two addresses do not
+        specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6.
+        The second, third and fourth commands modify DNS parameters of the new connection profile.
+        The last <emphasis>con show</emphasis> command displays the profile so that all
+        parameters can be reviewed.
+      </para>
     </example>
-    <para>
-      The first command adds an Ethernet connection profile named <emphasis>my-con-em1</emphasis>
-      that is bound to interface name <emphasis>em1</emphasis>. 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 will become the default route if this profile is activated on em1 interface
-      (and there is no connection with higher priority). The next two addresses do not
-      specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6.
-      The second, third and fourth commands modify DNS parameters of the new connection profile.
-      The last <emphasis>con show</emphasis> command displays the profile so that all
-      parameters can be reviewed.
-    </para>
 
     <example><title>Escaping colon characters in tabular mode</title>
-      <synopsis>
-        <emphasis role="bold">
-$ nmcli -t -f general -e yes -m tab dev show eth0
-        </emphasis>
-      </synopsis>
-      <screen>
-GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
-      </screen>
+<screen><userinput>$ nmcli -t -f general -e yes -m tab dev show eth0</userinput>
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
+e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reas
+on given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:
+ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkMa
+nager/ActiveConnection/9</screen>
+      <para>
+        This example shows escaping colon characters in tabular mode. It may be
+        useful for script processing, because ':' is used as a field separator.
+      </para>
     </example>
-    <para>
-      This example shows escaping colon characters in tabular mode. It may be
-      useful for script processing, because ':' is used as a field separator.
-    </para>
 
     <example><title>nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive</title>
-      <programlisting>
+      <programlisting language="bourne">
 #!/bin/bash
 export LC_ALL=C
 
@@ -300,28 +276,22 @@ if [ "$2" = "down" ]; then
     enable_disable_wifi
 fi
       </programlisting>
+      <para>
+        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 <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        manual page for more information about NetworkManager dispatcher scripts.
+      </para>
     </example>
-    <para>
-      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 <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      manual page for more information about NetworkManager dispatcher scripts.
-    </para>
-
 
     <para><emphasis role="bold">Example sessions of interactive connection editor</emphasis></para>
 
     <example><title>Adding an ethernet connection profile in interactive editor (a)</title>
-      <synopsis>
-        <emphasis role="bold">
-$ nmcli connection edit type ethernet
-        </emphasis>
-      </synopsis>
-      <screen>
+<screen><userinput>$ nmcli connection edit type ethernet</userinput>
 
 ===| nmcli interactive connection editor |===
 
@@ -330,72 +300,75 @@ Adding a new '802-3-ethernet' connection
 Type 'help' or '?' for available commands.
 Type 'describe [&lt;setting&gt;.&lt;prop&gt;]' 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.autoconnect-priority:        0
-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.gateway:                           --
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-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.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-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
+You may edit the following settings: connection, 802-3-ethernet (ethernet),
+802-1x, ipv4, ipv6, dcb
+nmcli> <userinput>print</userinput>
+===========================================================================
+                          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.autoconnect-priority:    0
+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.gateway:                       --
+ipv4.routes:
+ipv4.route-metric:                  -1
+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.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+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> <userinput>goto ethernet</userinput>
+You may edit the following properties: port, speed, duplex, auto-negotiate,
+ mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchann
+els, s390-nettype, s390-options
 nmcli 802-3-ethernet> set mtu 1492
 nmcli 802-3-ethernet> b
-nmcli> goto ipv4.addresses
+nmcli> <userinput>goto ipv4.addresses</userinput>
 nmcli ipv4.addresses> desc
 
 === [addresses] ===
@@ -416,140 +389,140 @@ nmcli ipv4.addresses> print
 addresses: 192.168.1.100/24
 nmcli ipv4.addresses> back
 nmcli ipv4> b
-nmcli> set ipv4.gateway 192.168.1.1
-nmcli> verify
+nmcli> <userinput>set ipv4.gateway 192.168.1.1</userinput>
+nmcli> <userinput>verify</userinput>
 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.autoconnect-priority:        0
-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:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-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.route-metric:                      -1
-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.autoconnect-priority:        0
-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:                         192.168.1.100/24
-ipv4.gateway:                           192.168.1.1
-ipv4.routes:                            
-ipv4.route-metric:                      -1
-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.gateway:                           --
-ipv6.routes:                            
-ipv6.route-metric:                      -1
-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
+nmcli> <userinput>print</userinput>
+===========================================================================
+                          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.autoconnect-priority:    0
+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:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+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.route-metric:                  -1
+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> <userinput>set ipv4.dns 8.8.8.8 8.8.4.4</userinput>
+nmcli> <userinput>print</userinput>
+===========================================================================
+                          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.autoconnect-priority:    0
+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:                     192.168.1.100/24
+ipv4.gateway:                       192.168.1.1
+ipv4.routes:
+ipv4.route-metric:                  -1
+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.gateway:                       --
+ipv6.routes:
+ipv6.route-metric:                  -1
+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> <userinput>verify</userinput>
 Verify connection: OK
-nmcli> save
-Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully saved.
-nmcli> quit
-      </screen>
+nmcli> <userinput>save</userinput>
+Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
+ saved.
+nmcli> <userinput>quit</userinput></screen>
+      <para>
+        Example session in the nmcli interactive connection editor.
+        The scenario creates an Ethernet connection profile with static addressing (IPs and DNS).
+      </para>
     </example>
-    <para>
-      Example session in the nmcli interactive connection editor.
-      The scenario creates an Ethernet connection profile with static addressing (IPs and DNS).
-    </para>
 
   </refsect1>
 
diff --git a/man/nmcli.1 b/man/nmcli.1
new file mode 100644
index 00000000..cdecc8a8
--- /dev/null
+++ b/man/nmcli.1
@@ -0,0 +1,1905 @@
+'\" t
+.\"     Title: nmcli
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 04/05/2016
+.\"    Manual: General Commands Manual
+.\"    Source: NetworkManager 1.1.93
+.\"  Language: English
+.\"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.1\&.93" "General Commands Manual"
+.\" -----------------------------------------------------------------
+.\" * 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 \- command\-line tool for controlling NetworkManager
+.SH "SYNOPSIS"
+.HP \w'\fBnmcli\fR\ 'u
+\fBnmcli\fR [\fIOPTIONS\fR...] {\fBhelp\fR | \fBgeneral\fR | \fBnetworking\fR | \fBradio\fR | \fBconnection\fR | \fBdevice\fR | \fBagent\fR | \fBmonitor\fR} [\fICOMMAND\fR] [\fIARGUMENTS\fR...]
+.SH "DESCRIPTION"
+.PP
+\fBnmcli\fR
+is a command\-line tool for controlling NetworkManager and reporting network status\&. It can be utilized as a replacement for
+\fBnm\-applet\fR
+or other graphical clients\&.
+\fBnmcli\fR
+is used to create, display, edit, delete, activate, and deactivate network connections, as well as control and display network device status\&.
+.PP
+Typical uses include:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Scripts: Utilize NetworkManager via
+\fBnmcli\fR
+instead of managing network connections manually\&.
+\fBnmcli\fR
+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\fR(8)
+for details about these dispatcher scripts\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Servers, headless machines, and terminals:
+\fBnmcli\fR
+can be used to control NetworkManager without a GUI, including creating, editing, starting and stopping network connections and viewing network status\&.
+.RE
+.SH "OPTIONS"
+.PP
+\fB\-t\fR | \fB\-\-terse\fR
+.RS 4
+Output is terse\&. This mode is designed and suitable for computer (script) processing\&.
+.RE
+.PP
+\fB\-p\fR | \fB\-\-pretty\fR
+.RS 4
+Output is pretty\&. This causes
+\fBnmcli\fR
+to produce easily readable outputs for humans, i\&.e\&. values are aligned, headers are printed, etc\&.
+.RE
+.PP
+\fB\-m\fR | \fB\-\-mode\fR {tabular | multiline}
+.RS 4
+Switch between tabular and multiline output:
+.PP
+tabular
+.RS 4
+Output is a table where each line describes a single entry\&. Columns define particular properties of the entry\&.
+.RE
+.PP
+multiline
+.RS 4
+Each entry comprises multiple lines, each property on its own line\&. The values are prefixed with the property name\&.
+.RE
+.sp
+If omitted, default is
+tabular
+for most commands\&. For the commands producing more structured information, that cannot be displayed on a single line, default is
+multiline\&. Currently, they are:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+nmcli connection show \fIID\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+nmcli device show
+.RE
+.RE
+.PP
+\fB\-c\fR | \fB\-\-colors\fR {yes | no | auto}
+.RS 4
+This option controls color output (using terminal escape sequences)\&.
+yes
+enables colors,
+no
+disables them,
+auto
+only produces colors when standard output is directed to a terminal\&. The default value is
+auto\&.
+.RE
+.PP
+\fB\-f\fR | \fB\-\-fields\fR {[\fIfield\fR...] | all | common}
+.RS 4
+This option is used to specify what fields (column names) should be printed\&. Valid field names differ for specific commands\&. List available fields by providing an invalid value to the
+\fB\-\-fields\fR
+option\&.
+all
+is used to print all valid field values of the command\&.
+common
+is used to print common field values of the command\&.
+.sp
+If omitted, default is
+common\&. The option is mandatory when
+\fB\-\-terse\fR
+is used\&. In this case, generic values
+all
+and
+common
+cannot be used\&. This is to maintain compatibility when new fields are added in the future\&.
+.RE
+.PP
+\fB\-e\fR | \fB\-\-escape\fR {yes | no}
+.RS 4
+Whether to escape
+:
+and
+\e
+characters in terse tabular mode\&. The escape character is
+\e\&.
+.sp
+If omitted, default is
+yes\&.
+.RE
+.PP
+\fB\-n\fR | \fB\-\-nocheck\fR
+.RS 4
+This option can be used to force
+\fBnmcli\fR
+to skip checking
+\fBnmcli\fR
+and
+\fBNetworkManager\fR
+version compatibility\&. Use it with care, because using incompatible versions may produce incorrect results\&.
+.RE
+.PP
+\fB\-a\fR | \fB\-\-ask\fR
+.RS 4
+When using this option
+\fBnmcli\fR
+will stop and ask for any missing required arguments, so do not use this option for non\-interactive purposes like scripts\&. This option controls, for example, whether you will be prompted for a password if it is required for connecting to a network\&.
+.RE
+.PP
+\fB\-s\fR | \fB\-\-show\-secrets\fR
+.RS 4
+When using this option
+\fBnmcli\fR
+will display passwords and secrets that might be present in an output of an operation\&. This option also influences echoing passwords typed by user as an input\&.
+.RE
+.PP
+[\fB\-w\fR\ |\ \fB\-\-wait\fR\ \fIseconds\fR...]
+.RS 4
+This option sets a timeout period for which
+\fBnmcli\fR
+will wait for NetworkManager to finish operations\&. It is especially useful for commands that may take a longer time to complete, e\&.g\&. connection activation\&.
+.sp
+Specifying a value of
+0
+instructs
+\fBnmcli\fR
+not to wait but to exit immediately with a status of success\&. The default value depends on the executed command\&.
+.RE
+.PP
+\fB\-v\fR | \fB\-\-version\fR
+.RS 4
+Show
+\fBnmcli\fR
+version\&.
+.RE
+.PP
+\fB\-h\fR | \fB\-\-help\fR
+.RS 4
+Print help information\&.
+.RE
+.SH "GENERAL COMMANDS"
+.HP \w'\fBnmcli\ general\fR\ 'u
+\fBnmcli general\fR {\fBstatus\fR | \fBhostname\fR | \fBpermissions\fR | \fBlogging\fR} [\fIARGUMENTS\fR...]
+.PP
+Use this command to show NetworkManager status and permissions\&. You can also get and change system hostname, as well as NetworkManager logging level and domains\&.
+.PP
+\fBstatus\fR
+.RS 4
+Show overall status of NetworkManager\&. This is the default action, when no additional command is provided for
+\fBnmcli general\fR\&.
+.RE
+.PP
+\fBhostname\fR [\fIhostname\fR]
+.RS 4
+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\&.
+.sp
+Note that the term "system" hostname may also be referred to as "persistent" or "static" by other programs or tools\&. The hostname is stored in
+/etc/hostname
+file in most distributions\&. For example, systemd\-hostnamed service uses the term "static" hostname and it only reads the
+/etc/hostname
+file when it starts\&.
+.RE
+.PP
+\fBpermissions\fR
+.RS 4
+Show the permissions a caller has for various authenticated operations that NetworkManager provides, like enable and disable networking, changing Wi\-Fi and WWAN state, modifying connections, etc\&.
+.RE
+.PP
+\fBlogging\fR [\fBlevel\fR\ \fIlevel\fR] [\fBdomain\fR\ \fIdomains\fR...]
+.RS 4
+Get and change NetworkManager logging level and domains\&. Without any argument current logging level and domains are shown\&. In order to change logging state, provide
+\fBlevel\fR
+and, or,
+\fBdomain\fR
+parameters\&. See
+\fBNetworkManager.conf\fR(5)
+for available level and domain values\&.
+.RE
+.SH "NETWORKING CONTROL COMMANDS"
+.HP \w'\fBnmcli\ networking\fR\ 'u
+\fBnmcli networking\fR {\fBon\fR | \fBoff\fR | \fBconnectivity\fR} [\fIARGUMENTS\fR...]
+.PP
+Query NetworkManager networking status, enable and disable networking\&.
+.PP
+\fBon\fR, \fBoff\fR
+.RS 4
+Enable enable or disable networking control by NetworkManager\&. All interfaces managed by NetworkManager are deactivated when networking is disabled\&.
+.RE
+.PP
+\fBconnectivity\fR [check]
+.RS 4
+Get network connectivity state\&. The optional
+\fBcheck\fR
+argument tells NetworkManager to re\-check the connectivity, else the most recent known connectivity state is displayed without re\-checking\&.
+.sp
+Possible states are:
+.PP
+none
+.RS 4
+the host is not connected to any network\&.
+.RE
+.PP
+portal
+.RS 4
+the host is behind a captive portal and cannot reach the full Internet\&.
+.RE
+.PP
+limited
+.RS 4
+the host is connected to a network, but it has no access to the Internet\&.
+.RE
+.PP
+full
+.RS 4
+the host is connected to a network and has full access to the Internet\&.
+.RE
+.PP
+unknown
+.RS 4
+the connectivity status cannot be found out\&.
+.RE
+.RE
+.SH "RADIO TRANSMISSION CONTROL COMMANDS"
+.HP \w'\fBnmcli\ radio\fR\ 'u
+\fBnmcli radio\fR {\fBall\fR | \fBwifi\fR | \fBwwan\fR} [\fIARGUMENTS\fR...]
+.PP
+Show radio switches status, or enable and disable the switches\&.
+.PP
+\fBwifi\fR [on | off]
+.RS 4
+Show or set status of Wi\-Fi in NetworkManager\&. If no arguments are supplied, Wi\-Fi status is printed;
+\fBon\fR
+enables Wi\-Fi;
+\fBoff\fR
+disables Wi\-Fi\&.
+.RE
+.PP
+\fBwwan\fR [on | off]
+.RS 4
+Show or set status of WWAN (mobile broadband) in NetworkManager\&. If no arguments are supplied, mobile broadband status is printed;
+\fBon\fR
+enables mobile broadband,
+\fBoff\fR
+disables it\&.
+.RE
+.PP
+\fBall\fR [on | off]
+.RS 4
+Show or set all previously mentioned radio switches at the same time\&.
+.RE
+.SH "ACTIVITY MONITOR"
+.HP \w'\fBnmcli\ monitor\fR\ 'u
+\fBnmcli monitor\fR
+.PP
+Observe NetworkManager activity\&. Watches for changes in connectivity state, devices or connection profiles\&.
+.PP
+See also
+\fBnmcli connection monitor\fR
+and
+\fBnmcli device monitor\fR
+to watch for changes in certain devices or connections\&.
+.SH "CONNECTION MANAGEMENT COMMANDS"
+.HP \w'\fBnmcli\ connection\fR\ 'u
+\fBnmcli connection\fR {\fBshow\fR | \fBup\fR | \fBdown\fR | \fBadd\fR | \fBedit\fR | \fBmodify\fR | \fBdelete\fR | \fBmonitor\fR | \fBreload\fR | \fBload\fR} [\fIARGUMENTS\fR...]
+.PP
+NetworkManager stores all network configuration as "connections", which are collections of data (Layer2 details, IP addressing, etc\&.) that describe how to create or connect to a network\&. A connection is "active" when a device uses that connection\*(Aqs 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\&.
+.PP
+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
+\fBnmcli con up default\fR
+, and when connected to the static network the user would run
+\fBnmcli con up testing\fR\&.
+.PP
+\fBshow\fR [\fB\-\-active\fR] [\fB\-\-order\fR\ [+\-]\fIcategory\fR:...]
+.RS 4
+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
+\fB\-\-active\fR
+option is specified, only the active profiles are shown\&.
+.sp
+The
+\fB\-\-order\fR
+option can be used to get custom ordering of connections\&. The connections can be ordered by active status (active), name (name), type (type) or D\-Bus path (path)\&. If connections are equal according to a sort order category, an additional category can be specified\&. The default sorting order is equivalent to
+\-\-order active:name:path\&.
++
+or no prefix means sorting in ascending order (alphabetically or in numbers),
+\-
+means reverse (descending) order\&. The category names can be abbreviated (e\&.g\&.
+\-\-order \-a:na)\&.
+.RE
+.PP
+\fBshow\fR [\fB\-\-active\fR] [\fBid\fR | \fBuuid\fR | \fBpath\fR | \fBapath\fR] \fIID\fR...
+.RS 4
+Show details for specified connections\&. By default, both static configuration and active connection data are displayed\&. When
+\fB\-\-active\fR
+option is specified, only the active profiles are taken into account\&. Use global
+\fB\-\-show\-secrets\fR
+option to display secrets associated with the profile\&.
+.sp
+\fBid\fR,
+\fBuuid\fR,
+\fBpath\fR
+and
+\fBapath\fR
+keywords can be used if
+\fIID\fR
+is ambiguous\&. Optional
+\fIID\fR\-specifying keywords are:
+.PP
+\fBid\fR
+.RS 4
+the
+\fIID\fR
+denotes a connection name\&.
+.RE
+.PP
+\fBuuid\fR
+.RS 4
+the
+\fIID\fR
+denotes a connection UUID\&.
+.RE
+.PP
+\fBpath\fR
+.RS 4
+the
+\fIID\fR
+denotes a D\-Bus static connection path in the format of /org/freedesktop/NetworkManager/Settings/\fInum\fR
+or just
+\fInum\fR\&.
+.RE
+.PP
+\fBapath\fR
+.RS 4
+the
+\fIID\fR
+denotes a D\-Bus active connection path in the format of /org/freedesktop/NetworkManager/ActiveConnection/\fInum\fR
+or just
+\fInum\fR\&.
+.RE
+.sp
+It is possible to filter the output using the global
+\fB\-\-fields\fR
+option\&. Use the following values:
+.PP
+\fBprofile\fR
+.RS 4
+only shows static profile configuration\&.
+.RE
+.PP
+\fBactive\fR
+.RS 4
+only shows active connection data (when the profile is active)\&.
+.RE
+.sp
+You can also specify particular fields\&. For static configuration, use setting and property names as described in
+\fBnm-settings\fR(5)
+manual page\&. For active data use GENERAL, IP4, DHCP4, IP6, DHCP6, VPN\&.
+.sp
+When no command is given to the
+\fBnmcli connection\fR, the default action is
+\fBnmcli connection show\fR\&.
+.RE
+.PP
+\fBup\fR [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR... [\fBifname\fR\ \fIifname\fR] [\fBap\fR\ \fIBSSID\fR] [\fBpasswd\-file\fR\ \fIfile\fR]
+.RS 4
+Activate a connection\&. The connection is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR
+or
+\fBpath\fR
+can be used\&. When requiring a particular device to activate the connection on, the
+\fBifname\fR
+option with interface name should be given\&. If the
+\fIID\fR
+is not given an
+\fBifname\fR
+is required, and NetworkManager will activate the best available connection for the given
+\fBifname\fR\&. In case of a VPN connection, the
+\fBifname\fR
+option specifies the device of the base connection\&. The
+\fBap\fR
+option specify what particular AP should be used in case of a Wi\-Fi connection\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 90 seconds\&.
+.sp
+See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&.
+.sp
+Available options are:
+.PP
+\fBifname\fR
+.RS 4
+interface that will be used for activation\&.
+.RE
+.PP
+\fBap\fR
+.RS 4
+BSSID of the AP which the command should connect to (for Wi\-Fi connections)\&.
+.RE
+.PP
+\fBpasswd\-file\fR
+.RS 4
+some networks may require credentials during activation\&. You can give these credentials using this option\&. Each line of the file should contain one password in the form:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+setting_name\&.property_name:the password
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+For example, for WPA Wi\-Fi with PSK, the line would be
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+802\-11\-wireless\-security\&.psk:secret12345
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+For 802\&.1X password, the line would be
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+802\-1x\&.password:my 1X password
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+\fBnmcli\fR
+also accepts
+wifi\-sec
+and
+wifi
+strings instead of
+802\-11\-wireless\-security\&. When NetworkManager requires a password and it is not given,
+\fBnmcli\fR
+will ask for it when run with
+\fB\-\-ask\fR\&. If
+\fB\-\-ask\fR
+was not passed, NetworkManager can ask another secret agent that may be running (typically a GUI secret agent, such as nm\-applet or gnome\-shell)\&.
+.RE
+.RE
+.PP
+\fBdown\fR [\fBid\fR | \fBuuid\fR | \fBpath\fR | \fBapath\fR] \fIID\fR...
+.RS 4
+Deactivate a connection from a device without preventing the device from further auto\-activation\&. Multiple connections can be passed to the command\&.
+.sp
+Be aware that this command deactivates the specified active connection, but 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 \*(Aqautoconnect\*(Aq 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\&.
+.sp
+In most cases you may want to use
+\fBdevice disconnect\fR
+command instead\&.
+.sp
+The connection is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR,
+\fBpath\fR
+or
+\fBapath\fR
+can be used\&.
+.sp
+See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 10 seconds\&.
+.RE
+.PP
+\fBadd\fR \fBifname\fR\ \fIifname\fR [con\-name\ \fIname\fR] [\fBautoconnect\fR\ {yes\ |\ no}] [\fBsave\fR\ {yes\ |\ no}] [master\ \fImaster\fR] [slave\-type\ \fItype\fR] [type\ \fItype\fR] [\fIARGUMENTS\fR...] [ip4\ \fIaddr\fR] [gw4\ \fIaddr\fR] [ip6\ \fIaddr\fR] [gw6\ \fIaddr\fR] [\fB\-\-\fR\ [+|\-]\fIsetting\fR\&.\fIproperty\fR\ \fIvalue\fR\ ...]
+.RS 4
+Add a connection for NetworkManager\&. Arguments differ according to connection types, see below\&.
+.PP
+\fBifname\fR
+.RS 4
+interface to bind the connection to\&. The connection will only be applicable to this interface name\&. A special value of
+*
+can be used for interface\-independent connections\&. The
+\fBifname\fR
+argument is mandatory for all connection types except bond, team, bridge and vlan\&. Note: use quotes around
+*
+to suppress shell expansion\&.
+.RE
+.PP
+\fBcon\-name\fR
+.RS 4
+connection name (when not provided a default name is generated: <type>[\-<ifname>][\-<num>])\&.
+.RE
+.PP
+\fBautoconnect\fR
+.RS 4
+whether the connection profile can be automatically activated (default: yes)\&.
+.RE
+.PP
+\fBsave\fR
+.RS 4
+whether the connection should be persistent, i\&.e\&. NetworkManager should store it on disk (default:
+yes)\&.
+.RE
+.PP
+\fBmaster\fR
+.RS 4
+master interface name, or connection UUID or ID of master connection profile\&. The value can be prefixed with
+ifname/,
+uuid/
+or
+id/
+to disambiguate it\&.
+.RE
+.PP
+\fBslave\-type\fR
+.RS 4
+type of master connection\&. Only required when it can not be inferred (i\&.e\&. the master connection does not exist yet)\&.
+.RE
+.PP
+\fBtype\fR
+.RS 4
+connection type; see below for allowed values\&. Note that types
+\fBbond\-slave\fR,
+\fBteam\-slave\fR
+and
+\fBbridge\-slave\fR
+create
+\fBethernet\fR
+connection profiles\&. Their use is discouraged in favor of using a specific type with
+\fBmaster\fR
+option\&.
+.RE
+.PP
+\fBtype ethernet\fR [\fBmac\fR\ \fIaddr\fR] [\fBcloned\-mac\fR\ \fIaddr\fR] [\fBmtu\fR\ \fImtu\fR]
+.RS 4
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the device this connection is locked to\&.
+.RE
+.PP
+\fBcloned\-mac\fR
+.RS 4
+cloned MAC\&.
+.RE
+.PP
+\fBmtu\fR
+.RS 4
+MTU\&.
+.RE
+.RE
+.PP
+\fBtype wifi\fR \fBssid\fR\ \fISSID\fR [\fBmac\fR\ \fIaddr\fR] [\fBcloned\-mac\fR\ \fIaddr\fR] [\fBmode\fR\ {infrastructure\ |\ ap\ |\ adhoc}] [\fBmtu\fR\ \fImtu\fR]
+.RS 4
+.PP
+\fBssid\fR
+.RS 4
+SSID\&.
+.RE
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the device this connection is locked to\&.
+.RE
+.PP
+\fBcloned\-mac\fR
+.RS 4
+cloned MAC\&.
+.RE
+.PP
+\fBmode\fR
+.RS 4
+Wi\-Fi network mode\&. If blank,
+infrastructure
+is assumed\&.
+.RE
+.PP
+\fBmtu\fR
+.RS 4
+MTU\&.
+.RE
+.RE
+.PP
+\fBtype wimax\fR [\fBmac\fR\ \fIaddr\fR] [\fBnsp\fR\ \fInsp\fR]
+.RS 4
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the device this connection is locked to\&.
+.RE
+.PP
+\fBnsp\fR
+.RS 4
+Network Service Provider name\&.
+.RE
+.RE
+.PP
+\fBtype pppoe\fR \fBusername\fR\ \fIuser\fR [\fBpassword\fR\ \fIpasswd\fR] [\fBservice\fR\ \fIname\fR] [\fBmtu\fR\ \fImtu\fR] [\fBmac\fR\ \fIaddr\fR]
+.RS 4
+.PP
+\fBusername\fR
+.RS 4
+PPPoE username\&.
+.RE
+.PP
+\fBpassword\fR
+.RS 4
+Password for the PPPoE username\&.
+.RE
+.PP
+\fBservice\fR
+.RS 4
+PPPoE service name (if required by concentrator)\&.
+.RE
+.PP
+\fBmtu\fR
+.RS 4
+MTU\&.
+.RE
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the device this connection is locked to\&.
+.RE
+.RE
+.PP
+\fBtype gsm\fR [\fBapn\fR\ \fIAPN\fR] [\fBusername\fR\ \fIuser\fR] [\fBpassword\fR\ \fIpasswd\fR]
+.RS 4
+.PP
+\fBapn\fR
+.RS 4
+APN \- GSM Access Point Name\&.
+.RE
+.PP
+\fBuser\fR
+.RS 4
+user name\&.
+.RE
+.PP
+\fBpassword\fR
+.RS 4
+password\&.
+.RE
+.RE
+.PP
+\fBtype cdma\fR [\fBusername\fR\ \fIuser\fR] [\fBpassword\fR\ \fIpasswd\fR]
+.RS 4
+.PP
+\fBuser\fR
+.RS 4
+user name\&.
+.RE
+.PP
+\fBpassword\fR
+.RS 4
+password\&.
+.RE
+.RE
+.PP
+\fBtype infiniband\fR [\fBmac\fR\ \fIaddr\fR] [\fBmtu\fR\ \fImtu\fR] [\fBtransport\-mode\fR\ {datagram\ |\ connected}] [\fBparent\fR\ \fIdevice\fR] [\fBp\-key\fR\ \fIkey\fR]
+.RS 4
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the device this connection is locked to (InfiniBand MAC is 20 bytes)\&.
+.RE
+.PP
+\fBmtu\fR
+.RS 4
+MTU\&.
+.RE
+.PP
+\fBtransport\-mode\fR
+.RS 4
+InfiniBand transport mode\&.
+.RE
+.PP
+\fBparent\fR
+.RS 4
+the interface name of the parent device (if any)\&.
+.RE
+.PP
+\fBp\-key\fR
+.RS 4
+the InfiniBand P_Key (16\-bit unsigned integer)\&.
+.RE
+.RE
+.PP
+\fBtype bluetooth\fR [\fBaddr\fR\ \fIaddr\fR] [\fBbt\-type\fR\ {panu\ |\ dun\-gsm\ |\ dun\-cdma}]
+.RS 4
+.PP
+\fBaddr\fR
+.RS 4
+Bluetooth device address (MAC)\&.
+.RE
+.PP
+\fBbt\-type\fR
+.RS 4
+Bluetooth connection type\&.
+.RE
+.RE
+.PP
+\fBtype vlan\fR \fBdev\fR\ \fIdevice\fR \fBid\fR\ \fIid\fR [\fBflags\fR\ \fIflags\fR] [\fBingress\fR\ \fImapping\fR] [\fBegress\fR\ \fImapping\fR] [\fBmtu\fR\ \fImtu\fR]
+.RS 4
+.PP
+\fBdev\fR
+.RS 4
+parent device this VLAN is on\&.
+.RE
+.PP
+\fBid\fR
+.RS 4
+VLAN ID in range 0\-4095\&.
+.RE
+.PP
+\fBflags\fR
+.RS 4
+flags\&.
+.RE
+.PP
+\fBingress\fR
+.RS 4
+VLAN ingress priority mapping\&.
+.RE
+.PP
+\fBegress\fR
+.RS 4
+VLAN egress priority mapping\&.
+.RE
+.PP
+\fBmtu\fR
+.RS 4
+MTU\&.
+.RE
+.RE
+.PP
+\fBtype bond\fR [\fBmode\fR\ {active\-backup\ |\ balance\-xor\ |\ broadcast\ |\ 802\&.3ad\ |\ balance\-tlb\ |\ balance\-alb\ |\ \fInum\fR}] [\fBprimary\fR\ \fIifname\fR] [\fBmiimon\fR\ \fInum\fR] [\fBdowndelay\fR\ \fInum\fR] [\fBupdelay\fR\ \fInum\fR] [\fBarp\-interval\fR\ \fInum\fR] [\fBarp\-ip\-target\fR\ \fInum\fR]
+.RS 4
+.PP
+\fBmode\fR
+.RS 4
+bonding mode (default:
+balance\-rr)\&.
+.RE
+.PP
+\fBprimary\fR
+.RS 4
+primary interface name (for
+active\-backup
+mode)\&.
+.RE
+.PP
+\fBmiimon\fR
+.RS 4
+miimon (default:
+100)\&.
+.RE
+.PP
+\fBdowndelay\fR
+.RS 4
+downdelay (default:
+0)\&.
+.RE
+.PP
+\fBupdelay\fR
+.RS 4
+updelay (default:
+0)\&.
+.RE
+.PP
+\fBarp\-interval\fR
+.RS 4
+ARP interval (default:
+0)\&.
+.RE
+.PP
+\fBarp\-ip\-target\fR
+.RS 4
+ARP IP target\&.
+.RE
+.RE
+.PP
+\fBtype bond\-slave\fR [\fBmaster\fR\ \fImaster\fR]
+.RS 4
+.PP
+\fBmaster\fR
+.RS 4
+master bond interface name, or connection UUID or ID of bond master connection profile\&. The value can be prefixed with
+ifname/,
+uuid/
+or
+id/
+to disambiguate it\&.
+.RE
+.RE
+.PP
+\fBtype team\fR [\fBconfig\fR\ {file\ |\ \fIJSON\fR}]
+.RS 4
+.PP
+\fBconfig\fR
+.RS 4
+JSON configuration for team\&.
+.RE
+.RE
+.PP
+\fBtype team\-slave\fR [\fBconfig\fR\ \fB\fIJSON\fR\fR]
+.RS 4
+.PP
+\fBmaster\fR
+.RS 4
+master team interface name, or connection UUID or ID of team master connection profile\&. The value can be prefixed with
+ifname/,
+uuid/
+or
+id/to disambiguate it\&.
+.RE
+.PP
+\fBconfig\fR
+.RS 4
+JSON configuration for team\&.
+.RE
+.RE
+.PP
+\fBtype bridge\fR [\fBstp\fR\ {yes\ |\ no}] [\fBpriority\fR\ \fInum\fR] [\fBforward\-delay\fR\ \fI2\-30\fR] [\fBhello\-time\fR\ \fI1\-10\fR] [\fBmax\-age\fR\ \fI6\-42\fR] [\fBageing\-time\fR\ \fI0\-1000000\fR] [\fBmulticast\-snooping\fR\ {yes\ |\ no}] [\fBmac\fR\ \fIaddr\fR]
+.RS 4
+.PP
+\fBstp\fR
+.RS 4
+controls whether Spanning Tree Protocol (STP) is enabled for this bridge (default:
+yes)\&.
+.RE
+.PP
+\fBpriority\fR
+.RS 4
+sets STP priority (default:
+128)\&.
+.RE
+.PP
+\fBforward\-delay\fR
+.RS 4
+STP forwarding delay, in seconds (default:
+15)\&.
+.RE
+.PP
+\fBhello\-time\fR
+.RS 4
+STP hello time, in seconds (default:
+2)\&.
+.RE
+.PP
+\fBmax\-age\fR
+.RS 4
+STP maximum message age, in seconds (default:
+20)\&.
+.RE
+.PP
+\fBageing\-time\fR
+.RS 4
+the Ethernet MAC address aging time, in seconds (default:
+300)\&.
+.RE
+.PP
+\fBmulticast\-snooping\fR
+.RS 4
+controls whether IGMP snooping is enabled (default:
+yes)\&.
+.RE
+.PP
+\fBmac\fR
+.RS 4
+MAC address of the bridge (note: this requires a recent kernel feature, originally introduced in 3\&.15 upstream kernel)\&.
+.RE
+.RE
+.PP
+\fBtype bridge\-slave\fR [\fBmaster\fR\ \fImaster\fR] [\fBpriority\fR\ \fInum\fR] [\fBpath\-cost\fR\ \fI1\-65535\fR] [\fBhairpin\fR\ {yes\ |\ no}]
+.RS 4
+.PP
+\fBmaster\fR
+.RS 4
+master bridge interface name, or connection UUID or ID of bridge master connection profile\&. The value can be prefixed with
+ifname/,
+uuid/
+or
+id/
+to disambiguate it\&.
+.RE
+.PP
+\fBpriority\fR
+.RS 4
+STP priority of this slave (default:
+32)\&.
+.RE
+.PP
+\fBpath\-cost\fR
+.RS 4
+STP port cost for destinations via this slave (default:
+100)\&.
+.RE
+.PP
+\fBhairpin\fR
+.RS 4
+\*(Aqhairpin mode\*(Aq for the slave, which allows frames to be sent back out through the slave the frame was received on (default:
+yes)\&.
+.RE
+.RE
+.PP
+\fBtype vpn\fR [\fBtype\fR\ \fItype\fR] [\fBuser\fR\ \fIusername\fR]
+.RS 4
+.PP
+\fBvpn\-type\fR
+.RS 4
+VPN type\&.
+.RE
+.PP
+\fBuser\fR
+.RS 4
+VPN username\&.
+.RE
+.RE
+.PP
+\fBtype olpc\-mesh\fR \fBssid\fR\ \fISSID\fR [\fBchannel\fR\ \fI1\-13\fR] [\fBdhcp\-anycast\fR\ \fIMAC\fR]
+.RS 4
+.PP
+\fBssid\fR
+.RS 4
+SSID\&.
+.RE
+.PP
+\fBchannel\fR
+.RS 4
+channel to use for the network\&.
+.RE
+.PP
+\fBdhcp\-anycast\fR
+.RS 4
+anycast DHCP MAC address used when requesting an IP address via DHCP\&.
+.RE
+.RE
+.PP
+\fBtype adsl\fR \fBusername\fR\ \fIusername\fR \fBprotocol\fR\ {pppoa\ |\ pppoe\ |\ ipoatm} [\fBpassword\fR\ \fIpasswd\fR] [\fBencapsulation\fR\ {vcmux\ |\ llc}]
+.RS 4
+.PP
+\fBusername\fR
+.RS 4
+ADSL user name\&.
+.RE
+.PP
+\fBprotocol\fR
+.RS 4
+ADSL protocol\&.
+.RE
+.PP
+\fBpassword\fR
+.RS 4
+ADSL password\&.
+.RE
+.PP
+\fBencapsulation\fR
+.RS 4
+ADSL encapsulation\&.
+.RE
+.RE
+.PP
+\fBtype tun\fR \fBmode\fR\ {tun\ |\ tap} [\fBowner\fR\ \fIUID\fR] [\fBgroup\fR\ \fIGID\fR] [\fBpi\fR\ {yes\ |\ no}] [\fBvnet\-hdr\fR\ {yes\ |\ no}] [\fBmulti\-queue\fR\ {yes\ |\ no}]
+.RS 4
+.PP
+\fBmode\fR
+.RS 4
+Mode for the device\&.
+.RE
+.PP
+\fBowner\fR
+.RS 4
+UID of the owner\&.
+.RE
+.PP
+\fBgroup\fR
+.RS 4
+GID of the group\&.
+.RE
+.PP
+\fBpi\fR
+.RS 4
+include packet information (~IFF_NO_PI flag)\&.
+.RE
+.PP
+\fBvnet\-hdr\fR
+.RS 4
+send and receive large (i\&.e\&. GSO) packets and packets with partial checksums (IFF_VNET_HDR flag)\&.
+.RE
+.PP
+\fBmulti\-queue\fR
+.RS 4
+multi\-queue support for tun/tap device (IFF_MULTI_QUEUE flag)\&.
+.RE
+.RE
+.PP
+\fBtype ip\-tunnel\fR \fBmode\fR\ {ipip\ |\ gre\ |\ sit\ |\ isatap\ |\ vti\ |\ ip6ip6\ |\ ipip6\ |\ ip6gre\ |\ vti6\ |\ tun} \fBremote\fR\ \fIaddr\fR [\fBlocal\fR\ \fIaddr\fR] [\fBdev\fR\ \fIdevice\fR]
+.RS 4
+.PP
+\fBmode\fR
+.RS 4
+tunnel mode\&.
+.RE
+.PP
+\fBremote\fR
+.RS 4
+IPv4 or IPv6 address of the remote tunnel endpoint\&.
+.RE
+.PP
+\fBlocal\fR
+.RS 4
+IPv4 or IPv6 address of the local tunnel endpoint\&.
+.RE
+.PP
+\fBdev\fR
+.RS 4
+device to use for tunnel endpoint communication\&.
+.RE
+.RE
+.PP
+\fBtype macvlan\fR \fBdev\fR\ \fIdevice\fR \fBmode\fR\ {vepa\ |\ bridge\ |\ private\ |\ passthru\ |\ source} [\fBtap\fR\ {yes\ |\ no}]
+.RS 4
+.PP
+\fBdev\fR
+.RS 4
+parent device this MACVLAN is on\&.
+.RE
+.PP
+\fBmode\fR
+.RS 4
+MACVLAN mode, which specifies the communication mechanism between multiple MACVLANs on the same lower device\&.
+.RE
+.PP
+\fBtap\fR
+.RS 4
+controls the device type\&. If set to \*(Aqyes\*(Aq a MACVTAP will be created (default:
+no)\&.
+.RE
+.RE
+.PP
+\fBtype vxlan\fR \fBid\fR\ \fIid\fR \fBremote\fR\ \fIaddr\fR [\fBdev\fR\ \fIparent\ device\ (ifname\ or\ connection\ UUID)\fR] [\fBlocal\fR\ \fIaddr\fR] [\fBsource\-port\-min\fR\ \fI0\-65535\fR] [\fBsource\-port\-max\fR\ \fI0\-65535\fR] [\fBdestination\-port\fR\ \fI0\-65535\fR]
+.RS 4
+.PP
+\fBid\fR
+.RS 4
+VXLAN Network Identifer to use\&.
+.RE
+.PP
+\fBremote\fR
+.RS 4
+unicast destination IP address or multicast IP address to join\&.
+.RE
+.PP
+\fBdev\fR
+.RS 4
+device to use for tunnel endpoint communication\&.
+.RE
+.PP
+\fBlocal\fR
+.RS 4
+source IP address\&.
+.RE
+.PP
+\fBsource\-port\-min\fR
+.RS 4
+minimum UDP source port to communicate to the remote VXLAN tunnel endpoint\&.
+.RE
+.PP
+\fBsource\-port\-max\fR
+.RS 4
+maximum UDP source port to communicate to the remote VXLAN tunnel endpoint\&.
+.RE
+.PP
+\fBdestination\-port\fR
+.RS 4
+UDP destination port to communicate to the remote VXLAN tunnel endpoint\&.
+.RE
+.RE
+.PP
+\fBip4\fR, \fBgw4\fR
+.RS 4
+IPv4 addresses\&.
+.RE
+.PP
+\fBip6\fR, \fBgw6\fR
+.RS 4
+IPv6 addresses\&.
+.RE
+.PP
+\fB\-\-\fR
+.RS 4
+If a
+\fB\-\-\fR
+argument is encountered, the rest of command line is interpreted as property list in the same format as
+\fBconnection modify\fR
+command accepts\&. This makes it possible to adjust the connection properties before it\*(Aqs added\&.
+.RE
+.RE
+.PP
+\fBedit\fR {[\fBid\fR\ |\ \fBuuid\fR\ |\ \fBpath\fR]\ \fIID\fR... | [\fBtype\fR\ \fItype\fR]\ [\fBcon\-name\fR\ \fIname\fR] }
+.RS 4
+Edit an existing connection or add a new one, using an interactive editor\&.
+.sp
+The existing connection is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR, or
+\fBpath\fR
+can be used\&. See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&. Not providing an
+\fIID\fR
+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
+Available options:
+.PP
+\fBtype\fR
+.RS 4
+type of the new connection; valid types are the same as for
+\fBconnection add\fR
+command\&.
+.RE
+.PP
+\fBcon\-name\fR
+.RS 4
+name for the new connection\&. It can be changed later in the editor\&.
+.RE
+.sp
+See also
+\fBnm-settings\fR(5)
+for all NetworkManager settings and property names, and their descriptions; and
+\fBnmcli-examples\fR(7)
+for sample editor sessions\&.
+.RE
+.PP
+\fBmodify\fR [\fB\-\-temporary\fR] [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR [+|\-]\fIsetting\fR\&.\fIproperty\fR\ \fIvalue\fR...
+.RS 4
+Modify one or more properties in the connection profile\&.
+.sp
+The connection is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR
+or
+\fBpath\fR
+can be used\&. See
+\fBnm-settings\fR(5)
+for setting and property names, their descriptions and default values\&. This command supports abbreviations for
+\fIsetting\fR
+and
+\fIproperty\fR
+provided they are unique\&. Empty
+\fIvalue\fR
+("") removes the property value (sets the property to the default value)\&. The provided value overwrites the existing property value\&.
+.sp
+If you want to append an item to the existing value, use
++
+prefix for the property name\&. If you want to remove just one item from container\-type property, use
+\-
+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\fR\&. Of course,
++
+and
+\-
+only have a real effect for multi\-value (container) properties like
+ipv4\&.dns,
+ipv4\&.addresses,
+bond\&.options, etc\&.
+.RE
+.PP
+\fBclone\fR [\fB\-\-temporary\fR] [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR... \fBnew\fR\ \fIname\fR
+.RS 4
+Clone a connection\&. The connection to be cloned is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR
+or
+\fBpath\fR
+can be used\&. See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&.
+\fIname\fR
+is the name of the new cloned connection\&. The new connection will be the exact copy except the connection\&.id (\fIname\fR) and connection\&.uuid (generated) properties\&.
+.sp
+The new connection profile will be saved as persistent unless
+\fB\-\-temporary\fR
+option is specified, in which case the new profile won\*(Aqt exist after NetworkManager restart\&.
+.RE
+.PP
+\fBdelete\fR [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR...
+.RS 4
+Delete a configured connection\&. The connection to be deleted is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR
+or
+\fBpath\fR
+can be used\&. See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 10 seconds\&.
+.RE
+.PP
+\fBmonitor\fR [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR...
+.RS 4
+Monitor connection profile activity\&. This command prints a line whenever the specified connection changes\&. The connection to be monitored is identified by its name, UUID or D\-Bus path\&. If
+\fIID\fR
+is ambiguous, a keyword
+\fBid\fR,
+\fBuuid\fR
+or
+\fBpath\fR
+can be used\&. See
+\fBconnection show\fR
+above for the description of the
+\fIID\fR\-specifying keywords\&.
+.sp
+Monitors all connection profiles in case none is specified\&. The command terminates when all monitored connections disappear\&. If you want to monitor connection creation consider using the global monitor with
+\fBnmcli monitor\fR
+command\&.
+.RE
+.PP
+\fBreload\fR
+.RS 4
+Reload all connection files from disk\&. NetworkManager does not monitor changes to connection files by default\&. So you need to use this command in order to tell NetworkManager 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 NetworkManager will reload connection files any time they change (monitor\-connection\-files=true in
+\fBNetworkManager.conf\fR(5))\&.
+.RE
+.PP
+\fBload\fR \fIfilename\fR...
+.RS 4
+Load/reload one or more connection files from disk\&. Use this after manually editing a connection file to ensure that NetworkManager is aware of its latest state\&.
+.RE
+.PP
+\fBimport\fR [\fB\-\-temporary\fR] [\fBtype\fR\ \fItype\fR] [\fBfile\fR\ \fIfile\fR]
+.RS 4
+Import an external/foreign configuration as a NetworkManager connection profile\&. The type of the input file is specified by
+\fBtype\fR
+option\&.
+.sp
+Only VPN configurations are supported at the moment\&. The configuration is imported by NetworkManager VPN plugins\&.
+\fBtype\fR
+values are the same as for
+\fBvpn\-type\fR
+option in
+\fBnmcli connection add\fR\&. VPN configurations are imported by VPN plugins\&. Therefore the proper VPN plugin has to be installed so that
+\fBnmcli\fR
+could import the data\&.
+.sp
+The imported connection profile will be saved as persistent unless
+\fB\-\-temporary\fR
+option is specified, in which case the new profile won\*(Aqt exist after NetworkManager restart\&.
+.RE
+.PP
+\fBexport\fR [\fBid\fR | \fBuuid\fR | \fBpath\fR] \fIID\fR [\fIfile\fR]
+.RS 4
+Export a connection\&.
+.sp
+Only VPN connections are supported at the moment\&. A proper VPN plugin has to be installed so that
+\fBnmcli\fR
+could export a connection\&. If no
+\fIfile\fR
+is provided, the VPN configuration data will be printed to standard output\&.
+.RE
+.SH "DEVICE MANAGEMENT COMMANDS"
+.HP \w'\fBnmcli\ device\fR\ 'u
+\fBnmcli device\fR {\fBstatus\fR | \fBshow\fR | \fBset\fR | \fBconnect\fR | \fBreapply\fR | \fBdisconnect\fR | \fBdelete\fR | \fBmonitor\fR | \fBwifi\fR | \fBlldp\fR} [\fIARGUMENTS\fR...]
+.PP
+Show and manage network interfaces\&.
+.PP
+\fBstatus\fR
+.RS 4
+Print status of devices\&.
+.sp
+This is the default action if no command is specified to
+\fBnmcli device\fR\&.
+.RE
+.PP
+\fBshow\fR [\fIifname\fR]
+.RS 4
+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\&.
+.RE
+.PP
+\fBset\fR [ifname] \fIifname\fR [\fBautoconnect\fR\ {yes\ |\ no}] [\fBmanaged\fR\ {yes\ |\ no}]
+.RS 4
+Set device properties\&.
+.RE
+.PP
+\fBconnect\fR [\fIifname\fR]
+.RS 4
+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\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 90 seconds\&.
+.RE
+.PP
+\fBreapply\fR [\fIifname\fR]
+.RS 4
+Attempt to update device with changes to the currently active connection made since it was last applied\&.
+.RE
+.PP
+\fBdisconnect\fR [\fIifname\fR...]
+.RS 4
+Disconnect a device and prevent the device from automatically activating further connections without user/manual intervention\&. Note that disconnecting software devices may mean that the devices will disappear\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 10 seconds\&.
+.RE
+.PP
+\fBdelete\fR [\fIifname\fR...]
+.RS 4
+Delete a device\&. The command removes the interface from the system\&. Note that this only works for software devices like bonds, bridges, teams, etc\&. Hardware devices (like Ethernet) cannot be deleted by the command\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 10 seconds\&.
+.RE
+.PP
+\fBmonitor\fR [\fIifname\fR...]
+.RS 4
+Monitor device activity\&. This command prints a line whenever the specified devices change state\&.
+.sp
+Monitors all devices in case no interface is specified\&. The monitor terminates when all specified devices disappear\&. If you want to monitor device addition consider using the global monitor with
+\fBnmcli monitor\fR
+command\&.
+.RE
+.PP
+\fBwifi\fR [\fBlist\fR\ [\fBifname\fR\ \fIifname\fR]\ [\fBbssid\fR\ \fIBSSID\fR]]
+.RS 4
+List available Wi\-Fi access points\&. The
+\fBifname\fR
+and
+\fBbssid\fR
+options can be used to list APs for a particular interface or with a specific BSSID, respectively\&.
+.RE
+.PP
+\fBwifi\fR \fBconnect\fR \fI(B)SSID\fR [\fBpassword\fR\ \fIpassword\fR] [\fBwep\-key\-type\fR\ {key\ |\ phrase}] [\fBifname\fR\ \fIifname\fR] [\fBbssid\fR\ \fIBSSID\fR] [\fBname\fR\ \fIname\fR] [\fBprivate\fR\ {yes\ |\ no}] [\fBhidden\fR\ {yes\ |\ no}]
+.RS 4
+Connect to a Wi\-Fi network specified by SSID or BSSID\&. The command creates a new connection and then activates it on a device\&. This is a command\-line 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\-Fi networks\&. If a connection for the network already exists, it is better to bring up (activate) the existing connection as follows:
+\fBnmcli con up id \fR\fB\fIname\fR\fR\&. Note that only open, WEP and WPA\-PSK networks are supported at the moment\&. It is also supposed that IP configuration is obtained via DHCP\&.
+.sp
+If
+\fB\-\-wait\fR
+option is not specified, the default timeout will be 90 seconds\&.
+.sp
+Available options are:
+.PP
+\fBpassword\fR
+.RS 4
+password for secured networks (WEP or WPA)\&.
+.RE
+.PP
+\fBwep\-key\-type\fR
+.RS 4
+type of WEP secret, either
+\fBkey\fR
+for ASCII/HEX key or
+\fBphrase\fR
+for passphrase\&.
+.RE
+.PP
+\fBifname\fR
+.RS 4
+interface that will be used for activation\&.
+.RE
+.PP
+\fBbssid\fR
+.RS 4
+if specified, the created connection will be restricted just for the BSSID\&.
+.RE
+.PP
+\fBname\fR
+.RS 4
+if specified, the connection will use the name (else NM creates a name itself)\&.
+.RE
+.PP
+\fBprivate\fR
+.RS 4
+if set to
+yes, the connection will only be visible to the user who created it\&. Otherwise the connection is system\-wide, which is the default\&.
+.RE
+.PP
+\fBhidden\fR
+.RS 4
+set to
+yes
+when connecting for the first time to an AP not broadcasting its SSID\&. Otherwise the SSID would not be found and the connection attempt would fail\&.
+.RE
+.RE
+.PP
+\fBwifi\fR \fBhotspot\fR [\fBifname\fR\ \fIifname\fR] [\fBcon\-name\fR\ \fIname\fR] [\fBssid\fR\ \fISSID\fR] [\fBband\fR\ {a\ |\ bg}] [\fBchannel\fR\ \fIchannel\fR] [\fBpassword\fR\ \fIpassword\fR]
+.RS 4
+Create a Wi\-Fi hotspot\&. The command creates a hotspot connection profile according to Wi\-Fi device capabilities and activates it on the device\&. The hotspot is secured with WPA if device/driver supports that, otherwise WEP is used\&. Use
+\fBconnection down\fR
+or
+\fBdevice disconnect\fR
+to stop the hotspot\&.
+.sp
+Parameters of the hotspot can be influenced by the optional parameters:
+.PP
+\fBifname\fR
+.RS 4
+what Wi\-Fi device is used\&.
+.RE
+.PP
+\fBcon\-name\fR
+.RS 4
+name of the created hotspot connection profile\&.
+.RE
+.PP
+\fBssid\fR
+.RS 4
+SSID of the hotspot\&.
+.RE
+.PP
+\fBband\fR
+.RS 4
+Wi\-Fi band to use\&.
+.RE
+.PP
+\fBchannel\fR
+.RS 4
+Wi\-Fi channel to use\&.
+.RE
+.PP
+\fBpassword\fR
+.RS 4
+password to use for the created hotspot\&. If not provided,
+\fBnmcli\fR
+will generate a password\&. The password is either WPA pre\-shared key or WEP key\&.
+.sp
+Note that
+\fB\-\-show\-secrets\fR
+global option can be used to print the hotspot password\&. It is useful especially when the password was generated\&.
+.RE
+.RE
+.PP
+\fBwifi\fR \fBrescan\fR [\fBifname\fR\ \fIifname\fR] [\fBssid\fR\ \fISSID\fR...]
+.RS 4
+Request that NetworkManager immediately re\-scan for available access points\&. NetworkManager scans Wi\-Fi networks periodically, but in some cases it can be useful to start scanning manually (e\&.g\&. after resuming the computer)\&. By using
+\fBssid\fR, it is possible to scan for a specific SSID, which is useful for APs with hidden SSIDs\&. You can provide multiple
+\fBssid\fR
+parameters in order to scan more SSIDs\&.
+.sp
+This command does not show the APs, use
+\fBnmcli device wifi list\fR
+for that\&.
+.RE
+.PP
+\fBlldp\fR [\fBlist\fR\ [\fBifname\fR\ \fIifname\fR]]
+.RS 4
+Display information about neighboring devices learned through the Link Layer Discovery Protocol (LLDP)\&. The
+\fBifname\fR
+option can be used to list neighbors only for a given interface\&. The protocol must be enabled in the connection settings\&.
+.RE
+.SH "SECRET AGENT"
+.HP \w'\fBnmcli\ agent\fR\ 'u
+\fBnmcli agent\fR {\fBsecret\fR | \fBpolkit\fR | \fBall\fR}
+.PP
+Run
+\fBnmcli\fR
+as a NetworkManager secret agent, or polkit agent\&.
+.PP
+\fBsecret\fR
+.RS 4
+Register
+\fBnmcli\fR
+as a NetworkManager secret agent and listen for secret requests\&. You do usually not need this command, because
+\fBnmcli\fR
+can handle secrets when connecting to networks\&. However, you may find the command useful when you use another tool for activating connections and you do not have a secret agent available (like nm\-applet)\&.
+.RE
+.PP
+\fBpolkit\fR
+.RS 4
+Register
+\fBnmcli\fR
+as a polkit agent for the user session and listen for authorization requests\&. You do not usually need this command, because
+\fBnmcli\fR
+can handle polkit actions related to NetworkManager operations (when run with
+\fB\-\-ask\fR)\&. However, you may find the command useful when you want to run a simple text based polkit agent and you do not have an agent of a desktop environment\&. Note that running this command makes
+\fBnmcli\fR
+handle all polkit requests, not only NetworkManager related ones, because only one polkit agent can run for the session\&.
+.RE
+.PP
+\fBall\fR
+.RS 4
+Runs
+\fBnmcli\fR
+as both NetworkManager secret and a polkit agent\&.
+.RE
+.SH "ENVIRONMENT VARIABLES"
+.PP
+\fBnmcli\fR\*(Aqs behavior is affected by the following environment variables\&.
+.PP
+\fBLC_ALL\fR
+.RS 4
+If set to a non\-empty string value, it overrides the values of all the other internationalization variables\&.
+.RE
+.PP
+\fBLC_MESSAGES\fR
+.RS 4
+Determines the locale to be used for internationalized messages\&.
+.RE
+.PP
+\fBLANG\fR
+.RS 4
+Provides a default value for the internationalization variables that are unset or null\&.
+.RE
+.SH "INTERNATIONALIZATION NOTES"
+.PP
+Be aware that
+\fBnmcli\fR
+is localized and that is why the output depends on your environment\&. This is important to realize especially when you parse the output\&.
+.PP
+Call
+\fBnmcli\fR
+as
+\fBLC_ALL=C nmcli\fR
+to be sure the locale is set to
+C
+while executing in a script\&.
+.PP
+\fBLC_ALL\fR,
+\fBLC_MESSAGES\fR,
+\fBLANG\fR
+variables specify the
+\fBLC_MESSAGES\fR
+locale category (in that order), which determines the language that
+\fBnmcli\fR
+uses for messages\&. The
+C
+locale is used if none of these variables are set, and this locale uses English messages\&.
+.SH "EXIT STATUS"
+.PP
+\fBnmcli\fR
+exits with status 0 if it succeeds, a value greater than 0 is returned if an error occurs\&.
+.PP
+\fB0\fR
+.RS 4
+Success \(en indicates the operation succeeded\&.
+.RE
+.PP
+\fB1\fR
+.RS 4
+Unknown or unspecified error\&.
+.RE
+.PP
+\fB2\fR
+.RS 4
+Invalid user input, wrong
+\fBnmcli\fR
+invocation\&.
+.RE
+.PP
+\fB3\fR
+.RS 4
+Timeout expired (see
+\fB\-\-wait\fR
+option)\&.
+.RE
+.PP
+\fB4\fR
+.RS 4
+Connection activation failed\&.
+.RE
+.PP
+\fB5\fR
+.RS 4
+Connection deactivation failed\&.
+.RE
+.PP
+\fB6\fR
+.RS 4
+Disconnecting device failed\&.
+.RE
+.PP
+\fB7\fR
+.RS 4
+Connection deletion failed\&.
+.RE
+.PP
+\fB8\fR
+.RS 4
+NetworkManager is not running\&.
+.RE
+.PP
+\fB9\fR
+.RS 4
+\fBnmcli\fR
+and
+\fBNetworkManager\fR
+versions mismatch\&.
+.RE
+.PP
+\fB10\fR
+.RS 4
+Connection, device, or access point does not exist\&.
+.RE
+.SH "EXAMPLES"
+.PP
+This section presents various examples of
+\fBnmcli\fR
+usage\&. If you want even more, please refer to
+\fBnmcli-examples\fR(7)
+manual page\&.
+.PP
+\fBnmcli \-t \-f RUNNING general\fR
+.RS 4
+tells you whether NetworkManager is running or not\&.
+.RE
+.PP
+\fBnmcli \-t \-f STATE general\fR
+.RS 4
+shows the overall status of NetworkManager\&.
+.RE
+.PP
+\fBnmcli radio wifi off\fR
+.RS 4
+switches Wi\-Fi off\&.
+.RE
+.PP
+\fBnmcli connection show\fR
+.RS 4
+lists all connections NetworkManager has\&.
+.RE
+.PP
+\fBnmcli \-p \-m multiline \-f all con show\fR
+.RS 4
+shows all configured connections in multi\-line mode\&.
+.RE
+.PP
+\fBnmcli connection show \-\-active\fR
+.RS 4
+lists all currently active connections\&.
+.RE
+.PP
+\fBnmcli \-f name,autoconnect c s\fR
+.RS 4
+shows all connection profile names and their auto\-connect property\&.
+.RE
+.PP
+\fBnmcli \-p connection show "My default em1"\fR
+.RS 4
+shows details for "My default em1" connection profile\&.
+.RE
+.PP
+\fBnmcli \-\-show\-secrets connection show "My Home WiFi"\fR
+.RS 4
+shows details for "My Home WiFi" connection profile with all passwords\&. Without
+\fB\-\-show\-secrets\fR
+option, secrets would not be displayed\&.
+.RE
+.PP
+\fBnmcli \-f active connection show "My default em1"\fR
+.RS 4
+shows details for "My default em1" active connection, like IP, DHCP information, etc\&.
+.RE
+.PP
+\fBnmcli \-f profile con s "My wired connection"\fR
+.RS 4
+shows static configuration details of the connection profile with "My wired connection" name\&.
+.RE
+.PP
+\fBnmcli \-p con up "My wired connection" ifname eth0\fR
+.RS 4
+activates the connection profile with name "My wired connection" on interface eth0\&. The \-p option makes
+\fBnmcli\fR
+show progress of the activation\&.
+.RE
+.PP
+\fBnmcli con up 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 ap 00:3A:98:7C:42:D3\fR
+.RS 4
+connects the Wi\-Fi connection with UUID 6b028a27\-6dc9\-4411\-9886\-e9ad1dd43761 to the AP with BSSID 00:3A:98:7C:42:D3\&.
+.RE
+.PP
+\fBnmcli device status\fR
+.RS 4
+shows the status for all devices\&.
+.RE
+.PP
+\fBnmcli dev disconnect em2\fR
+.RS 4
+disconnects a connection on interface em2 and marks the device as unavailable for auto\-connecting\&. As a result, no connection will automatically be activated on the device until the device\*(Aqs \*(Aqautoconnect\*(Aq is set to TRUE or the user manually activates a connection\&.
+.RE
+.PP
+\fBnmcli \-f GENERAL,WIFI\-PROPERTIES dev show wlan0\fR
+.RS 4
+shows details for wlan0 interface; only GENERAL and WIFI\-PROPERTIES sections will be shown\&.
+.RE
+.PP
+\fBnmcli \-f CONNECTIONS device show wlp3s0\fR
+.RS 4
+shows all available connection profiles for your Wi\-Fi interface wlp3s0\&.
+.RE
+.PP
+\fBnmcli dev wifi\fR
+.RS 4
+lists available Wi\-Fi access points known to NetworkManager\&.
+.RE
+.PP
+\fBnmcli dev wifi con "Cafe Hotspot 1" password caffeine name "My cafe"\fR
+.RS 4
+creates a new connection named "My cafe" and then connects it to "Cafe Hotspot 1" SSID using password "caffeine"\&. This is mainly useful when connecting to "Cafe Hotspot 1" for the first time\&. Next time, it is better to use
+\fBnmcli con up id "My cafe"\fR
+so that the existing connection profile can be used and no additional is created\&.
+.RE
+.PP
+\fBnmcli \-s dev wifi hotspot con\-name QuickHotspot\fR
+.RS 4
+creates a hotspot profile and connects it\&. Prints the hotspot password the user should use to connect to the hotspot from other devices\&.
+.RE
+.PP
+\fBnmcli connection add type ethernet autoconnect no ifname eth0\fR
+.RS 4
+non\-interactively adds an Ethernet connection tied to eth0 interface with automatic IP configuration (DHCP), and disables the connection\*(Aqs
+autoconnect
+flag\&.
+.RE
+.PP
+\fBnmcli c a ifname Maxipes\-fik type vlan dev eth0 id 55\fR
+.RS 4
+non\-interactively adds a VLAN connection with ID 55\&. The connection will use eth0 and the VLAN interface will be named Maxipes\-fik\&.
+.RE
+.PP
+\fBnmcli c a ifname eth0 type ethernet \-\- ipv4\&.method disabled ipv6\&.method link\-local\fR
+.RS 4
+non\-interactively adds a connection that will use eth0 Ethernet interface and only have an IPv6 link\-local address configured\&.
+.RE
+.PP
+\fBnmcli connection edit ethernet\-em1\-2\fR
+.RS 4
+edits existing "ethernet\-em1\-2" connection in the interactive editor\&.
+.RE
+.PP
+\fBnmcli connection edit type ethernet con\-name "yet another Ethernet connection"\fR
+.RS 4
+adds a new Ethernet connection in the interactive editor\&.
+.RE
+.PP
+\fBnmcli con mod ethernet\-2 connection\&.autoconnect no\fR
+.RS 4
+modifies \*(Aqautoconnect\*(Aq property in the \*(Aqconnection\*(Aq setting of \*(Aqethernet\-2\*(Aq connection\&.
+.RE
+.PP
+\fBnmcli con mod "Home Wi\-Fi" wifi\&.mtu 1350\fR
+.RS 4
+modifies \*(Aqmtu\*(Aq property in the \*(Aqwifi\*(Aq setting of \*(AqHome Wi\-Fi\*(Aq connection\&.
+.RE
+.PP
+\fBnmcli con mod em1\-1 ipv4\&.method manual ipv4\&.addr "192\&.168\&.1\&.23/24 192\&.168\&.1\&.1, 10\&.10\&.1\&.5/8, 10\&.0\&.0\&.11"\fR
+.RS 4
+sets manual addressing and the addresses in em1\-1 profile\&.
+.RE
+.PP
+\fBnmcli con modify ABC +ipv4\&.dns 8\&.8\&.8\&.8\fR
+.RS 4
+appends a Google public DNS server to DNS servers in ABC profile\&.
+.RE
+.PP
+\fBnmcli con modify ABC \-ipv4\&.addresses "192\&.168\&.100\&.25/24 192\&.168\&.1\&.1"\fR
+.RS 4
+removes the specified IP address from (static) profile ABC\&.
+.RE
+.PP
+\fBnmcli con import type openvpn file ~/Downloads/frootvpn\&.ovpn\fR
+.RS 4
+imports an OpenVPN configuration to NetworkManager\&.
+.RE
+.PP
+\fBnmcli con export corp\-vpnc /home/joe/corpvpn\&.conf\fR
+.RS 4
+exports NetworkManager VPN profile corp\-vpnc as standard Cisco (vpnc) configuration\&.
+.RE
+.SH "NOTES"
+.PP
+\fBnmcli\fR
+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 compatibility it is therefore strongly advised to spell out the full option names\&.
+.SH "BUGS"
+.PP
+There are probably some bugs\&. If you find a bug, please report it to https://bugzilla\&.gnome\&.org/ \(em product
+NetworkManager\&.
+.SH "SEE ALSO"
+.PP
+\fBnmcli-examples\fR(7),
+\fBnm-online\fR(1),
+\fBNetworkManager\fR(8),
+\fBNetworkManager.conf\fR(5),
+\fBnm-settings\fR(5),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)\&.
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
deleted file mode 100644
index 3c76348f..00000000
--- a/man/nmcli.1.in
+++ /dev/null
@@ -1,1282 +0,0 @@
-.\" nmcli (1) manual page
-.\"
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public Licence along
-.\" with this manual; if not, write to the Free Software Foundation, Inc.,
-.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-.\"
-.\" Copyright 2010 - 2015 Red Hat, Inc.
-.\"
-.TH NMCLI "1" "2016-03-09" "NetworkManager 1.2"
-
-.SH NAME
-nmcli \- command\(hyline tool for controlling NetworkManager
-.SH SYNOPSIS
-.ad l
-.B nmcli
-.RI " [ " OPTIONS " ] " OBJECT " { " COMMAND " | "
-.BR help " } "
-.sp
-
-.IR OBJECT " := { "
-.BR general " | " networking " | " radio " | " connection " | " device " | " agent " | " monitor
-.RI " }"
-.sp
-
-.IR OPTIONS " := { "
-.br
-\fB\-t\fR[\fIerse\fR]
-.br
-\fB\-p\fR[\fIretty\fR]
-.br
-\fB\-m\fR[\fImode\fR] tabular | multiline
-.br
-\fB\-c\fR[\fIcolors\fR] auto | yes | no
-.br
-\fB\-f\fR[\fIields\fR] <field1,field2,...> | all | common
-.br
-\fB\-e\fR[\fIscape\fR] yes | no
-.br
-\fB\-n\fR[\fIocheck\fR]
-.br
-\fB\-a\fR[\fIsk\fR]
-.br
-\fB\-s\fR[\fIhow-secrets\fR]
-.br
-\fB\-w\fR[\fIait\fR] <seconds>
-.br
-\fB\-v\fR[\fIersion\fR]
-.br
-\fB\-h\fR[\fIelp\fR]
-.br
-.RI "}"
-
-.SH DESCRIPTION
-.B nmcli
-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 uses include:
-.IP \(em 4
-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
-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
-Output is terse.  This mode is designed and suitable for computer (script)
-processing.
-.TP
-.B \-p, \-\-pretty
-Output is pretty. This causes \fInmcli\fP to produce easily readable outputs
-for humans, i.e. values are aligned, headers are printed, etc.
-.TP
-.B \-m, \-\-mode tabular | multiline
-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. Currently, they are:
-.br
-.nf
-  '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.
-.br
-\fImultiline\fP \(en Each entry comprises multiple lines, each property on its own
-line. The values are prefixed with the property name.
-.TP
-.B \-c, \-\-colors auto|yes|no
-This option controls color output (using terminal escape sequences). \fIyes\fP
-enables colors, \fIno\fP disables them, \fIauto\fP only produces colors when
-standard output is directed to a terminal. The default value is \fIauto\fP.
-.TP
-.B \-f, \-\-fields <field1,field2,...> | all | common
-This option is used to specify what fields (column names) should be printed.
-Valid field names differ for specific commands. List available fields by
-providing an invalid value to the \fI\-\-fields\fP option.
-.br
-\fIall\fP is used to print all valid field values of the command.
-\fIcommon\fP is used to print common field values of the command.
-If omitted, default is \fIcommon\fP.
-The option is mandatory when \fI\-\-terse\fP is used.  In this case, generic
-values \fIall\fP and \fIcommon\fP cannot be used.  (This is to maintain
-compatibility when new fields are added in the future).
-.TP
-.B \-e, \-\-escape yes | no
-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.
-This option controls, for example, whether you will be prompted for a password
-if it is required for connecting to a network.
-.TP
-.B \-s, \-\-show-secrets
-When using this option \fInmcli\fP will display passwords and secrets that might
-be present in an output of an operation. This option also influences echoing
-passwords typed by user as an input.
-.TP
-.B \-w, \-\-wait <seconds>
-This option sets a timeout period for which \fInmcli\fP will wait for \fINetworkManager\fP
-to finish 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
-.B \-h, \-\-help
-Print help information.
-.SS \fIOBJECT\fP
-.TP
-.B general \- general \fINetworkManager\fP status and operations
-.br
-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 | hostname | permissions | logging }
-.sp
-.RS
-.TP
-.B status
-.br
-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
-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 and disable networking, changing Wi\(hyFi
-and WWAN state, modifying connections, etc.
-.TP
-.B logging [level <log level>] [domains <log domains>]
-.br
-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 [ on | off ]
-.br
-Get networking\(hyenabled status or enable and disable networking by NetworkManager.
-All interfaces managed by NetworkManager are deactivated when networking has
-been disabled.
-.TP
-.B connectivity [check]
-.br
-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
-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 radio \- get or set radio switch states
-.br
-Use this object to show radio switches status, or enable and disable
-the switches.
-.TP
-.SS \fICOMMAND\fP := { all | wifi | wwan }
-.sp
-.RS
-.TP
-.B wifi [ on | off ]
-.br
-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 wwan [ on | off ]
-.br
-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 all [ on | off ]
-.br
-Show or set all previously mentioned radio switches at the same time.
-.RE
-
-.TP
-.B monitor \- monitor NetworkManager
-.br
-Use this object to observe NetworkManager activity. Watches for changes
-in connectivity state, devices or connection profiles.
-.br
-See also \fImonitor\fP command of \fIconnection\fP or \fIdevice\fP object
-to watch for changes in certain objects or object classes.
-.RE
-
-.TP
-.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 := { show | up | down | add | edit | modify | delete | monitor | reload | load }
-.sp
-.RS
-.TP
-.B show [--active]
-.br
-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 show [--active] [--order <order spec>] [ 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. Use global --show-secrets option
-to display secrets associated with the profile.
-.sp
-Ordering:
-.br
-The --order option can be used to get custom ordering of connections. The
-connections can be ordered by active status, name, type or D-Bus path. If
-connections are equal according to a sort order category, an additional
-category can be specified.
-The default sorting order is equivalent to "--order active:name:path".
-.sp
-<order spec> := category:category:...
-.br
-category := [+-]active | [+-]name | [+-]type | [+-]path
-.br
-\fI+\fP or no prefix means sorting in ascending order (alphabetically or in numbers).
-.br
-\fI-\fP means reverse (descending) order.
-.br
-The category names can be abbreviated (e.g. --order -a:na)
-.sp
-\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>] [passwd-file <file with passwords>]
-.RE
-.RS
-.B up ifname <ifname> [ap <BSSID>] [passwd-file <file with passwords>]
-.RS
-.br
-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
-If '--wait' option is not specified, the default timeout will be 90 seconds.
-.br
-See \fBconnection show\fP above for the description of the <ID>-specifying keywords.
-.RS
-.PP
-Available options are:
-.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 \fIpasswd-file\fP 13
-\(en some networks may require credentials during activation. You can give these
-credentials using this option.
-Each line of the file should contain one password in the form of
-.br
-\fBsetting_name.property_name:the password\fP
-.br
-For example, for WPA Wi-Fi with PSK, the line would be
-.br
-\fI802-11-wireless-security.psk:secret12345\fP
-.br
-For 802.1X password, the line would be
-.br
-\fI802-1x.password:my 1X password\fP
-.br
-nmcli also accepts "wifi-sec" and "wifi" strings instead of "802-11-wireless-security".
-When NetworkManager requires a password and it is not given, nmcli will ask for it
-when run with --ask. If --ask was not passed, NetworkManager can ask another secret
-agent that may be running (typically a GUI secret agent, such as nm-applet or
-gnome-shell).
-.RE
-.RE
-.TP
-.B down [ id | uuid | path | apath ] <ID> ...
-.br
-Deactivate a connection from a device without preventing the device from
-further auto-activation. Multiple connections can be passed to the command. 
-.sp
-Be aware that this command deactivates the specified active connection, but 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
-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.
-.br
-If '--wait' option is not specified, the default timeout will be 10 seconds.
-.TP
-.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS [-- [+|-]<setting>.<property> <value> ...]
-.br
-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)
-Note that types \fIbond-slave\fP, \fIteam-slave\fP and \fIbridge-slave\fP create \fIethernet\fP
-connection profiles. Their use is discouraged in favor of using a specific type with \fImaster\fP
-option.
-.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)
-.IP "\fI[master <master (ifname, or connection UUID or name)>]\fP" 42
-\(en master interface name, or connection UUID or ID of master connection profile.
-The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
-.IP "\fI[slave-type <master connection type>]\fP" 42
-\(en type of master connection. Only required when it can not be inferred (i.e. the master connection does
-not exist yet).
-.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[mode infrastructure|ap|adhoc]\fP" 42
-\(en Wi-Fi network mode. If blank, \fIinfrastructure\fP is assumed.
-.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.
-.RE
-.RS
-.TP
-.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[multicast-snooping yes|no]\fP" 42
-\(en controls whether IGMP snooping is enabled (default: yes)
-.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.
-.RE
-.RS
-.TP
-.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|strongswan|ssh|l2tp|iodine|fortisslvpn|...\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 adsl:
-.IP "\fIusername <username>\fP" 42
-\(en ADSL user name
-.IP "\fIprotocol pppoa|pppoe|ipoatm\fP" 42
-\(en ADSL protocol
-.IP "\fI[password <password>]\fP" 42
-\(en ADSL password
-.IP "\fI[encapsulation vcmux|llc]\fP" 42
-\(en ADSL encapsulation
-.RE
-.RS
-.TP
-.B tun:
-.IP "\fImode tun|tap\fP" 42
-\(en Mode for the device
-.IP "\fI[owner <UID>]\fP" 42
-\(en UID of the owner
-.IP "\fI[group <GID>]\fP" 42
-\(en GID of the group
-.IP "\fI[pi yes|no>]\fP" 42
-\(en include packet information (~IFF_NO_PI flag)
-.IP "\fI[vnet-hdr yes|no>]\fP" 42
-\(en send and receive large (i.e. GSO) packets and packets with partial checksums (IFF_VNET_HDR flag)
-.IP "\fI[multi-queue yes|no>]\fP" 42
-\(en multi-queue support for tun/tap device (IFF_MULTI_QUEUE flag)
-.RE
-.RS
-.TP
-.B ip-tunnel:
-.IP "\fImode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\fP" 42
-\(en tunnel mode
-.IP "\fIremote <remote endpoint IP>\fP" 42
-\(en IPv4 or IPv6 address of the remote tunnel endpoint
-.IP "\fI[local <local endpoint IP>]\fP" 42
-\(en IPv4 or IPv6 address of the local tunnel endpoint
-.IP "\fI[dev <parent device (ifname or connection UUID)>]\fP" 42
-\(en device to use for tunnel endpoint communication
-.RE
-.RS
-.TP
-.B macvlan:
-.IP "\fIdev <parent device (connection  UUID, ifname, or MAC)>\fP" 42
-\(en parent device this MACVLAN is on
-.IP "\fImode vepa|bridge|private|passthru|source\fP" 42
-\(en MACVLAN mode, which specifies the communication mechanism between multiple MACVLANs on the same lower device
-.IP "\fI[tap yes|no]\fP" 42
-\(en controls the device type. If set to 'yes' a MACVTAP will be created (default: no)
-.RE
-.RS
-.TP
-.B vxlan:
-.IP "\fIid <VXLAN ID>\fP" 42
-\(en VXLAN Network Identifer to use
-.IP "\fIremote <IP>\fP" 42
-\(en unicast destination IP address or multicast IP address to join
-.IP "\fI[dev <parent device (ifname or connection UUID)>]\fP" 42
-\(en device to use for tunnel endpoint communication
-.IP "\fI[local <IP>]\fP" 42
-\(en source IP address
-.IP "\fI[source-port-min <0-65535>]\fP" 42
-\(en minimum UDP source port to communicate to the remote VXLAN tunnel endpoint
-.IP "\fI[source-port-max <0-65535>]\fP" 42
-\(en maximum UDP source port to communicate to the remote VXLAN tunnel endpoint
-.IP "\fI[destination-port <0-65535>]\fP" 42
-\(en UDP destination port to communicate to the remote VXLAN tunnel endpoint
-.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
-.RS
-If a \fI--\fP argument is encountered, the rest of command line is interpreted
-as property list in the same format as \fIconnection modify\fP command accepts.
-This makes it possible to adjust the connection properties before it's added.
-.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
-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 clone [--temporary] [ id | uuid | path ] <ID> <new name>
-.br
-Clone a connection. The connection to be cloned 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. \fI<new name>\fP is the name
-of the new cloned connection. The new connection will be the exact copy except
-the connection.id (\fI<new name>\fP) and connection.uuid (generated)
-properties.
-.br
-The new connection profile will be saved as persistent unless \fI--temporary\fP
-option is specified, in which case the new profile won't exist after 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.
-.br
-If '--wait' option is not specified, the default timeout will be 10 seconds.
-.TP
-.B monitor [ id | uuid | path ] <ID> ...
-.br
-Monitor connection profile activity. This command prints a line whenever the
-specified connection changes. The connection to be monitored 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.
-.br
-Monitors all connection profiles in case none is specified. The command terminates
-when all monitored connections disappear. If you want to monitor connection creation
-consider using the global monitor with \fInmcli monitor\fP command.
-.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.
-.TP
-.B import [--temporary] type <type> file <file to import>
-.br
-Import an external/foreign configuration as a NetworkManager connection profile.
-The type of the input file is specified by \fItype\fP option.
-.br
-Only VPN configurations are supported at the moment. The configuration
-is imported by NetworkManager VPN plugins. \fItype\fP values are the same as for
-\fIvpn-type\fP option in \fBnmcli connection add\fP. VPN configurations are
-imported by VPN plugins. Therefore the proper VPN plugin has to be installed
-so that nmcli could import the data.
-.br
-The imported connection profile will be saved as persistent unless \fI--temporary\fP
-option is specified, in which case the new profile won't exist after NetworkManager
-restart.
-.TP
-.B export [ id | uuid | path ] <ID> [<output file>]
-.br
-Export a connection.
-.br
-Only VPN connections are supported at the moment. A proper VPN plugin has to be
-installed so that nmcli could export a connection. If no \fI<output file>\fP is
-provided, the VPN configuration data will be printed to standard output.
-.RE
-
-.TP
-.B device - show and manage network interfaces
-.br
-.TP
-.SS \fICOMMAND\fP := { status | show | set | connect | reapply | disconnect | delete | monitor | wifi | lldp }
-.sp
-.RS
-.TP
-.B status
-.br
-Print status of devices.
-.br
-This is the default action if no command is specified to \fIdevice\fP object.
-.TP
-.B show [<ifname>]
-.br
-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
-.TP
-.B set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]
-.br
-Set device properties.
-.TP
-.B connect <ifname>
-.br
-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 reapply <ifname>
-.br
-Attempt to update device with changes to the currently active connection
-made since it was last applied.
-.TP
-.B disconnect <ifname> ...
-.br
-Disconnect a device and prevent the device from automatically activating further
-connections without user/manual intervention. Note that disconnecting software
-devices may mean that the devices will disappear.
-.br
-If '--wait' option is not specified, the default timeout will be 10 seconds.
-.TP
-.B delete <ifname> ...
-.br
-Delete a device. The command removes the interface from the system. Note that
-this only works for software devices like bonds, bridges, teams, etc.
-Hardware devices (like Ethernet) cannot be deleted by the command.
-.br
-If '--wait' option is not specified, the default timeout will be 10 seconds.
-.TP
-.B monitor [<ifname>] ...
-.br
-Monitor device activity. This command prints a line whenever the specified devices
-change state.
-.br
-Monitors all devices in case no interface is specified. The monitor terminates when
-all specified devices disappear. If you want to monitor device addition consider
-using the global monitor with \fInmcli monitor\fP command.
-.TP
-.B wifi [list [ifname <ifname>] [bssid <BSSID>]]
-.br
-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.
-.TP
-.B wifi connect <(B)SSID> [password <password>] [wep\-key\-type key|phrase] [ifname <ifname>] [bssid <BSSID>] [name <name>]
-.B [private yes|no] [hidden 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 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:
-.IP \fIpassword\fP 13
-\(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 \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 \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.
-.IP \fIhidden\fP 13
-\(en set to \fByes\fP when connecting for the first time to an AP not broadcasting its SSID.
-Otherwise the SSID would not be found and the connection attempt would fail.
-.RE
-.TP
-.B wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] [channel <channel>] [password <password>]
-.br
-Create a Wi-Fi hotspot. The command creates a hotspot connection profile according to
-Wi-Fi device capabilities and activates it on the device. The hotspot is secured with WPA
-if device/driver supports that, otherwise WEP is used.
-Use \fIconnection down\fP or \fIdevice disconnect\fP to stop the hotspot.
-.br
-.RS
-.PP
-Parameters of the hotspot can be influenced by the optional parameters:
-.IP \fIifname\fP 17
-\(en what Wi-Fi device is used
-.IP \fIcon-name\fP 17
-\(en name of the created hotspot connection profile
-.IP \fIssid\fP 17
-\(en SSID of the hotspot
-.IP \fIband\fP 17
-\(en Wi-Fi band to use
-.IP \fIchannel\fP 17
-\(en Wi-Fi channel to use
-.IP \fIpassword\fP 17
-\(en password to use for the created hotspot. If not provided,
-nmcli will generate a password. The password is either WPA
-pre-shared key or WEP key.
-.PP
-Note that \fI--show-secrets\fP global option can be used to print the hotspot
-password. It is useful especially when the password was generated.
-.RE
-.TP
-.B wifi rescan [ifname <ifname>] [[ssid <SSID>] ...]
-.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). By using
-\fIssid\fP, it is possible to scan for a specific SSID, which is useful for APs
-with hidden SSIDs. You can provide multiple \fIssid\fP parameters in order to
-scan more SSIDs.
-.br
-This command does not show the APs, use 'nmcli device wifi list' for that.
-.TP
-.B lldp [list [ifname <ifname>]]
-.br
-Display information about neighboring devices learned through the Link
-Layer Discovery Protocol (LLDP). The \fIifname\fP option can be used to
-list neighbors only for a given interface. The protocol must be
-enabled in the connection settings.
-.RE
-
-.TP
-.B agent \- run nmcli as a NetworkManager secret agent, or polkit agent
-.br
-.TP
-.SS \fICOMMAND\fP := { secret | polkit  | all }
-.sp
-.RS
-.TP
-.B secret
-.br
-Register nmcli as a NetworkManager secret agent and listen for secret requests.
-You do usually not need this command, because nmcli can handle secrets when
-connecting to networks. However, you may find the command useful when you use
-another tool for activating connections and you do not have a secret agent
-available (like nm-applet).
-.TP
-.B polkit
-.br
-Register nmcli as a polkit agent for the user session and listen for
-authorization requests. You do not usually need this command, because nmcli can
-handle polkit actions related to NetworkManager operations (when run with
---ask).  However, you may find the command useful when you want to run a simple
-text based polkit agent and you do not have an agent of a desktop environment.
-Note that running this command makes nmcli handle all polkit requests, not only
-NetworkManager related ones, because only one polkit agent can run for the
-session.
-.TP
-.B all
-.br
-Runs nmcli as both NetworkManager secret and a polkit agent.
-.RE
-
-.SH ENVIRONMENT VARIABLES
-\fInmcli\fP's behavior is affected by the following environment variables.
-.IP "LC_ALL" 13
-If set to a non\(hyempty string value, it overrides the values of all the other
-internationalization variables.
-.IP "LC_MESSAGES" 13
-Determines the locale to be used for internationalized messages.
-.IP "LANG" 13
-Provides a default value for the internationalization variables that are unset
-or null.
-
-.RE
-Internationalization notes:
-.br
-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
-Call \fInmcli\fP as \fBLC_ALL=C nmcli\fP to be sure the locale is
-set to "C" while executing in a script.
-
-\fBLC_ALL\fP, \fBLC_MESSAGES\fP, \fBLANG\fP variables specify the LC_MESSAGES
-locale category (in that order), which determines the language that \fInmcli\fP
-uses for messages.  The "C" locale is used if none of these variables are set,
-and this locale uses English messages.
-
-.SH EXIT STATUS
-\fInmcli\fP exits with status 0 if it succeeds, a value greater than 0 is
-returned if an error occurs.
-.IP "0" 4
-Success \(en indicates the operation succeeded
-.IP "1" 4
-Unknown or unspecified error
-.IP "2" 4
-Invalid user input, wrong \fInmcli\fP invocation
-.IP "3" 4
-Timeout expired (see \fI\-\-wait\fP option)
-.IP "4" 4
-Connection activation failed
-.IP "5" 4
-Connection deactivation failed
-.IP "6" 4
-Disconnecting device failed
-.IP "7" 4
-Connection deletion failed
-.IP "8" 4
-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
-.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 general\fP\fP"
-.IP
-shows the overall status of NetworkManager.
-
-.IP "\fB\f(CWnmcli radio wifi off\fP\fP"
-.IP
-switches Wi\(hyFi off.
-
-.IP "\fB\f(CWnmcli connection show\fP\fP"
-.IP
-lists all connections NetworkManager has.
-
-.IP "\fB\f(CWnmcli \-p \-m multiline \-f all con show\fP\fP"
-.IP
-shows all configured connections in multi-line mode.
-
-.IP "\fB\f(CWnmcli connection show --active\fP\fP"
-.IP
-lists all currently active connections.
-
-.IP "\fB\f(CWnmcli \-f name,autoconnect c s\fP\fP"
-.IP
-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 --show-secrets connection show \(dq\&My Home WiFi\(dq\&\fP\fP"
-.IP
-shows details for "My Home WiFi" connection profile with all passwords.
-Without \fI--show-secrets\fP option, secrets would not be displayed.
-
-.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 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 device status\fP\fP"
-.IP
-shows the status for all devices.
-
-.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. 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 show wlan0\fP\fP"
-.IP
-shows details for wlan0 interface; only GENERAL and WIFI\-PROPERTIES sections will be shown.
-
-.IP "\fB\f(CWnmcli \-f CONNECTIONS device show wlp3s0\fP\fP"
-.IP
-shows all available connection profiles for your Wi-Fi interface wlp3s0.
-
-.IP "\fB\f(CWnmcli dev wifi\fP\fP"
-.IP
-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 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 -s dev wifi hotspot con-name QuickHotspot\fP\fP"
-.IP
-creates a hotspot profile and connects it. Prints the hotspot password the user should use
-to connect to the hotspot from other devices.
-
-.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 c a ifname eth0 type ethernet -- ipv4.method disabled ipv6.method link-local\fP\fP"
-.IP
-non-interactively adds a connection that will use eth0 Ethernet interface and only have an IPv6 link-local
-address configured.
-
-.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.
-
-.IP "\fB\f(CWnmcli con import type openvpn file ~/Downloads/frootvpn.ovpn\fP\fP"
-.IP
-imports an OpenVPN configuration to NetworkManager.
-
-.IP "\fB\f(CWnmcli con export corp-vpnc /home/joe/corpvpn.conf\fP\fP"
-.IP
-exports NetworkManager VPN profile corp-vpnc as standard Cisco (vpnc) configuration.
-
-.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 compatibility 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 nmcli\-examples (5),
-.BR nm\-online (1),
-.BR NetworkManager (8),
-.BR NetworkManager.conf (5),
-.BR nm\-settings (5),
-.BR nm\-applet (1),
-.BR nm\-connection\-editor (1).
diff --git a/man/nmcli.xml b/man/nmcli.xml
new file mode 100644
index 00000000..61954667
--- /dev/null
+++ b/man/nmcli.xml
@@ -0,0 +1,3116 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
+
+<!--
+  nmcli(1) manual page
+
+  This is free documentation; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License, or (at your option) any later version.
+
+  The GNU General Public License's references to "object code"
+  and "executables" are to be interpreted as the output of any
+  document formatting or typesetting system, including
+  intermediate and printed output.
+
+  This manual is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public Licence along
+  with this manual; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+  Copyright 2010 - 2016 Red Hat, Inc.
+-->
+
+<refentry id='nmcli'>
+
+  <refentryinfo>
+    <title>nmcli</title>
+    <author>NetworkManager developers</author>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>nmcli</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="source">NetworkManager</refmiscinfo>
+    <refmiscinfo class="manual">General Commands Manual</refmiscinfo>
+    <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>nmcli</refname>
+    <refpurpose>command-line tool for controlling NetworkManager</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>nmcli</command>
+      <arg choice="opt" rep="repeat"><replaceable>OPTIONS</replaceable></arg>
+      <group choice='req'>
+        <arg choice='plain'><option>help</option></arg>
+        <arg choice='plain'><option>general</option></arg>
+        <arg choice='plain'><option>networking</option></arg>
+        <arg choice='plain'><option>radio</option></arg>
+        <arg choice='plain'><option>connection</option></arg>
+        <arg choice='plain'><option>device</option></arg>
+        <arg choice='plain'><option>agent</option></arg>
+        <arg choice='plain'><option>monitor</option></arg>
+      </group>
+      <arg><replaceable>COMMAND</replaceable></arg>
+      <arg rep="repeat"><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'><title>Description</title>
+    <para><command>nmcli</command> is a command-line tool for controlling
+    NetworkManager and reporting network status. It can be utilized as a
+    replacement for <command>nm-applet</command> or other graphical clients.
+    <command>nmcli</command> is used to create, display, edit, delete, activate,
+    and deactivate network connections, as well as control and display network
+    device status.</para>
+
+    <para>Typical uses include:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Scripts: Utilize NetworkManager via <command>nmcli</command> instead of
+        managing network connections manually. <command>nmcli</command> 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
+        <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        for details about these dispatcher scripts.</para>
+      </listitem>
+
+      <listitem>
+        <para>Servers, headless machines, and terminals: <command>nmcli</command> can
+        be used to control NetworkManager without a GUI, including creating, editing,
+        starting and stopping network connections and viewing network status.</para>
+      </listitem>
+    </itemizedlist>
+  </refsect1>
+
+  <refsect1 id='options'><title>Options</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-t</option></arg>
+          <arg choice='plain'><option>--terse</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Output is terse. This mode is designed and suitable for computer (script)
+          processing.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-p</option></arg>
+          <arg choice='plain'><option>--pretty</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Output is pretty. This causes <command>nmcli</command> to produce easily
+          readable outputs for humans, i.e. values are aligned, headers are printed,
+          etc.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-m</option></arg>
+          <arg choice='plain'><option>--mode</option></arg>
+          <group choice='req'>
+            <arg choice='plain'>tabular</arg>
+            <arg choice='plain'>multiline</arg>
+          </group>
+        </group></term>
+
+        <listitem>
+          <para>Switch between tabular and multiline output:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><arg choice='plain'>tabular</arg></term>
+              <listitem>
+                <para>Output is a table where each line describes a single entry.
+                Columns define particular properties of the entry.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><arg choice='plain'>multiline</arg></term>
+              <listitem>
+                <para>Each entry comprises multiple lines, each property on its
+                own line. The values are prefixed with the property name.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+
+          <para>If omitted, default is <literal>tabular</literal> for most commands.
+          For the commands producing more structured information, that cannot be
+          displayed on a single line, default is <literal>multiline</literal>.
+          Currently, they are:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><literal>nmcli connection show <replaceable>ID</replaceable></literal></para>
+            </listitem>
+
+            <listitem>
+              <para><literal>nmcli device show</literal></para>
+            </listitem>
+          </itemizedlist>
+
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-c</option></arg>
+          <arg choice='plain'><option>--colors</option></arg>
+          <group choice='req'>
+            <arg choice='plain'>yes</arg>
+            <arg choice='plain'>no</arg>
+            <arg choice='plain'>auto</arg>
+          </group>
+        </group></term>
+
+        <listitem>
+          <para>This option controls color output (using terminal escape sequences).
+          <literal>yes</literal> enables colors, <literal>no</literal> disables them,
+          <literal>auto</literal> only produces colors when standard output is directed
+          to a terminal. The default value is <literal>auto</literal>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-f</option></arg>
+          <arg choice='plain'><option>--fields</option></arg>
+          <group choice='req'>
+            <arg conice='plain' rep='repeat'><replaceable>field</replaceable></arg>
+            <arg choice='plain'>all</arg>
+            <arg choice='plain'>common</arg>
+          </group>
+        </group></term>
+
+        <listitem>
+          <para>This option is used to specify what fields (column names) should be
+          printed. Valid field names differ for specific commands. List available fields
+          by providing an invalid value to the <option>--fields</option> option.
+          <literal>all</literal> is used to print all valid field values of the
+          command. <literal>common</literal> is used to print common field values of
+          the command.</para>
+
+          <para>If omitted, default is <literal>common</literal>. The option is
+          mandatory when <option>--terse</option> is used. In this case, generic values
+          <literal>all</literal> and <literal>common</literal> cannot be used. This
+          is to maintain compatibility when new fields are added in the future.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-e</option></arg>
+          <arg choice='plain'><option>--escape</option></arg>
+          <group choice='req'>
+            <arg choice='plain'>yes</arg>
+            <arg choice='plain'>no</arg>
+          </group>
+        </group></term>
+
+        <listitem>
+          <para>Whether to escape <literal>:</literal> and <literal>\</literal> characters in terse tabular mode. The
+          escape character is <literal>\</literal>.</para>
+
+          <para>If omitted, default is <literal>yes</literal>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-n</option></arg>
+          <arg choice='plain'><option>--nocheck</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>This option can be used to force <command>nmcli</command> to skip
+          checking <command>nmcli</command> and <command>NetworkManager</command>
+          version compatibility. Use it with care, because using incompatible versions
+          may produce incorrect results.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-a</option></arg>
+          <arg choice='plain'><option>--ask</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>When using this option <command>nmcli</command> will stop and ask for any
+          missing required arguments, so do not use this option for non-interactive
+          purposes like scripts. This option controls, for example, whether you will be
+          prompted for a password if it is required for connecting to a network.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-s</option></arg>
+          <arg choice='plain'><option>--show-secrets</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>When using this option <command>nmcli</command> will display passwords
+          and secrets that might be present in an output of an operation. This option
+          also influences echoing passwords typed by user as an input.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><arg>
+          <group choice='plain'>
+            <arg choice='plain'><option>-w</option></arg>
+            <arg choice='plain'><option>--wait</option></arg>
+          </group>
+          <arg choice='plain' rep='repeat'><replaceable>seconds</replaceable></arg>
+        </arg></term>
+
+        <listitem>
+          <para>This option sets a timeout period for which <command>nmcli</command> will
+          wait for NetworkManager to finish operations. It is
+          especially useful for commands that may take a longer time to complete, e.g.
+          connection activation.</para>
+
+          <para>Specifying a value of <literal>0</literal> instructs
+          <command>nmcli</command> not to wait but to exit immediately with a status of
+          success. The default value depends on the executed command.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-v</option></arg>
+          <arg choice='plain'><option>--version</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Show <command>nmcli</command> version.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><group choice='plain'>
+          <arg choice='plain'><option>-h</option></arg>
+          <arg choice='plain'><option>--help</option></arg>
+        </group></term>
+
+        <listitem>
+          <para>Print help information.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='general'><title>General Commands</title>
+
+    <cmdsynopsis>
+      <command>nmcli general</command>
+      <group choice='req'>
+        <arg choice='plain'><command>status</command></arg>
+        <arg choice='plain'><command>hostname</command></arg>
+        <arg choice='plain'><command>permissions</command></arg>
+        <arg choice='plain'><command>logging</command></arg>
+      </group>
+      <arg rep='repeat'><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+
+    <para>Use this command to show NetworkManager status and permissions. You can also get
+    and change system hostname, as well as NetworkManager logging level and domains.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><command>status</command></term>
+
+        <listitem>
+          <para>Show overall status of NetworkManager. This is the default action, when
+          no additional command is provided for <command>nmcli general</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>hostname</command>
+          <arg><replaceable>hostname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>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.</para>
+
+          <para>Note that the term "system" hostname may also be referred to as
+          "persistent" or "static" by other programs or tools. The hostname is stored
+          in <filename>/etc/hostname</filename> file in most distributions. For example,
+          systemd-hostnamed service uses the term "static" hostname and it only reads
+          the <filename>/etc/hostname</filename> file when it starts.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>permissions</command></term>
+
+        <listitem>
+          <para>Show the permissions a caller has for various authenticated operations
+          that NetworkManager provides, like enable and disable networking, changing
+          Wi-Fi and WWAN state, modifying connections, etc.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>logging</command>
+          <arg><option>level</option> <replaceable>level</replaceable></arg>
+          <arg rep='repeat'><option>domain</option> <replaceable>domains</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Get and change NetworkManager logging level and
+          domains. Without any argument current logging level and domains are shown. In
+          order to change logging state, provide <option>level</option> and, or,
+          <option>domain</option> parameters. See
+          <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for available level and domain values.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='networking'><title>Networking Control Commands</title>
+
+    <cmdsynopsis>
+      <command>nmcli networking</command>
+      <group choice='req'>
+        <arg choice='plain'><command>on</command></arg>
+        <arg choice='plain'><command>off</command></arg>
+        <arg choice='plain'><command>connectivity</command></arg>
+      </group>
+      <arg rep='repeat'><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+
+    <para>Query NetworkManager networking status, enable and disable networking.
+    </para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><command>on</command></term>
+        <term><command>off</command></term>
+
+        <listitem>
+          <para>Enable enable or disable networking control by NetworkManager.
+          All interfaces managed by NetworkManager are deactivated when networking
+          is disabled.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>connectivity</command>
+          <arg>check</arg>
+        </term>
+
+        <listitem>
+          <para>Get network connectivity state. The optional <option>check</option>
+          argument tells NetworkManager to re-check the connectivity, else the most
+          recent known connectivity state is displayed without re-checking.</para>
+
+          <para>Possible states are:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><arg choice='plain'>none</arg></term>
+              <listitem>
+                <para>the host is not connected to any network.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><arg choice='plain'>portal</arg></term>
+              <listitem>
+                <para>the host is behind a captive portal and cannot reach the full Internet.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><arg choice='plain'>limited</arg></term>
+              <listitem>
+                <para>the host is connected to a network, but it has no access to the Internet.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><arg choice='plain'>full</arg></term>
+              <listitem>
+                <para>the host is connected to a network and has full access to the Internet.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><arg choice='plain'>unknown</arg></term>
+              <listitem>
+                <para>the connectivity status cannot be found out.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='radio'><title>Radio Transmission Control Commands</title>
+
+    <cmdsynopsis>
+      <command>nmcli radio</command>
+      <group choice='req'>
+        <arg choice='plain'><command>all</command></arg>
+        <arg choice='plain'><command>wifi</command></arg>
+        <arg choice='plain'><command>wwan</command></arg>
+      </group>
+      <arg rep='repeat'><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+
+    <para>Show radio switches status, or enable and disable the switches.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>
+          <command>wifi</command>
+          <group>
+            <arg choice='plain'>on</arg>
+            <arg choice='plain'>off</arg>
+          </group>
+        </term>
+
+        <listitem>
+          <para>Show or set status of Wi-Fi in NetworkManager. If no arguments are
+          supplied, Wi-Fi status is printed; <option>on</option> enables Wi-Fi;
+          <option>off</option> disables Wi-Fi.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>wwan</command>
+          <group>
+            <arg choice='plain'>on</arg>
+            <arg choice='plain'>off</arg>
+          </group>
+        </term>
+
+        <listitem>
+          <para>Show or set status of WWAN (mobile broadband) in NetworkManager. If no
+          arguments are supplied, mobile broadband status is printed;
+          <option>on</option> enables mobile broadband, <option>off</option>
+          disables it.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>all</command>
+          <group>
+            <arg choice='plain'>on</arg>
+            <arg choice='plain'>off</arg>
+          </group>
+        </term>
+
+        <listitem>
+          <para>Show or set all previously mentioned radio switches at the same time.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='monitor'><title>Activity Monitor</title>
+
+    <cmdsynopsis>
+      <command>nmcli monitor</command>
+    </cmdsynopsis>
+
+    <para>Observe NetworkManager activity. Watches for changes
+    in connectivity state, devices or connection profiles.</para>
+
+    <para>See also <command>nmcli connection monitor</command>
+    and <command>nmcli device monitor</command> to watch
+    for changes in certain devices or connections.</para>
+  </refsect1>
+
+  <refsect1 id='connection'><title>Connection Management Commands</title>
+
+    <cmdsynopsis>
+      <command>nmcli connection</command>
+      <group choice='req'>
+        <arg choice='plain'><command>show</command></arg>
+        <arg choice='plain'><command>up</command></arg>
+        <arg choice='plain'><command>down</command></arg>
+        <arg choice='plain'><command>add</command></arg>
+        <arg choice='plain'><command>edit</command></arg>
+        <arg choice='plain'><command>modify</command></arg>
+        <arg choice='plain'><command>delete</command></arg>
+        <arg choice='plain'><command>monitor</command></arg>
+        <arg choice='plain'><command>reload</command></arg>
+        <arg choice='plain'><command>load</command></arg>
+      </group>
+      <arg rep='repeat'><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+
+    <para>NetworkManager stores all network configuration as "connections",
+    which are collections of data (Layer2 details, IP addressing, etc.) that
+    describe how to create or connect to a network. A connection is "active"
+    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.</para>
+
+    <para>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 <literal>default</literal>) and one with the static addressing details (called
+    <literal>testing</literal>). When connected to the DHCP-enabled network the user would run
+    <command>nmcli con up default</command> , and when connected to the static network the user
+    would run <command>nmcli con up testing</command>.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>
+          <command>show</command>
+          <arg><option>--active</option></arg>
+          <arg>
+             <option>--order</option>
+             <arg choice='plain' rep='repeat'>[+-]<replaceable>category</replaceable>:</arg>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>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 <option>--active</option> option is specified, only
+          the active profiles are shown.</para>
+
+          <para>The <option>--order</option> option can be used to get custom
+          ordering of connections. The connections can be ordered by active status
+          (<literal>active</literal>), name (<literal>name</literal>), type
+          (<literal>type</literal>) or D-Bus path (<literal>path</literal>). If
+          connections are equal according to a sort order category, an additional
+          category can be specified. The default sorting order is equivalent to
+          <literal>--order active:name:path</literal>. <literal>+</literal> or no
+          prefix means sorting in ascending order (alphabetically or in numbers),
+          <literal>-</literal> means reverse (descending) order. The category names
+          can be abbreviated (e.g. <literal>--order -a:na</literal>).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>show</command>
+          <arg><option>--active</option></arg>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+            <arg choice='plain'><option>apath</option></arg>
+          </group>
+          <arg rep='repeat' choice='plain'><replaceable>ID</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Show details for specified connections. By default, both static
+          configuration and active connection data are displayed. When
+          <option>--active</option> option is specified, only the active profiles are
+          taken into account. Use global <option>--show-secrets</option> option to
+          display secrets associated with the profile.</para>
+
+          <para><option>id</option>, <option>uuid</option>,
+          <option>path</option> and <option>apath</option> keywords can be used
+          if <replaceable>ID</replaceable> is ambiguous.  Optional
+          <replaceable>ID</replaceable>-specifying keywords are:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>id</option></term>
+              <listitem>
+                <para>the <replaceable>ID</replaceable> denotes a connection name.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>uuid</option></term>
+              <listitem>
+                <para>the <replaceable>ID</replaceable> denotes a connection UUID.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>path</option></term>
+              <listitem>
+                <para>the <replaceable>ID</replaceable> denotes a D-Bus
+                static connection path in the format of
+                /org/freedesktop/NetworkManager/Settings/<replaceable>num</replaceable>
+                or just <replaceable>num</replaceable>.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>apath</option></term>
+              <listitem>
+                <para>the <replaceable>ID</replaceable> denotes a D-Bus active connection path in the format of
+                /org/freedesktop/NetworkManager/ActiveConnection/<replaceable>num</replaceable> or just
+                <replaceable>num</replaceable>.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+
+          <para>It is possible to filter the output using the global
+          <option>--fields</option> option. Use the following values:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>profile</option></term>
+              <listitem>
+                <para>only shows static profile configuration.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>active</option></term>
+              <listitem>
+                <para>only shows active connection data (when the profile is active).</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+
+          <para>You can also specify particular fields. For static configuration, use
+          setting and property names as described in
+          <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum>
+          </citerefentry> manual page. For active data use GENERAL, IP4, DHCP4, IP6,
+          DHCP6, VPN.</para>
+
+          <para>When no command is given to the <command>nmcli connection</command>,
+          the default action is <command>nmcli connection show</command>.</para>
+
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>up</command>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg rep='repeat' choice='plain'><replaceable>ID</replaceable></arg>
+          <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          <arg><option>ap</option> <replaceable>BSSID</replaceable></arg>
+          <arg><option>passwd-file</option> <replaceable>file</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Activate a connection. The connection is identified by its name, UUID or
+          D-Bus path. If <replaceable>ID</replaceable> is ambiguous, a keyword <option>id</option>,
+          <option>uuid</option> or <option>path</option> can be used. When
+          requiring a particular device to activate the connection on, the
+          <option>ifname</option> option with interface name should be given. If the
+          <replaceable>ID</replaceable> is not given an <option>ifname</option> is required, and
+          NetworkManager will activate the best available connection for the given
+          <option>ifname</option>. In case of a VPN connection, the
+          <option>ifname</option> option specifies the device of the base connection.
+          The <option>ap</option> option specify what particular AP should be used in
+          case of a Wi-Fi connection.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout will be 90
+          seconds.</para>
+
+          <para>See <command>connection show</command> above for the description of the
+          <replaceable>ID</replaceable>-specifying keywords.</para>
+
+          <para>Available options are:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>ifname</option></term>
+              <listitem>
+                <para>interface that will be used for activation.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>ap</option></term>
+              <listitem>
+                <para>BSSID of the AP which the command should connect to (for Wi-Fi connections).</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>passwd-file</option></term>
+              <listitem>
+                <para>some networks may require credentials during activation. You can give
+                these credentials using this option. Each line of the file should contain one
+                password in the form:
+
+                <programlisting>setting_name.property_name:the password</programlisting>
+
+                For example, for WPA Wi-Fi with PSK, the line would be
+
+                <programlisting>802-11-wireless-security.psk:secret12345</programlisting>
+
+                For 802.1X password, the line would be
+
+                <programlisting>802-1x.password:my 1X password</programlisting>
+
+                <command>nmcli</command> also accepts <literal>wifi-sec</literal> and <literal>wifi</literal> strings instead of
+                <literal>802-11-wireless-security</literal>. When NetworkManager requires a password and it is
+                not given, <command>nmcli</command> will ask for it when run with <option>--ask</option>.
+                If <option>--ask</option> was not passed, NetworkManager can ask another secret
+                agent that may be running (typically a GUI secret agent, such as nm-applet or
+                gnome-shell).</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>down</command>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+            <arg choice='plain'><option>apath</option></arg>
+          </group>
+          <arg rep='repeat' choice='plain'><replaceable>ID</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Deactivate a connection from a device without preventing the device from
+          further auto-activation. Multiple connections can be passed to the
+          command.</para>
+
+          <para>Be aware that this command deactivates the specified active connection,
+          but 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.</para>
+
+          <para>In most cases you may want to use <command>device disconnect</command>
+          command instead.</para>
+
+          <para>The connection is identified by its name, UUID or D-Bus path. If
+          <replaceable>ID</replaceable> is ambiguous, a keyword <option>id</option>,
+          <option>uuid</option>, <option>path</option> or
+          <option>apath</option> can be used.</para>
+
+          <para> See <command>connection show</command> above for the description of
+          the <replaceable>ID</replaceable>-specifying keywords.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout
+          will be 10 seconds.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>add</command>
+          <arg choice='plain'><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          <arg>con-name <replaceable>name</replaceable></arg>
+          <arg>
+            <option>autoconnect</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+          <arg>
+            <option>save</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+          <arg>master <replaceable>master</replaceable></arg>
+          <arg>slave-type <replaceable>type</replaceable></arg>
+          <arg>type <replaceable>type</replaceable></arg>
+          <arg rep="repeat"><replaceable>ARGUMENTS</replaceable></arg>
+          <arg>ip4 <replaceable>addr</replaceable></arg>
+          <arg>gw4 <replaceable>addr</replaceable></arg>
+          <arg>ip6 <replaceable>addr</replaceable></arg>
+          <arg>gw6 <replaceable>addr</replaceable></arg>
+          <arg>
+            <option>--</option>
+            <arg choice='plain' rep='repeat'>
+              [+|-]<replaceable>setting</replaceable>.<replaceable>property</replaceable>
+              <replaceable>value</replaceable>
+            </arg>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>Add a connection for NetworkManager. Arguments differ according to connection types, see below.</para>
+
+          <variablelist>
+
+            <varlistentry>
+              <term><option>ifname</option></term>
+              <listitem>
+                <para>interface to bind the connection to. The connection will only be
+                applicable to this interface name. A special value of <literal>*</literal>
+                can be used for interface-independent connections. The
+                <option>ifname</option> argument is mandatory for all connection types
+                except bond, team, bridge and vlan. Note: use quotes around
+                <literal>*</literal> to suppress shell expansion.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>con-name</option></term>
+              <listitem>
+                <para>connection name (when not provided a default name is generated:
+                &lt;type&gt;[-&lt;ifname&gt;][-&lt;num&gt;]).</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>autoconnect</option></term>
+              <listitem>
+                <para>whether the connection profile can be automatically activated (default:
+                yes).</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>save</option></term>
+              <listitem>
+                <para>whether the connection should be persistent, i.e. NetworkManager should
+                store it on disk (default: <literal>yes</literal>).</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>master</option></term>
+              <listitem>
+                <para>master interface name, or connection UUID or ID of master connection
+                profile. The value can be prefixed with <literal>ifname/</literal>,
+                <literal>uuid/</literal> or <literal>id/</literal> to disambiguate it.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>slave-type</option></term>
+              <listitem>
+                <para>type of master connection. Only required when it can not be inferred
+                (i.e. the master connection does
+                not exist yet).</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>type</option></term>
+              <listitem>
+                <para>connection type; see below for allowed values. Note that types
+                <option>bond-slave</option>, <option>team-slave</option> and
+                <option>bridge-slave</option> create <option>ethernet</option> connection
+                profiles. Their use is discouraged in favor of using a specific type with
+                <option>master</option> option.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type ethernet</option>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+                <arg><option>cloned-mac</option> <replaceable>addr</replaceable></arg>
+                <arg><option>mtu</option> <replaceable>mtu</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the device this connection is locked to.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>cloned-mac</option></term>
+                    <listitem>
+                      <para>cloned MAC.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mtu</option></term>
+                    <listitem>
+                      <para>MTU.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type wifi</option>
+                <arg choice='plain'><option>ssid</option> <replaceable>SSID</replaceable></arg>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+                <arg><option>cloned-mac</option> <replaceable>addr</replaceable></arg>
+                <arg>
+                  <option>mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>infrastructure</arg>
+                    <arg choice='plain'>ap</arg>
+                    <arg choice='plain'>adhoc</arg>
+                  </group>
+                </arg>
+                <arg><option>mtu</option> <replaceable>mtu</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>ssid</option></term>
+                    <listitem>
+                      <para>SSID.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the device this connection is locked to.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>cloned-mac</option></term>
+                    <listitem>
+                      <para>cloned MAC.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mode</option></term>
+                    <listitem>
+                      <para>Wi-Fi network mode. If blank, <literal>infrastructure</literal>
+                      is assumed.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mtu</option></term>
+                    <listitem>
+                      <para>MTU.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type wimax</option>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+                <arg><option>nsp</option> <replaceable>nsp</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the device this connection is locked to.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>nsp</option></term>
+                    <listitem>
+                      <para>Network Service Provider name.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type pppoe</option>
+                <arg choice='plain'><option>username</option> <replaceable>user</replaceable></arg>
+                <arg><option>password</option> <replaceable>passwd</replaceable></arg>
+                <arg><option>service</option> <replaceable>name</replaceable></arg>
+                <arg><option>mtu</option> <replaceable>mtu</replaceable></arg>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>username</option></term>
+                    <listitem>
+                      <para>PPPoE username.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>password</option></term>
+                    <listitem>
+                      <para>Password for the PPPoE username.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>service</option></term>
+                    <listitem>
+                      <para>PPPoE service name (if required by concentrator).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mtu</option></term>
+                    <listitem>
+                      <para>MTU.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the device this connection is locked to.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type gsm</option>
+                <arg><option>apn</option> <replaceable>APN</replaceable></arg>
+                <arg><option>username</option> <replaceable>user</replaceable></arg>
+                <arg><option>password</option> <replaceable>passwd</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>apn</option></term>
+                    <listitem>
+                      <para>APN - GSM Access Point Name.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>user</option></term>
+                    <listitem>
+                      <para>user name.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>password</option></term>
+                    <listitem>
+                      <para>password.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type cdma</option>
+                <arg><option>username</option> <replaceable>user</replaceable></arg>
+                <arg><option>password</option> <replaceable>passwd</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>user</option></term>
+                    <listitem>
+                      <para>user name.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>password</option></term>
+                    <listitem>
+                      <para>password.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type infiniband</option>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+                <arg><option>mtu</option> <replaceable>mtu</replaceable></arg>
+                <arg>
+                  <option>transport-mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>datagram</arg>
+                    <arg choice='plain'>connected</arg>
+                  </group>
+                </arg>
+                <arg><option>parent</option> <replaceable>device</replaceable></arg>
+                <arg><option>p-key</option> <replaceable>key</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the device this connection is locked to
+                      (InfiniBand MAC is 20 bytes).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mtu</option></term>
+                    <listitem>
+                      <para>MTU.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>transport-mode</option></term>
+                    <listitem>
+                      <para>InfiniBand transport mode.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>parent</option></term>
+                    <listitem>
+                      <para>the interface name of the parent device (if any).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>p-key</option></term>
+                    <listitem>
+                      <para>the InfiniBand P_Key (16-bit unsigned integer).</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type bluetooth</option>
+                <arg><option>addr</option> <replaceable>addr</replaceable></arg>
+                <arg>
+                  <option>bt-type</option>
+                  <group choice='req'>
+                    <arg choice='plain'>panu</arg>
+                    <arg choice='plain'>dun-gsm</arg>
+                    <arg choice='plain'>dun-cdma</arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>addr</option></term>
+                    <listitem>
+                      <para>Bluetooth device address (MAC).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>bt-type</option></term>
+                    <listitem>
+                      <para>Bluetooth connection type.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type vlan</option>
+                <arg choice='plain'><option>dev</option> <replaceable>device</replaceable></arg>
+                <arg choice='plain'><option>id</option> <replaceable>id</replaceable></arg>
+                <arg><option>flags</option> <replaceable>flags</replaceable></arg>
+                <arg><option>ingress</option> <replaceable>mapping</replaceable></arg>
+                <arg><option>egress</option> <replaceable>mapping</replaceable></arg>
+                <arg><option>mtu</option> <replaceable>mtu</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>dev</option></term>
+                    <listitem>
+                      <para>parent device this VLAN is on.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>id</option></term>
+                    <listitem>
+                      <para>VLAN ID in range 0-4095.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>flags</option></term>
+                    <listitem>
+                      <para>flags.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>ingress</option></term>
+                    <listitem>
+                      <para>VLAN ingress priority mapping.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>egress</option></term>
+                    <listitem>
+                      <para>VLAN egress priority mapping.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mtu</option></term>
+                    <listitem>
+                      <para>MTU.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type bond</option>
+                <arg>
+                  <option>mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>active-backup</arg>
+                    <arg choice='plain'>balance-xor</arg>
+                    <arg choice='plain'>broadcast</arg>
+                    <arg choice='plain'>802.3ad</arg>
+                    <arg choice='plain'>balance-tlb</arg>
+                    <arg choice='plain'>balance-alb</arg>
+                    <arg choice='plain'><replaceable>num</replaceable></arg>
+                  </group>
+                </arg>
+                <arg><option>primary</option> <replaceable>ifname</replaceable></arg>
+                <arg><option>miimon</option> <replaceable>num</replaceable></arg>
+                <arg><option>downdelay</option> <replaceable>num</replaceable></arg>
+                <arg><option>updelay</option> <replaceable>num</replaceable></arg>
+                <arg><option>arp-interval</option> <replaceable>num</replaceable></arg>
+                <arg><option>arp-ip-target</option> <replaceable>num</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+
+                  <varlistentry>
+                    <term><option>mode</option></term>
+                    <listitem>
+                      <para>bonding mode (default: <literal>balance-rr</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>primary</option></term>
+                    <listitem>
+                      <para>primary interface name (for <literal>active-backup</literal> mode).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>miimon</option></term>
+                    <listitem>
+                      <para>miimon (default: <literal>100</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>downdelay</option></term>
+                    <listitem>
+                      <para>downdelay (default: <literal>0</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>updelay</option></term>
+                    <listitem>
+                      <para>updelay (default: <literal>0</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>arp-interval</option></term>
+                    <listitem>
+                      <para>ARP interval (default: <literal>0</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>arp-ip-target</option></term>
+                    <listitem>
+                      <para>ARP IP target.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type bond-slave</option>
+                <arg><option>master</option> <replaceable>master</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>master</option></term>
+                    <listitem>
+                      <para>master bond interface name, or connection UUID or
+                      ID of bond master connection profile. The value can be
+                      prefixed with <literal>ifname/</literal>,
+                      <literal>uuid/</literal> or <literal>id/</literal> to
+                      disambiguate it.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type team</option>
+                <arg>
+                  <option>config</option>
+                  <group choice='req'>
+                    <arg choice='plain'>file</arg>
+                    <arg choice='plain'><replaceable>JSON</replaceable></arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+
+                  <varlistentry>
+                    <term><option>config</option></term>
+                    <listitem>
+                      <para>JSON configuration for team.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type team-slave</option>
+                <arg>
+                  <option>config</option>
+                  <option><replaceable>JSON</replaceable></option>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>master</option></term>
+                    <listitem>
+                      <para>master team interface name, or connection UUID or
+                      ID of team master connection profile. The value can be
+                      prefixed with <literal>ifname/</literal>,
+                      <literal>uuid/</literal> or <literal>id/</literal>to
+                      disambiguate it.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>config</option></term>
+                    <listitem>
+                      <para>JSON configuration for team.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type bridge</option>
+                <arg>
+                  <option>stp</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+                <arg><option>priority</option> <replaceable>num</replaceable></arg>
+                <arg><option>forward-delay</option> <replaceable>2-30</replaceable></arg>
+                <arg><option>hello-time</option> <replaceable>1-10</replaceable></arg>
+                <arg><option>max-age</option> <replaceable>6-42</replaceable></arg>
+                <arg><option>ageing-time</option> <replaceable>0-1000000</replaceable></arg>
+                <arg>
+                  <option>multicast-snooping</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+                <arg><option>mac</option> <replaceable>addr</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>stp</option></term>
+                    <listitem>
+                      <para>controls whether Spanning Tree Protocol (STP) is enabled for this bridge
+                      (default: <literal>yes</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>priority</option></term>
+                    <listitem>
+                      <para>sets STP priority (default: <literal>128</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>forward-delay</option></term>
+                    <listitem>
+                      <para>STP forwarding delay, in seconds (default: <literal>15</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>hello-time</option></term>
+                    <listitem>
+                      <para>STP hello time, in seconds (default: <literal>2</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>max-age</option></term>
+                    <listitem>
+                      <para>STP maximum message age, in seconds (default: <literal>20</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>ageing-time</option></term>
+                    <listitem>
+                      <para>the Ethernet MAC address aging time, in seconds (default: <literal>300</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>multicast-snooping</option></term>
+                    <listitem>
+                      <para>controls whether IGMP snooping is enabled (default: <literal>yes</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mac</option></term>
+                    <listitem>
+                      <para>MAC address of the bridge (note: this requires a recent kernel feature,
+                      originally introduced in 3.15 upstream kernel).</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type bridge-slave</option>
+                <arg><option>master</option> <replaceable>master</replaceable></arg>
+                <arg><option>priority</option> <replaceable>num</replaceable></arg>
+                <arg><option>path-cost</option> <replaceable>1-65535</replaceable></arg>
+                <arg>
+                  <option>hairpin</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>master</option></term>
+                    <listitem>
+                      <para>master bridge interface name, or connection UUID
+                      or ID of bridge master connection profile. The value
+                      can be prefixed with <literal>ifname/</literal>,
+                      <literal>uuid/</literal> or <literal>id/</literal>
+                      to disambiguate it.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>priority</option></term>
+                    <listitem>
+                      <para>STP priority of this slave (default: <literal>32</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>path-cost</option></term>
+                    <listitem>
+                      <para>STP port cost for destinations via this slave (default: <literal>100</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>hairpin</option></term>
+                    <listitem>
+                       <para>'hairpin mode' for the slave, which allows frames to be sent back out
+                       through the slave the frame was received on (default: <literal>yes</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type vpn</option>
+                <arg><option>type</option> <replaceable>type</replaceable></arg>
+                <arg><option>user</option> <replaceable>username</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>vpn-type</option></term>
+                    <listitem>
+                      <para>VPN type.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>user</option></term>
+                    <listitem>
+                      <para>VPN username.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type olpc-mesh</option>
+                <arg choice='plain'><option>ssid</option> <replaceable>SSID</replaceable></arg>
+                <arg><option>channel</option> <replaceable>1-13</replaceable></arg>
+                <arg><option>dhcp-anycast</option> <replaceable>MAC</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>ssid</option></term>
+                    <listitem>
+                      <para>SSID.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>channel</option></term>
+                    <listitem>
+                      <para>channel to use for the network.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>dhcp-anycast</option></term>
+                    <listitem>
+                      <para>anycast DHCP MAC address used when requesting an IP address via DHCP.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type adsl</option>
+                <arg choice='plain'><option>username</option> <replaceable>username</replaceable></arg>
+                <arg choice='plain'>
+                  <option>protocol</option>
+                  <group choice='req'>
+                    <arg choice='plain'>pppoa</arg>
+                    <arg choice='plain'>pppoe</arg>
+                    <arg choice='plain'>ipoatm</arg>
+                  </group>
+                </arg>
+                <arg><option>password</option> <replaceable>passwd</replaceable></arg>
+                <arg>
+                  <option>encapsulation</option>
+                  <group choice='req'>
+                    <arg choice='plain'>vcmux</arg>
+                    <arg choice='plain'>llc</arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>username</option></term>
+                    <listitem>
+                      <para>ADSL user name.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>protocol</option></term>
+                    <listitem>
+                      <para>ADSL protocol.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>password</option></term>
+                    <listitem>
+                      <para>ADSL password.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>encapsulation</option></term>
+                    <listitem>
+                      <para>ADSL encapsulation.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type tun</option>
+                <arg choice='plain'>
+                  <option>mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>tun</arg>
+                    <arg choice='plain'>tap</arg>
+                  </group>
+                </arg>
+                <arg><option>owner</option> <replaceable>UID</replaceable></arg>
+                <arg><option>group</option> <replaceable>GID</replaceable></arg>
+                <arg>
+                  <option>pi</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+                <arg>
+                  <option>vnet-hdr</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+                <arg>
+                  <option>multi-queue</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>mode</option></term>
+                    <listitem>
+                      <para>Mode for the device.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>owner</option></term>
+                    <listitem>
+                      <para>UID of the owner.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>group</option></term>
+                    <listitem>
+                      <para>GID of the group.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>pi</option></term>
+                    <listitem>
+                      <para>include packet information (~IFF_NO_PI flag).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>vnet-hdr</option></term>
+                    <listitem>
+                      <para>send and receive large (i.e. GSO) packets and packets with partial
+                      checksums (IFF_VNET_HDR flag).</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>multi-queue</option></term>
+                    <listitem>
+                      <para>multi-queue support for tun/tap device (IFF_MULTI_QUEUE flag).</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type ip-tunnel</option>
+                <arg choice='plain'>
+                  <option>mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>ipip</arg>
+                    <arg choice='plain'>gre</arg>
+                    <arg choice='plain'>sit</arg>
+                    <arg choice='plain'>isatap</arg>
+                    <arg choice='plain'>vti</arg>
+                    <arg choice='plain'>ip6ip6</arg>
+                    <arg choice='plain'>ipip6</arg>
+                    <arg choice='plain'>ip6gre</arg>
+                    <arg choice='plain'>vti6</arg>
+                    <arg choice='plain'>tun</arg>
+                  </group>
+                </arg>
+                <arg choice='plain'><option>remote</option> <replaceable>addr</replaceable></arg>
+                <arg><option>local</option> <replaceable>addr</replaceable></arg>
+                <arg><option>dev</option> <replaceable>device</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>mode</option></term>
+                    <listitem>
+                      <para>tunnel mode.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>remote</option></term>
+                    <listitem>
+                      <para>IPv4 or IPv6 address of the remote tunnel endpoint.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>local</option></term>
+                    <listitem>
+                      <para>IPv4 or IPv6 address of the local tunnel endpoint.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>dev</option></term>
+                    <listitem>
+                      <para>device to use for tunnel endpoint communication.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type macvlan</option>
+                <arg choice='plain'><option>dev</option> <replaceable>device</replaceable></arg>
+                <arg choice='plain'>
+                  <option>mode</option>
+                  <group choice='req'>
+                    <arg choice='plain'>vepa</arg>
+                    <arg choice='plain'>bridge</arg>
+                    <arg choice='plain'>private</arg>
+                    <arg choice='plain'>passthru</arg>
+                    <arg choice='plain'>source</arg>
+                  </group>
+                </arg>
+                <arg>
+                  <option>tap</option>
+                  <group choice='req'>
+                    <arg choice='plain'>yes</arg>
+                    <arg choice='plain'>no</arg>
+                  </group>
+                </arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>dev</option></term>
+                    <listitem>
+                      <para>parent device this MACVLAN is on.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>mode</option></term>
+                    <listitem>
+                      <para>MACVLAN mode, which specifies the communication mechanism between
+                      multiple MACVLANs on the same lower device.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>tap</option></term>
+                    <listitem>
+                      <para>controls the device type. If set to 'yes' a MACVTAP will be created
+                      (default: <literal>no</literal>).</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
+                <option>type vxlan</option>
+                <arg choice='plain'><option>id</option> <replaceable>id</replaceable></arg>
+                <arg choice='plain'><option>remote</option> <replaceable>addr</replaceable></arg>
+                <arg><option>dev</option> <replaceable>parent device (ifname or connection UUID)</replaceable></arg>
+                <arg><option>local</option> <replaceable>addr</replaceable></arg>
+                <arg><option>source-port-min</option> <replaceable>0-65535</replaceable></arg>
+                <arg><option>source-port-max</option> <replaceable>0-65535</replaceable></arg>
+                <arg><option>destination-port</option> <replaceable>0-65535</replaceable></arg>
+              </term>
+              <listitem>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>id</option></term>
+                    <listitem>
+                      <para>VXLAN Network Identifer to use.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>remote</option></term>
+                    <listitem>
+                      <para>unicast destination IP address or multicast IP address to join.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>dev</option></term>
+                    <listitem>
+                      <para>device to use for tunnel endpoint communication.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>local</option></term>
+                    <listitem>
+                      <para>source IP address.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>source-port-min</option></term>
+                    <listitem>
+                      <para>minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>source-port-max</option></term>
+                    <listitem>
+                      <para>maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.</para>
+                    </listitem>
+                  </varlistentry>
+
+                  <varlistentry>
+                    <term><option>destination-port</option></term>
+                    <listitem>
+                      <para>UDP destination port to communicate to the remote VXLAN tunnel endpoint.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>ip4</option></term>
+              <term><option>gw4</option></term>
+              <listitem>
+                <para>IPv4 addresses.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>ip6</option></term>
+              <term><option>gw6</option></term>
+              <listitem>
+                <para>IPv6 addresses.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><option>--</option></term>
+              <listitem>
+                <para>If a <option>--</option> argument is encountered, the rest of command
+                line is interpreted as property list in the same format as <command>connection
+                modify</command> command accepts.  This makes it possible to adjust the
+                connection properties before it's added.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>edit</command>
+          <group choice='req'>
+            <arg choice='plain'>
+              <group>
+                <arg choice='plain'><option>id</option></arg>
+                <arg choice='plain'><option>uuid</option></arg>
+                <arg choice='plain'><option>path</option></arg>
+              </group>
+              <arg rep='repeat' choice='plain'><replaceable>ID</replaceable></arg>
+            </arg>
+            <arg choice='plain'>
+              <arg><option>type</option> <replaceable>type</replaceable></arg>
+              <arg><option>con-name</option> <replaceable>name</replaceable></arg>
+            </arg>
+          </group>
+        </term>
+
+        <listitem>
+          <para>Edit an existing connection or add a new one, using an interactive editor.</para>
+
+          <para>The existing connection is identified by its name, UUID or D-Bus path. If
+          <replaceable>ID</replaceable> is ambiguous, a keyword <option>id</option>,
+          <option>uuid</option>, or <option>path</option> can be used. See
+          <command>connection show</command> above for the description of the
+          <replaceable>ID</replaceable>-specifying keywords. Not providing an
+          <replaceable>ID</replaceable> means that a new connection will be added.</para>
+
+          <para>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.</para>
+
+          <para>Available options:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>type</option></term>
+              <listitem>
+                  <para>type of the new connection; valid types are the same as for
+                  <command>connection add</command> command.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>con-name</option></term>
+              <listitem>
+                  <para>name for the new connection. It can be changed later in the editor.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+
+          <para>See also
+          <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum>
+          </citerefentry> for all NetworkManager settings and property names, and their
+          descriptions; and
+          <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+          for sample editor sessions.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>modify</command>
+          <arg><option>--temporary</option></arg>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg choice='plain'><replaceable>ID</replaceable></arg>
+          <arg choice='plain' rep='repeat'>
+            [+|-]<replaceable>setting</replaceable>.<replaceable>property</replaceable>
+            <replaceable>value</replaceable>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>Modify one or more properties in the connection profile.</para>
+
+          <para>The connection is identified by its name, UUID or D-Bus path. If
+          <replaceable>ID</replaceable> is ambiguous, a keyword <option>id</option>,
+          <option>uuid</option> or <option>path</option> can be used. See
+          <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum>
+          </citerefentry> for setting and property names, their descriptions and default
+          values. This command supports abbreviations for <replaceable>setting</replaceable>
+          and <replaceable>property</replaceable> provided they are unique. Empty
+          <replaceable>value</replaceable> ("") removes the property value (sets
+          the property to the default value). The provided value overwrites the existing
+          property value.</para>
+
+          <para>If you want to append an item to the existing value, use
+          <literal>+</literal> prefix for the property name. If you want to remove just
+          one item from container-type property, use <literal>-</literal> 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
+          <replaceable>value</replaceable>. Of course, <literal>+</literal> and
+          <literal>-</literal> only have a real effect for multi-value (container)
+          properties like <literal>ipv4.dns</literal>, <literal>ipv4.addresses</literal>,
+          <literal>bond.options</literal>, etc.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>clone</command>
+          <arg><option>--temporary</option></arg>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg choice='plain' rep='repeat'><replaceable>ID</replaceable></arg>
+          <arg choice='plain'><option>new</option> <replaceable>name</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Clone a connection. The connection to be cloned is identified by its
+          name, UUID or D-Bus path. If <replaceable>ID</replaceable> is ambiguous, a keyword
+          <option>id</option>, <option>uuid</option> or <option>path</option>
+          can be used. See <command>connection show</command> above for the description
+          of the <replaceable>ID</replaceable>-specifying keywords. <replaceable>name</replaceable> is
+          the name of the new cloned connection. The new connection will be the exact
+          copy except the connection.id (<replaceable>name</replaceable>) and
+          connection.uuid (generated) properties.</para>
+
+          <para>The new connection profile will be saved as persistent unless
+          <option>--temporary</option> option is specified, in which case the new profile
+          won't exist after NetworkManager restart.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>delete</command>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg choice='plain' rep='repeat'><replaceable>ID</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Delete a configured connection. The connection to be deleted is
+          identified by its name, UUID or D-Bus path. If <replaceable>ID</replaceable> is ambiguous, a
+          keyword <option>id</option>, <option>uuid</option> or <option>path</option> can be used.
+          See <command>connection show</command> above for the description of
+          the <replaceable>ID</replaceable>-specifying keywords.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout will be 10
+          seconds.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>monitor</command>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg choice='plain' rep='repeat'><replaceable>ID</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Monitor connection profile activity. This command prints a line whenever
+          the specified connection changes. The connection to be monitored is identified
+          by its name, UUID or D-Bus path. If <replaceable>ID</replaceable> is ambiguous, a keyword
+          <option>id</option>, <option>uuid</option> or <option>path</option>
+          can be used. See <command>connection show</command> above for the description of the
+          <replaceable>ID</replaceable>-specifying keywords.</para>
+
+          <para>Monitors all connection profiles in case none is specified. The command
+          terminates when all monitored connections disappear. If you want to monitor
+          connection creation consider using the global monitor with <command>nmcli
+          monitor</command> command.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>reload</command>
+        </term>
+
+        <listitem>
+          <para>Reload all connection files from disk.
+          NetworkManager does not monitor changes to connection
+          files by default. So you need to use this command in order to tell
+          NetworkManager 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 NetworkManager will reload connection
+          files any time they change (monitor-connection-files=true in
+          <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>load</command>
+          <arg choice='plain' rep='repeat'><replaceable>filename</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Load/reload one or more connection files from disk. Use this after
+          manually editing a connection file to ensure that
+          NetworkManager is aware of its latest state.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>import</command>
+          <arg><option>--temporary</option></arg>
+          <arg><option>type</option> <replaceable>type</replaceable></arg>
+          <arg><option>file</option> <replaceable>file</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Import an external/foreign configuration as a NetworkManager connection
+          profile. The type of the input file is specified by <option>type</option>
+          option.</para>
+
+          <para>Only VPN configurations are supported at the moment. The configuration is
+          imported by NetworkManager VPN plugins. <option>type</option> values are
+          the same as for <option>vpn-type</option> option in <command>nmcli
+          connection add</command>. VPN configurations are imported by VPN plugins.
+          Therefore the proper VPN plugin has to be installed so that <command>nmcli</command> could import
+          the data.</para>
+
+          <para>The imported connection profile will be saved as persistent unless
+          <option>--temporary</option> option is specified, in which case the new profile
+          won't exist after NetworkManager restart.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>export</command>
+          <group>
+            <arg choice='plain'><option>id</option></arg>
+            <arg choice='plain'><option>uuid</option></arg>
+            <arg choice='plain'><option>path</option></arg>
+          </group>
+          <arg choice='plain'><replaceable>ID</replaceable></arg>
+          <arg><replaceable>file</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Export a connection.</para>
+
+          <para>Only VPN connections are supported at the moment. A proper VPN plugin has
+          to be installed so that <command>nmcli</command> could export a connection. If no
+          <replaceable>file</replaceable> is provided, the VPN configuration
+          data will be printed to standard output.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='device'><title>Device Management Commands</title>
+
+    <cmdsynopsis>
+      <command>nmcli device</command>
+      <group choice='req'>
+        <arg choice='plain'><command>status</command></arg>
+        <arg choice='plain'><command>show</command></arg>
+        <arg choice='plain'><command>set</command></arg>
+        <arg choice='plain'><command>connect</command></arg>
+        <arg choice='plain'><command>reapply</command></arg>
+        <arg choice='plain'><command>disconnect</command></arg>
+        <arg choice='plain'><command>delete</command></arg>
+        <arg choice='plain'><command>monitor</command></arg>
+        <arg choice='plain'><command>wifi</command></arg>
+        <arg choice='plain'><command>lldp</command></arg>
+      </group>
+      <arg rep='repeat'><replaceable>ARGUMENTS</replaceable></arg>
+    </cmdsynopsis>
+
+    <para>Show and manage network interfaces.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><command>status</command></term>
+
+        <listitem>
+          <para>Print status of devices.</para>
+
+          <para>This is the default action if no command is specified to
+          <command>nmcli device</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>show</command>
+          <arg><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>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.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>set</command>
+          <arg>ifname</arg>
+          <arg choice='plain'><replaceable>ifname</replaceable></arg>
+          <arg>
+            <option>autoconnect</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+          <arg>
+            <option>managed</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>Set device properties.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>connect</command>
+          <arg><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>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.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout will be 90
+          seconds.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>reapply</command>
+          <arg><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Attempt to update device with changes to the currently active connection
+          made since it was last applied.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>disconnect</command>
+          <arg rep='repeat'><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Disconnect a device and prevent the device from automatically activating
+          further connections without user/manual intervention. Note that disconnecting
+          software devices may mean that the devices will disappear.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout
+          will be 10 seconds.</para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
+        <term>
+          <command>delete</command>
+          <arg rep='repeat'><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Delete a device. The command removes the interface from the system. Note
+          that this only works for software devices like bonds, bridges, teams, etc.
+          Hardware devices (like Ethernet) cannot be deleted by the command.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout will be 10
+          seconds.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>monitor</command>
+          <arg rep='repeat'><replaceable>ifname</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Monitor device activity. This command prints a line whenever the
+          specified devices change state.</para>
+
+          <para>Monitors all devices in case no interface is specified. The monitor
+          terminates when all specified devices disappear. If you want to monitor device
+          addition consider using the global monitor with <command>nmcli
+          monitor</command> command.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>wifi</command>
+          <arg>
+            <command>list</command>
+            <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+            <arg><option>bssid</option> <replaceable>BSSID</replaceable></arg>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>List available Wi-Fi access points. The <option>ifname</option> and
+          <option>bssid</option> options can be used to list APs for a particular
+          interface or with a specific BSSID, respectively.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>wifi</command>
+          <command>connect</command>
+          <arg choice='plain'><replaceable>(B)SSID</replaceable></arg>
+          <arg><option>password</option> <replaceable>password</replaceable></arg>
+          <arg>
+            <option>wep-key-type</option>
+            <group choice='req'>
+              <arg choice='plain'>key</arg>
+              <arg choice='plain'>phrase</arg>
+            </group>
+          </arg>
+          <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          <arg><option>bssid</option> <replaceable>BSSID</replaceable></arg>
+          <arg><option>name</option> <replaceable>name</replaceable></arg>
+          <arg>
+            <option>private</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+          <arg>
+            <option>hidden</option>
+            <group choice='req'>
+              <arg choice='plain'>yes</arg>
+              <arg choice='plain'>no</arg>
+            </group>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>Connect to a Wi-Fi network specified by SSID or BSSID. The command
+          creates a new connection and then activates it on a device. This is a
+          command-line 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-Fi networks. If a connection for the network already exists, it is
+          better to bring up (activate) the existing connection as follows:
+          <command>nmcli con up id <replaceable>name</replaceable></command>. Note that
+          only open, WEP and WPA-PSK networks are supported at the moment. It is also
+          supposed that IP configuration is obtained via DHCP.</para>
+
+          <para>If <option>--wait</option> option is not specified, the default timeout will be 90
+          seconds.</para>
+
+          <para>Available options are:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>password</option></term>
+              <listitem>
+                <para>password for secured networks (WEP or WPA).</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>wep-key-type</option></term>
+              <listitem>
+                <para>type of WEP secret, either <option>key</option> for ASCII/HEX key or
+                <option>phrase</option> for passphrase.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>ifname</option></term>
+              <listitem>
+                <para>interface that will be used for activation.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>bssid</option></term>
+              <listitem>
+                <para>if specified, the created connection will be restricted just for the
+                BSSID.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>name</option></term>
+              <listitem>
+                <para>if specified, the connection will use the name (else NM creates a name
+                itself).</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>private</option></term>
+              <listitem>
+                <para>if set to <literal>yes</literal>, the connection will only be visible
+                to the user who created it. Otherwise the connection is system-wide, which is
+                the default.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>hidden</option></term>
+              <listitem>
+                <para>set to <literal>yes</literal> when connecting for the first time to an
+                AP not broadcasting its SSID. Otherwise the SSID would not be found and the
+                connection attempt would fail.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>wifi</command>
+          <command>hotspot</command>
+          <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          <arg><option>con-name</option> <replaceable>name</replaceable></arg>
+          <arg><option>ssid</option> <replaceable>SSID</replaceable></arg>
+          <arg>
+            <option>band</option>
+            <group choice='req'>
+              <arg choice='plain'>a</arg>
+              <arg choice='plain'>bg</arg>
+            </group>
+          </arg>
+          <arg><option>channel</option> <replaceable>channel</replaceable></arg>
+          <arg><option>password</option> <replaceable>password</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Create a Wi-Fi hotspot. The command creates a hotspot connection profile
+          according to Wi-Fi device capabilities and activates it on the device. The
+          hotspot is secured with WPA if device/driver supports that, otherwise WEP is
+          used. Use <command>connection down</command> or <command>device
+          disconnect</command> to stop the hotspot.</para>
+
+          <para>Parameters of the hotspot can be influenced by the optional
+          parameters:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><option>ifname</option></term>
+              <listitem>
+                <para>what Wi-Fi device is used.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>con-name</option></term>
+              <listitem>
+                <para>name of the created hotspot connection profile.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>ssid</option></term>
+              <listitem>
+                <para>SSID of the hotspot.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>band</option></term>
+              <listitem>
+                <para>Wi-Fi band to use.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>channel</option></term>
+              <listitem>
+                <para>Wi-Fi channel to use.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>password</option></term>
+              <listitem>
+                <para>password to use for the created hotspot. If not provided, <command>nmcli</command> will
+                generate a password. The password is either WPA pre-shared key or WEP
+                key.</para>
+
+                <para>Note that <option>--show-secrets</option> global option can be used to
+                print the hotspot password. It is useful especially when the password was
+                generated.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>wifi</command>
+          <command>rescan</command>
+          <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          <arg rep='repeat'><option>ssid</option> <replaceable>SSID</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Request that NetworkManager immediately re-scan for
+          available access points. NetworkManager scans Wi-Fi networks periodically, but
+          in some cases it can be useful to start scanning manually (e.g. after resuming
+          the computer). By using <option>ssid</option>, it is possible to scan for a
+          specific SSID, which is useful for APs with hidden SSIDs. You can provide
+          multiple <option>ssid</option> parameters in order to scan more
+          SSIDs.</para>
+
+          <para>This command does not show the APs, use <command>nmcli device wifi list</command>
+          for that.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>lldp</command>
+          <arg>
+            <command>list</command>
+            <arg><option>ifname</option> <replaceable>ifname</replaceable></arg>
+          </arg>
+        </term>
+
+        <listitem>
+          <para>Display information about neighboring devices learned through the Link
+          Layer Discovery Protocol (LLDP). The <option>ifname</option> option can be
+          used to list neighbors only for a given interface. The protocol must be enabled
+          in the connection settings.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='agent'><title>Secret Agent</title>
+
+    <cmdsynopsis>
+      <command>nmcli agent</command>
+      <group choice='req'>
+        <arg choice='plain'><command>secret</command></arg>
+        <arg choice='plain'><command>polkit</command></arg>
+        <arg choice='plain'><command>all</command></arg>
+      </group>
+    </cmdsynopsis>
+
+    <para>Run <command>nmcli</command> as a NetworkManager secret agent, or polkit agent.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term><command>secret</command></term>
+
+        <listitem>
+          <para>Register <command>nmcli</command> as a NetworkManager secret agent and listen for secret
+          requests. You do usually not need this command, because <command>nmcli</command> can handle
+          secrets when connecting to networks. However, you may find the command useful
+          when you use another tool for activating connections and you do not have a
+          secret agent available (like nm-applet).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>polkit</command>
+        </term>
+
+        <listitem>
+          <para>Register <command>nmcli</command> as a polkit agent for the user session and listen for
+          authorization requests. You do not usually need this command, because <command>nmcli</command> can
+          handle polkit actions related to NetworkManager operations (when run with
+          <option>--ask</option>). However, you may find the command useful when you want
+          to run a simple text based polkit agent and you do not have an agent of a desktop
+          environment.  Note that running this command makes <command>nmcli</command> handle all polkit requests,
+          not only NetworkManager related ones, because only one polkit agent can run for the
+          session.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <command>all</command>
+        </term>
+
+        <listitem>
+          <para>Runs <command>nmcli</command> as both NetworkManager secret and a polkit agent.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1 id='environment_variables'><title>Environment Variables</title>
+
+    <para><command>nmcli</command>'s behavior is affected by the following
+    environment variables.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><envar>LC_ALL</envar></term>
+        <listitem>
+          <para>If set to a non-empty string value, it overrides the values of all the
+          other internationalization variables.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><envar>LC_MESSAGES</envar></term>
+        <listitem>
+          <para>Determines the locale to be used for internationalized messages.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><envar>LANG</envar></term>
+        <listitem>
+          <para>Provides a default value for the internationalization variables that are
+          unset or null.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1 id='internationalization_notes'><title>Internationalization notes</title>
+
+    <para>Be aware that <command>nmcli</command> is localized and that is why the
+    output depends on your environment. This is important to realize especially
+    when you parse the output.</para>
+
+    <para>Call <command>nmcli</command> as <command>LC_ALL=C nmcli</command> to
+    be sure the locale is set to <literal>C</literal> while executing in a script.</para>
+
+    <para><envar>LC_ALL</envar>, <envar>LC_MESSAGES</envar>, <envar>LANG</envar>
+    variables specify the <envar>LC_MESSAGES</envar> locale category (in that
+    order), which determines the language that <command>nmcli</command> uses for
+    messages. The <literal>C</literal> locale is used if none of these variables are set, and this
+    locale uses English messages.</para>
+
+  </refsect1>
+
+  <refsect1 id='exit_status'><title>Exit Status</title>
+
+    <para><command>nmcli</command> exits with status 0 if it succeeds, a value
+    greater than 0 is returned if an error occurs.</para>
+
+    <variablelist spacing='compact' termlength='3'>
+      <varlistentry>
+        <term><errorcode>0</errorcode></term>
+        <listitem>
+          <para>Success &ndash; indicates the operation succeeded.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>1</errorcode></term>
+        <listitem>
+          <para>Unknown or unspecified error.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>2</errorcode></term>
+        <listitem>
+          <para>Invalid user input, wrong <command>nmcli</command>
+          invocation.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>3</errorcode></term>
+        <listitem>
+          <para>Timeout expired (see <option>--wait</option> option).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>4</errorcode></term>
+        <listitem>
+          <para>Connection activation failed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>5</errorcode></term>
+        <listitem>
+          <para>Connection deactivation failed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>6</errorcode></term>
+        <listitem>
+          <para>Disconnecting device failed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>7</errorcode></term>
+        <listitem>
+          <para>Connection deletion failed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>8</errorcode></term>
+        <listitem>
+          <para>NetworkManager is not running.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>9</errorcode></term>
+        <listitem>
+          <para><command>nmcli</command> and <command>NetworkManager</command>
+          versions mismatch.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><errorcode>10</errorcode></term>
+        <listitem>
+          <para>Connection, device, or access point does not exist.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='examples'><title>Examples</title>
+
+    <para>This section presents various examples of <command>nmcli</command> usage. If you want even
+    more, please refer to
+    <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+    manual page.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><userinput>nmcli -t -f RUNNING general</userinput></term>
+        <listitem>
+          <para>tells you whether NetworkManager is running or not.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -t -f STATE general</userinput></term>
+        <listitem>
+          <para>shows the overall status of NetworkManager.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli radio wifi off</userinput></term>
+        <listitem>
+          <para>switches Wi-Fi off.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli connection show</userinput></term>
+        <listitem>
+          <para>lists all connections NetworkManager has.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -p -m multiline -f all con show</userinput></term>
+        <listitem>
+          <para>shows all configured connections in multi-line mode.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli connection show --active</userinput></term>
+        <listitem>
+          <para>lists all currently active connections.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -f name,autoconnect c s</userinput></term>
+        <listitem>
+          <para>shows all connection profile names and their auto-connect property.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -p connection show "My default em1"</userinput></term>
+        <listitem>
+          <para>shows details for "My default em1" connection profile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli --show-secrets connection show "My Home WiFi"</userinput></term>
+        <listitem>
+          <para>shows details for "My Home WiFi" connection profile with all passwords.
+          Without <option>--show-secrets</option> option, secrets would not be
+          displayed.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -f active connection show "My default em1"</userinput></term>
+        <listitem>
+          <para>shows details for "My default em1" active connection, like IP, DHCP
+          information, etc.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -f profile con s "My wired connection"</userinput></term>
+        <listitem>
+          <para>shows static configuration details of the connection profile with "My
+          wired connection" name.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -p con up "My wired connection" ifname eth0</userinput></term>
+        <listitem>
+          <para>activates the connection profile with name "My wired connection" on
+          interface eth0. The -p option makes <command>nmcli</command> show progress of the
+          activation.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con up 6b028a27-6dc9-4411-9886-e9ad1dd43761 ap 00:3A:98:7C:42:D3</userinput></term>
+        <listitem>
+          <para>connects the Wi-Fi connection with UUID
+          6b028a27-6dc9-4411-9886-e9ad1dd43761 to the AP with BSSID
+          00:3A:98:7C:42:D3.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli device status</userinput></term>
+        <listitem>
+          <para>shows the status for all devices.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli dev disconnect em2</userinput></term>
+        <listitem>
+          <para>disconnects a connection on interface em2 and marks the device as
+          unavailable for auto-connecting. 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.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -f GENERAL,WIFI-PROPERTIES dev show wlan0</userinput></term>
+        <listitem>
+          <para>shows details for wlan0 interface; only GENERAL and WIFI-PROPERTIES
+          sections will be shown.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -f CONNECTIONS device show wlp3s0</userinput></term>
+        <listitem>
+          <para>shows all available connection profiles for your Wi-Fi interface
+          wlp3s0.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli dev wifi</userinput></term>
+        <listitem>
+          <para>lists available Wi-Fi access points known to NetworkManager.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli dev wifi con "Cafe Hotspot 1" password caffeine name "My cafe"</userinput></term>
+        <listitem>
+          <para>creates a new connection named "My cafe" and then connects it to "Cafe
+          Hotspot 1" SSID using password "caffeine". This is mainly useful when
+          connecting to "Cafe Hotspot 1" for the first time. Next time, it is better to
+          use <command>nmcli con up id "My cafe"</command> so that the
+          existing connection profile can be used and no additional is created.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli -s dev wifi hotspot con-name QuickHotspot</userinput></term>
+        <listitem>
+          <para>creates a hotspot profile and connects it. Prints the hotspot password
+          the user should use to connect to the hotspot from other devices.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli connection add type ethernet autoconnect no ifname eth0</userinput></term>
+        <listitem>
+          <para>non-interactively adds an Ethernet connection tied to eth0 interface with
+          automatic IP configuration (DHCP), and disables the connection's <literal>autoconnect</literal>
+          flag.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli c a ifname Maxipes-fik type vlan dev eth0 id 55</userinput></term>
+        <listitem>
+          <para>non-interactively adds a VLAN connection with ID 55. The connection will
+          use eth0 and the VLAN interface will be named Maxipes-fik.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli c a ifname eth0 type ethernet -- ipv4.method disabled ipv6.method link-local</userinput></term>
+        <listitem>
+          <para>non-interactively adds a connection that will use eth0 Ethernet interface
+          and only have an IPv6 link-local address configured.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli connection edit ethernet-em1-2</userinput></term>
+        <listitem>
+          <para>edits existing "ethernet-em1-2" connection in the interactive
+          editor.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli connection edit type ethernet con-name "yet another Ethernet connection"</userinput></term>
+        <listitem>
+          <para>adds a new Ethernet connection in the interactive editor.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con mod ethernet-2 connection.autoconnect no</userinput></term>
+        <listitem>
+          <para>modifies 'autoconnect' property in the 'connection' setting of
+          'ethernet-2' connection.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con mod "Home Wi-Fi" wifi.mtu 1350</userinput></term>
+        <listitem>
+          <para>modifies 'mtu' property in the 'wifi' setting of 'Home Wi-Fi'
+          connection.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con mod em1-1 ipv4.method manual ipv4.addr "192.168.1.23/24 192.168.1.1, 10.10.1.5/8, 10.0.0.11"</userinput></term>
+        <listitem>
+          <para>sets manual addressing and the addresses in em1-1 profile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con modify ABC +ipv4.dns 8.8.8.8</userinput></term>
+        <listitem>
+          <para>appends a Google public DNS server to DNS servers in ABC profile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con modify ABC -ipv4.addresses "192.168.100.25/24 192.168.1.1"</userinput></term>
+        <listitem>
+          <para>removes the specified IP address from (static) profile ABC.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con import type openvpn file ~/Downloads/frootvpn.ovpn</userinput></term>
+        <listitem>
+          <para>imports an OpenVPN configuration to NetworkManager.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><userinput>nmcli con export corp-vpnc /home/joe/corpvpn.conf</userinput></term>
+        <listitem>
+          <para>exports NetworkManager VPN profile corp-vpnc as standard Cisco (vpnc)
+          configuration.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='notes'><title>Notes</title>
+    <para><command>nmcli</command> 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 compatibility it is therefore strongly
+    advised to spell out the full option names.</para>
+  </refsect1>
+
+  <refsect1 id='bugs'><title>Bugs</title>
+    <para>There are probably some bugs. If you find a bug, please report it to
+    https://bugzilla.gnome.org/ &mdash; product <literal>NetworkManager</literal>.</para>
+  </refsect1>
+
+  <refsect1 id='see_also'><title>See Also</title>
+    <para><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+  </refsect1>
+
+</refentry>
diff --git a/man/nmtui.1 b/man/nmtui.1
new file mode 100644
index 00000000..832d65d3
--- /dev/null
+++ b/man/nmtui.1
@@ -0,0 +1,76 @@
+'\" t
+.\"     Title: nmtui
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 04/05/2016
+.\"    Manual: General Commands Manual
+.\"    Source: NetworkManager 1.1.93
+.\"  Language: English
+.\"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.1\&.93" "General Commands Manual"
+.\" -----------------------------------------------------------------
+.\" * 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"
+nmtui \- Text User Interface for controlling NetworkManager
+.SH "SYNOPSIS"
+.HP \w'\fBnmtui\-edit\ |\ nmtui\ edit\ \fR\ 'u
+\fBnmtui\-edit | nmtui\ edit \fR {\fIname\fR\ |\ \fIid\fR}
+.HP \w'\fBnmtui\-connect\ |\ nmtui\ connect\ \fR\ 'u
+\fBnmtui\-connect | nmtui\ connect \fR {\fIname\fR\ |\ \fIuuid\fR\ |\ \fIdevice\fR\ |\ \fISSID\fR}
+.HP \w'\fBnmtui\-hostname\ |\ nmtui\ hostname\ \fR\ 'u
+\fBnmtui\-hostname | nmtui\ hostname \fR
+.SH "DESCRIPTION"
+.PP
+\fBnmtui\fR
+is a curses\(hybased TUI application for interacting with NetworkManager\&. When starting
+\fBnmtui\fR, the user is prompted to choose the activity to perform unless it was specified as the first argument\&.
+.PP
+The supported activities are:
+.PP
+\fBedit\fR
+.RS 4
+Show a connection editor that supports adding, modifying, viewing and deleting connections\&. It provides similar functionality as
+\fBnm\-connection\-editor\fR\&.
+.RE
+.PP
+\fBconnect\fR
+.RS 4
+Show a list of available connections, with the option to activate or deactivate them\&. It provides similar functionality as
+\fBnm\-applet\fR\&.
+.RE
+.PP
+\fBhostname\fR
+.RS 4
+Set the system hostname\&.
+.RE
+.PP
+Corresponding to above activities,
+\fBnmtui\fR
+also comes with binaries named
+\fBnmtui\-edit\fR,
+\fBnmtui\-connect\fR, and
+\fBnmtui\-hostname\fR
+to skip the selection of the activities\&.
+.SH "SEE ALSO"
+.PP
+\fBnmcli\fR(1),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1),
+\fBNetworkManager\fR(8)\&.
diff --git a/man/nmtui.1.in b/man/nmtui.1.in
deleted file mode 100644
index 977339db..00000000
--- a/man/nmtui.1.in
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" nmtui (1) manual page
-.\"
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public Licence along
-.\" with this manual; if not, write to the Free Software Foundation, Inc.,
-.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-.\"
-.\" Copyright 2014 Red Hat, Inc.
-.\"
-.TH NMTUI "1" "2014-11-06" "NetworkManager 1.2"
-
-.SH NAME
-nmtui \- Text User Interface for controlling NetworkManager
-.SH SYNOPSIS
-.B nmtui
-.RI " [ " edit " | " connect " | " hostname " ] [ ... ] "
-.P
-.B nmtui\-edit
-.RI " [ " connection-id " | " connection-name " ] "
-.P
-.B nmtui\-connect
-.RI " [ " connection-name " | " connection-uuid " | " device-name " | " Wi-Fi-SSID " ] "
-.P
-.B nmtui\-hostname
-
-.SH DESCRIPTION
-.B nmtui
-is a curses\(hybased TUI application for interacting with \fINetworkManager\fP.
-.P
-When starting \fInmtui\fP, the user is prompted to choose the activity to perform
-unless it was specified as the first argument.
-.P
-The supported activities are:
-.IP \(em 4
-\fIedit\fP: show a connection editor that supports adding, modifying, viewing and deleting
-connections. It provides similar functionality as \fInm\-connection\-editor\fP.
-.IP \(em 4
-\fIconnect\fP: show a list of available connections, with the option to activate or deactivate
-them. It provides similar functionality as \fInm\-applet\fP.
-.IP \(em 4
-\fIhostname\fP: set the system hostname.
-
-.P
-Corresponding to above activities, \fInmtui\fP also comes with binaries named
-\fInmtui\-edit\fP, \fInmtui\-connect\fP, and \fInmtui-hostname\fP to skip the selection
-of the activities.
-
-.SH SEE ALSO
-.BR NetworkManager(8),
-.BR nmcli(1).
-.BR nm\-applet(1).
-.BR nm\-connection\-editor(1).
diff --git a/man/nmtui.xml b/man/nmtui.xml
new file mode 100644
index 00000000..d92f525b
--- /dev/null
+++ b/man/nmtui.xml
@@ -0,0 +1,137 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "common.ent" >
+%entities;
+]>
+
+<!--
+  nmtui(1) manual page
+
+  This is free documentation; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License, or (at your option) any later version.
+
+  The GNU General Public License's references to "object code"
+  and "executables" are to be interpreted as the output of any
+  document formatting or typesetting system, including
+  intermediate and printed output.
+
+  This manual is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public Licence along
+  with this manual; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+  Copyright 2010 - 2016 Red Hat, Inc.
+-->
+
+<refentry id='nmtui'>
+
+  <refentryinfo>
+    <title>nmtui</title>
+    <author>NetworkManager developers</author>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>nmtui</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="source">NetworkManager</refmiscinfo>
+    <refmiscinfo class="manual">General Commands Manual</refmiscinfo>
+    <refmiscinfo class="version">&NM_VERSION;</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>nmtui</refname>
+    <refpurpose>Text User Interface for controlling NetworkManager</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command><group choice='plain'>
+        <arg choice='plain'>nmtui-edit</arg>
+        <arg choice='plain'>nmtui edit</arg>
+      </group></command>
+      <arg choice='plain'>
+        <group choice='req'>
+          <arg choice='plain'><replaceable>name</replaceable></arg>
+          <arg choice='plain'><replaceable>id</replaceable></arg>
+        </group>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command><group choice='plain'>
+        <arg choice='plain'>nmtui-connect</arg>
+        <arg choice='plain'>nmtui connect</arg>
+      </group></command>
+      <arg choice='plain'>
+        <group choice='req'>
+          <arg choice='plain'><replaceable>name</replaceable></arg>
+          <arg choice='plain'><replaceable>uuid</replaceable></arg>
+          <arg choice='plain'><replaceable>device</replaceable></arg>
+          <arg choice='plain'><replaceable>SSID</replaceable></arg>
+        </group>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command><group choice='plain'>
+        <arg choice='plain'>nmtui-hostname</arg>
+        <arg choice='plain'>nmtui hostname</arg>
+      </group></command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'><title>Description</title>
+    <para><command>nmtui</command> is a curses‐based TUI application for
+    interacting with NetworkManager. When starting <command>nmtui</command>, the
+    user is prompted to choose the activity to perform unless it was specified as
+    the first argument.</para>
+
+    <para>The supported activities are:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>edit</option></term>
+        <listitem>
+          <para>Show a connection editor that supports adding, modifying, viewing and
+          deleting connections. It provides similar functionality as
+          <command>nm-connection-editor</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>connect</option></term>
+        <listitem>
+          <para>Show a list of available connections, with the option to activate or
+          deactivate them. It provides similar functionality as
+          <command>nm-applet</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>hostname</option></term>
+        <listitem>
+          <para>Set the system hostname.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>Corresponding to above activities, <command>nmtui</command> also comes
+    with binaries named <command>nmtui-edit</command>,
+    <command>nmtui-connect</command>, and <command>nmtui-hostname</command> to skip
+    the selection of the activities.</para>
+  </refsect1>
+
+  <refsect1 id='see_also'><title>See Also</title>
+    <para><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+  </refsect1>
+
+</refentry>