diff options
| author | Michael Biebl <biebl@debian.org> | 2019-12-18 18:30:31 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-12-18 18:30:31 +0100 |
| commit | 4bde769dba8f804547ce1f5fcda731035d3d45f1 (patch) | |
| tree | 3a4907fdbf4972fad5a036ef64ce643d704e8733 /man/NetworkManager.conf.5 | |
| parent | bbf6329c27676323a899b7328575cc3f6c5f48cc (diff) | |
| parent | 28028b26b3371756811e95d894f709f4b1207c00 (diff) | |
Update upstream source from tag 'upstream/1.22.0'
Update to upstream version '1.22.0' with Debian dir a81ba1028908d08fc4866734c3df4a042bf9a511
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 7e5a91dd..6b1a3081 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: 11/25/2019 +.\" Date: 12/17/2019 .\" Manual: Configuration -.\" Source: NetworkManager 1.20.8 +.\" Source: NetworkManager 1.22.0 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.20\&.8" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.22\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -126,8 +126,10 @@ This setting is deprecated and has no effect\&. \fIauth\-polkit\fR .RS 4 Whether the system uses PolicyKit for authorization\&. If -false, all requests will be allowed\&. If -true, non\-root requests are authorized using PolicyKit\&. The default value is +true, non\-root requests are authorized using PolicyKit\&. Requests from root (user ID zero) are always granted without asking PolicyKit\&. If +false, all requests will be allowed and PolicyKit is not used\&. If set to +root\-only +PolicyKit is not used and all requests except root are denied\&. The default value is true\&. .RE .PP @@ -696,6 +698,16 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat .RS 4 .RE .PP +\fIipv4\&.dhcp\-iaid\fR +.RS 4 +If left unspecified, it defaults to "ifname"\&. +.RE +.PP +\fIipv4\&.dhcp\-hostname\-flags\fR +.RS 4 +If left unspecified, the value 3 (fqdn\-encoded,fqdn\-serv\-update) is used\&. +.RE +.PP \fIipv4\&.dhcp\-timeout\fR .RS 4 If left unspecified, the default value for the interface type is used\&. @@ -720,6 +732,16 @@ If left unspecified, routes are only added to the main table\&. Note that this i If left unspecified, it defaults to "lease"\&. .RE .PP +\fIipv6\&.dhcp\-iaid\fR +.RS 4 +If left unspecified, it defaults to "ifname"\&. +.RE +.PP +\fIipv6\&.dhcp\-hostname\-flags\fR +.RS 4 +If left unspecified, the value 1 (fqdn\-serv\-update) is used\&. +.RE +.PP \fIipv6\&.dhcp\-timeout\fR .RS 4 If left unspecified, the default value for the interface type is used\&. |