From 0cccb7b7230abb3af347181ff9ddc654084de88e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 27 Jan 2016 13:30:25 +0100 Subject: [PATCH] man: reorder and rework CONNECTION SECTION in NetworkManager.conf's manual --- man/NetworkManager.conf.xml.in | 144 ++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 63 deletions(-) diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index e53de0ae83..155400758a 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -508,76 +508,23 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth <literal>connection</literal> section - This section allows to specify default values for - connections. Not all properties can be overwritten, only a selected - list below. You can have multiple connection - sections, by having different sections with a name that all start - with "connection". + Specify default values for connections. + - Example: + Example: [connection] ipv6.ip6-privacy=0 -connection.autoconnect-slaves=1 -vpn.timeout=120 - -[connection-wifi-wlan0] -match-device=interface-name:wlan0 -ipv4.route-metric=50 - -[connection-wifi-other] -match-device=type:wifi -ipv4.route-metric=55 -ipv6.ip6-privacy=1 - + + Supported Properties - The sections within one file are considered in order of appearance, with the - exception that the [connection] section is always - considered last. In the example above, this order is [connection-wifi-wlan0], - [connection-wlan-other], and [connection]. - When checking for a default configuration value, the sections are searched until - the requested value is found. - In the example above, "ipv4.route-metric" for wlan0 interface is set to 50, - and for all other Wi-Fi typed interfaces to 55. Also, Wi-Fi devices would have - IPv6 private addresses enabled by default, but other devices would have it disabled. - Note that also "wlan0" gets "ipv6.ip6-privacy=1", because although the section - "[connection-wifi-wlan0]" matches the device, it does not contain that property - and the search continues. - - - When having different sections in multiple files, sections from files that are read - later have higher priority. So within one file the priority of the sections is - top-to-bottom. Across multiple files later definitions take precedence. - - - - - - match-device - An optional device spec that restricts - when the section applies. See - for the possible values. - - - - stop-match - An optional boolean value which defaults to - no. If the section matches (based on - match-device), further sections will not be - considered even if the property in question is not present. In - the example above, if [connection-wifi-wlan0] would - have stop-match set to yes, - its ipv6.ip6-privacy value would be - unspecified. - - - - - - - The following properties are supported to have their default values configured: + Not all properties can be overwritten, only the following + properties are supported to have their default values configured + (see nm-settings5 for details). + A default value is only consulted if the corresponding per-connection value + explicitly allows for that. connection.autoconnect-slaves @@ -618,6 +565,77 @@ ipv6.ip6-privacy=1 If left unspecified, MAC address randomization is disabled. + + + + Sections + + You can configure multiple connection + sections, by having different sections with a name that all start + with "connection". + Example: + +[connection] +ipv6.ip6-privacy=0 +connection.autoconnect-slaves=1 +vpn.timeout=120 + +[connection-wifi-wlan0] +match-device=interface-name:wlan0 +ipv4.route-metric=50 + +[connection-wifi-other] +match-device=type:wifi +ipv4.route-metric=55 +ipv6.ip6-privacy=1 + + + + + The sections within one file are considered in order of appearance, with the + exception that the [connection] section is always + considered last. In the example above, this order is [connection-wifi-wlan0], + [connection-wlan-other], and [connection]. + When checking for a default configuration value, the sections are searched until + the requested value is found. + In the example above, "ipv4.route-metric" for wlan0 interface is set to 50, + and for all other Wi-Fi typed interfaces to 55. Also, Wi-Fi devices would have + IPv6 private addresses enabled by default, but other devices would have it disabled. + Note that also "wlan0" gets "ipv6.ip6-privacy=1", because although the section + "[connection-wifi-wlan0]" matches the device, it does not contain that property + and the search continues. + + + When having different sections in multiple files, sections from files that are read + later have higher priority. So within one file the priority of the sections is + top-to-bottom. Across multiple files later definitions take precedence. + + + + The following properties further control how a connection section applies. + + + match-device + An optional device spec that restricts + when the section applies. See + for the possible values. + + + + stop-match + An optional boolean value which defaults to + no. If the section matches (based on + match-device), further sections will not be + considered even if the property in question is not present. In + the example above, if [connection-wifi-wlan0] would + have stop-match set to yes, + its ipv6.ip6-privacy value would be + unspecified. + + + + +