diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /man/NetworkManager.conf.5 | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index d8dccd13..a27b8c3e 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: 12/01/2018 +.\" Date: 10/24/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.12.6 +.\" Source: NetworkManager 1.14.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.12\&.6" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.4" "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\&. |