diff options
| author | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
| commit | 5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch) | |
| tree | af14aec1d1271903e73ef2b45d6b9c6d6c188f44 /man/NetworkManager.conf.5 | |
| parent | f07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff) | |
| parent | e96d74409128c6a977e31f24fad9b267d2feb9a1 (diff) | |
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8' with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 024c69e0..32fc7d3f 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: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -195,7 +195,7 @@ ignore\-carrier which overwrites this setting if specified (See \fIignore\-carrier\fR)\&. Otherwise, it is a list of matches to specify for which device carrier should be ignored\&. See the section called \(lqDevice List Format\(rq -for the syntax how to specify a device\&. Note that master types like bond, bridge, and team ignore carrier by default\&. You can however revert that default using the "except:" specifier (or better, use the per\-device setting instead of the deprecated setting)\&. +for the syntax how to specify a device\&. Note that controller types like bond, bridge, and team ignore carrier by default\&. You can however revert that default using the "except:" specifier (or better, use the per\-device setting instead of the deprecated setting)\&. .RE .PP \fIassume\-ipv6ll\-only\fR @@ -784,8 +784,13 @@ for details)\&. If left unspecified, the default value is 3 tries before failing the connection\&. .RE .PP +\fIconnection\&.autoconnect\-ports\fR +.RS 4 +.RE +.PP \fIconnection\&.autoconnect\-slaves\fR .RS 4 +This is deprecated, please use "connection\&.autoconnect\-ports" instead\&. .RE .PP \fIconnection\&.down\-on\-poweroff\fR @@ -1093,7 +1098,7 @@ sections, by having different sections with a name that all start with "connecti .nf [connection] ipv6\&.ip6\-privacy=0 -connection\&.autoconnect\-slaves=1 +connection\&.autoconnect\-ports=1 vpn\&.timeout=120 [connection\-wifi\-wlan0] |