New upstream version 1.10.8 upstream/1.10.8

1 files changed, 11 insertions, 34 deletions

diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index dce3cee4..23368723 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 04/23/2018
+.\"      Date: 05/11/2018
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.11.3
+.\"    Source: NetworkManager 1.10.8
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.11\&.3" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -223,7 +223,6 @@ default
 is used, unless
 /etc/resolv\&.conf
 is a symlink to
-/run/systemd/resolve/stub\-resolv\&.conf,
 /run/systemd/resolve/resolv\&.conf,
 /lib/systemd/resolv\&.conf
 or
@@ -596,10 +595,6 @@ If left unspecified, the default value is 3 tries before failing the connection\
 .RS 4
 .RE
 .PP
-\fIconnection\&.mdns\fR
-.RS 4
-.RE
-.PP
 \fIconnection\&.stable\-id\fR
 .RS 4
 .RE
@@ -636,10 +631,6 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat
 .RS 4
 .RE
 .PP
-\fIipv4\&.dhcp\-client\-id\fR
-.RS 4
-.RE
-.PP
 \fIipv4\&.dhcp\-timeout\fR
 .RS 4
 If left unspecified, the default value for the interface type is used\&.
@@ -709,11 +700,6 @@ If left unspecified, the default value "ignore" will be used\&.
 .RS 4
 If left unspecified, the default value "optional" will be used\&.
 .RE
-.PP
-\fIwifi\-sec\&.fils\fR
-.RS 4
-If left unspecified, the default value "optional" will be used\&.
-.RE
 .SS "Sections"
 .PP
 You can configure multiple
@@ -835,15 +821,6 @@ allows to influence the generated MAC address to use certain vendor OUIs\&. If d
 wifi\&.cloned\-mac\-address\&.
 .RE
 .PP
-\fIwifi\&.backend\fR
-.RS 4
-Specify the Wi\-Fi backend used for the device\&. Currently supported are
-wpa_supplicant
-and
-iwd
-(experimental)\&.
-.RE
-.PP
 \fIwifi\&.scan\-generate\-mac\-address\-mask\fR
 .RS 4
 Like the per\-connection settings
@@ -874,7 +851,7 @@ This section controls NetworkManager\*(Aqs optional connectivity checking functi
 .PP
 \fIuri\fR
 .RS 4
-The URI of a web page to periodically request when connectivity is being checked\&. This page should return the header "X\-NetworkManager\-Status" with a value of "online"\&. Alternatively, its body content should be set to "NetworkManager is online"\&. The body content check can be controlled by the
+The URI of a web page to periodically request when connectivity is being checked\&. This page should return the header "X\-NetworkManager\-Status" with a value of "online"\&. Alternatively, it\*(Aqs body content should be set to "NetworkManager is online"\&. The body content check can be controlled by the
 response
 option\&. If this option is blank or missing, connectivity checking is disabled\&.
 .RE
@@ -1043,6 +1020,13 @@ plugin, if it is available\&. This can be disabled by adding
 no\-ibft\&.
 .RE
 .PP
+\fIifcfg\-suse\fR
+.RS 4
+This plugin is deprecated and its selection has no effect\&. The
+keyfile
+plugin should be used instead\&.
+.RE
+.PP
 \fIifupdown\fR
 .RS 4
 This plugin is used on the Debian and Ubuntu distributions, and reads Ethernet and Wi\-Fi connections from
@@ -1068,13 +1052,6 @@ Note that ibft plugin uses
 /sbin/iscsiadm
 and thus requires CAP_SYS_ADMIN capability\&.
 .RE
-.PP
-\fIifcfg\-suse\fR, \fIifnet\fR
-.RS 4
-These plugins are deprecated and their selection has no effect\&. The
-keyfile
-plugin should be used instead\&.
-.RE
 .SH "APPENDIX"
 .SS "Device List Format"
 .PP