From e126f3e804c35480c4f075777430419d6ece23da Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Sep 2018 10:10:27 +0200 Subject: New upstream version 1.12.4 --- man/NetworkManager.conf.5 | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'man/NetworkManager.conf.5') diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index c2b02150..4f912d3b 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/14/2018 +.\" Date: 09/18/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.14.0 +.\" Source: NetworkManager 1.12.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.0" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.12\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -597,10 +597,6 @@ If left unspecified, the default value is 3 tries before failing the connection\ .RS 4 .RE .PP -\fIconnection\&.llmnr\fR -.RS 4 -.RE -.PP \fIconnection\&.mdns\fR .RS 4 .RE @@ -685,11 +681,6 @@ is unset, use the content of "/proc/sys/net/ipv6/conf/default/use_tempaddr" as l If left unspecified, routes are only added to the main table\&. Note that this is different from explicitly selecting the main table 254, because of how NetworkManager removes extraneous routes from the tables\&. .RE .PP -\fIsriov\&.autoprobe\-drivers\fR -.RS 4 -If left unspecified, drivers are autoprobed when the SR\-IOV VF gets created\&. -.RE -.PP \fIvpn\&.timeout\fR .RS 4 If left unspecified, default value of 60 seconds is used\&. -- cgit 1.3.0-6-gf8a5 From 6518e361171f64bcaaa4bf868139362ed95cc2e0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 20 Oct 2018 01:30:31 +0200 Subject: New upstream version 1.14.2 --- man/NetworkManager.conf.5 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'man/NetworkManager.conf.5') diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 4f912d3b..226da2d3 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/18/2018 +.\" Date: 10/19/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.12.4 +.\" Source: NetworkManager 1.14.2 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.12\&.4" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -597,6 +597,10 @@ If left unspecified, the default value is 3 tries before failing the connection\ .RS 4 .RE .PP +\fIconnection\&.llmnr\fR +.RS 4 +.RE +.PP \fIconnection\&.mdns\fR .RS 4 .RE @@ -681,6 +685,11 @@ is unset, use the content of "/proc/sys/net/ipv6/conf/default/use_tempaddr" as l If left unspecified, routes are only added to the main table\&. Note that this is different from explicitly selecting the main table 254, because of how NetworkManager removes extraneous routes from the tables\&. .RE .PP +\fIsriov\&.autoprobe\-drivers\fR +.RS 4 +If left unspecified, drivers are autoprobed when the SR\-IOV VF gets created\&. +.RE +.PP \fIvpn\&.timeout\fR .RS 4 If left unspecified, default value of 60 seconds is used\&. -- cgit 1.3.0-6-gf8a5