From afcd268ea7b1149fbfb66bce4eca659b675da0a2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 15:53:07 +0100 Subject: New upstream version 1.10.2 --- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 11 +- man/NetworkManager.conf.xml | 18 +++ man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-ifcfg-rh.5 | 99 +++++++++++++--- man/nm-settings-ifcfg-rh.xml | 22 ++-- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 3 +- man/nm-settings.5 | 264 ++++++++++++++++++++++++++++++++++++++++++- man/nm-settings.xml | 28 ++++- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- 14 files changed, 436 insertions(+), 51 deletions(-) (limited to 'man') diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 652552c8..a2238ee9 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.0" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.2" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 27552930..aa31c809 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: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.0" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -791,6 +791,11 @@ The following properties can be configured per\-device\&. Whether the device is managed or not\&. A device can be marked as managed via udev rules (ENV{NM_UNMANAGED}), or via setting plugins (keyfile\&.unmanaged\-devices)\&. This is yet another way\&. Note that this configuration can be overruled at runtime via D\-Bus\&. Also, it has higher priority then udev rules\&. .RE .PP +\fIcarrier\-wait\-timeout\fR +.RS 4 +Specify the timeout for waiting for carrier in milliseconds\&. When the device loses carrier, NetworkManager does not react immediately\&. Instead, it waits for this timeout before considering the link lost\&. Also, on startup, NetworkManager considers the device as busy for this time, as long as the device has no carrier\&. This delays startup\-complete signal and NetworkManager\-wait\-online\&. Configuring this too high means to block NetworkManager\-wait\-online longer then necessary\&. Configuring it too low, means that NetworkManager will declare startup\-complete, although carrier is about to come and auto\-activation to kick in\&. The default is 5000 milliseconds\&. +.RE +.PP \fIignore\-carrier\fR .RS 4 Specify devices for which NetworkManager will (partially) ignore the carrier state\&. Normally, for device types that support carrier\-detect, such as Ethernet and InfiniBand, NetworkManager will only allow a connection to be activated on the device if carrier is present (ie, a cable is plugged in), and it will deactivate the device if carrier drops for more than a few seconds\&. diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index f0c3c5c8..446540aa 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -856,6 +856,24 @@ managed=1 + + carrier-wait-timeout + + + Specify the timeout for waiting for carrier in milliseconds. + When the device loses carrier, NetworkManager does not react + immediately. Instead, it waits for this timeout before considering + the link lost. Also, on startup, NetworkManager considers the + device as busy for this time, as long as the device has no carrier. + This delays startup-complete signal and NetworkManager-wait-online. + Configuring this too high means to block NetworkManager-wait-online + longer then necessary. Configuring it too low, means that NetworkManager + will declare startup-complete, although carrier is about to come + and auto-activation to kick in. + The default is 5000 milliseconds. + + + ignore-carrier diff --git a/man/nm-online.1 b/man/nm-online.1 index 93f4ca45..c185d50b 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.0" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index a09de6de..d1cc7551 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: OpenVSwitch support overview -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.0" "OpenVSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.2" "OpenVSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 9e9782e7..8ac7d7eb 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.0" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -854,11 +854,11 @@ l l l l. T{ mac\-address T}:T{ -MACADDR\fI(+)\fR +BRIDGE_MACADDR\fI(+)\fR T}:T{ \ \& T}:T{ -MAC address of the bridge\&. Note that this requires a recent kernel support, originally introduced in 3\&.15 upstream kernel) MACADDR for bridges is an NM extension\&. +MAC address of the bridge\&. Note that this requires a recent kernel support, originally introduced in 3\&.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension\&. T} T{ stp @@ -1473,6 +1473,7 @@ l l l l l l l l l l l l l l l l +l l l l l l l l. T{ method @@ -1609,6 +1610,17 @@ T}:T{ IPV4_ROUTE_TABLE enables policy\-routing and sets the default routing table\&. T} T{ +dns\-options +T}:T{ +RES_OPTIONS\fI(+)\fR +T}:T{ +\ \& +T}:T{ +List of DNS options to be added to /etc/resolv\&.conf\fB + +Example: \fRRES_OPTIONS=ndots:2 timeout:3 +T} +T{ dns\-priority T}:T{ IPV4_DNS_PRIORITY\fI(+)\fR @@ -1700,6 +1712,7 @@ l l l l l l l l l l l l l l l l +l l l l l l l l. T{ method @@ -1722,7 +1735,7 @@ T} T{ dns\-search T}:T{ -DOMAIN +IPV6_DOMAIN T}:T{ \ \& T}:T{ @@ -1834,6 +1847,17 @@ The priority for DNS servers of this connection\&. Lower values have higher prio Example: \fRIPV6_DNS_PRIORITY=20 T} T{ +dns\-options +T}:T{ +IPV6_RES_OPTIONS\fI(+)\fR +T}:T{ +\ \& +T}:T{ +List of DNS options to be added to /etc/resolv\&.conf\fB + +Example: \fRIPV6_RES_OPTIONS=ndots:2 timeout:3 +T} +T{ ip6\-privacy T}:T{ IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP\fI(+)\fR @@ -2032,7 +2056,52 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&15.\ \&team\-port setting +.B Table\ \&15.\ \&tc setting +.TS +allbox tab(:); +lB lB lB lB. +T{ +Property +T}:T{ +Ifcfg\-rh Variable +T}:T{ +Default +T}:T{ +Description +T} +.T& +l l l l +l l l l. +T{ +qdiscs +T}:T{ +QDISC1, QDISC2, \&.\&.\&. +T}:T{ +\ \& +T}:T{ +Queueing disciplines\fB + +Example: \fRQDISC1=ingress, QDISC2="root handle 1234: fq_codel" +T} +T{ +qdiscs +T}:T{ +FILTER1, FILTER2, \&.\&.\&. +T}:T{ +\ \& +T}:T{ +Traffic filters\fB + +Example: \fRFILTER1="parent ffff: matchall action simple sdata Input", \&.\&.\&. +T} +.TE +.sp 1 +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.B Table\ \&16.\ \&team\-port setting .TS allbox tab(:); lB lB lB lB. @@ -2063,7 +2132,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&16.\ \&team setting +.B Table\ \&17.\ \&team setting .TS allbox tab(:); lB lB lB lB. @@ -2094,7 +2163,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&17.\ \&user setting +.B Table\ \&18.\ \&user setting .TS allbox tab(:); lB lB lB lB. @@ -2127,7 +2196,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&18.\ \&vlan setting +.B Table\ \&19.\ \&vlan setting .TS allbox tab(:); lB lB lB lB. @@ -2216,7 +2285,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&19.\ \&802\-3\-ethernet setting +.B Table\ \&20.\ \&802\-3\-ethernet setting .TS allbox tab(:); lB lB lB lB. @@ -2365,7 +2434,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&20.\ \&802\-11\-wireless\-security setting +.B Table\ \&21.\ \&802\-11\-wireless\-security setting .TS allbox tab(:); lB lB lB lB. @@ -2572,11 +2641,11 @@ T} T{ wep\-key\-type T}:T{ -KEY or KEY_PASSPHRASE\fI(+)\fR +KEY or KEY_PASSPHRASE\fI(+)\fR; KEY_TYPE\fI(+)\fR T}:T{ \ \& T}:T{ -KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:")\&. KEY_PASSPHRASE is used for WEP passphrases\&.\fB +KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:")\&. KEY_PASSPHRASE is used for WEP passphrases\&. KEY_TYPE specifies the key type and can be either \*(Aqkey\*(Aq or \*(Aqpassphrase\*(Aq\&. KEY_TYPE is redundant and can be omitted\&.\fB Example: \fRKEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey T} @@ -2598,7 +2667,7 @@ T} .nr an-no-space-flag 1 .nr an-break-flag 1 .br -.B Table\ \&21.\ \&802\-11\-wireless setting +.B Table\ \&22.\ \&802\-11\-wireless setting .TS allbox tab(:); lB lB lB lB. diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 4968eb7f..8799e550 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing @@ -219,7 +219,7 @@ Example: BONDING_OPTS="miimon=100 mode=broadcast"0 - 63path-costBRIDGING_OPTS: path_cost=100STP cost. -Allowed values: 1 - 65535hairpin-modeBRIDGING_OPTS: hairpin_mode=yesHairpin mode of the bridge port.bridge settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressMACADDR(+)MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) MACADDR for bridges is an NM extension.stpSTPnoSpan tree protocol participation.priorityBRIDGING_OPTS: priority=32768STP priority. +Allowed values: 1 - 65535hairpin-modeBRIDGING_OPTS: hairpin_mode=yesHairpin mode of the bridge port.
bridge settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressBRIDGE_MACADDR(+)MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension.stpSTPnoSpan tree protocol participation.priorityBRIDGING_OPTS: priority=32768STP priority. Allowed values: 0 - 32768forward-delayDELAY15STP forwarding delay. @@ -296,7 +296,9 @@ Example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8 Example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16gatewayGATEWAYGateway IP address. -Example: GATEWAY=10.5.5.1routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ...List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.ignore-auto-routesPEERROUTES(+)yesPEERROUTES has the opposite meaning as 'ignore-auto-routes' property.ignore-auto-dnsPEERDNSyesPEERDNS has the opposite meaning as 'ignore-auto-dns' property.dhcp-send-hostnameDHCP_SEND_HOSTNAME(+)yesWhether DHCP_HOSTNAME should be sent to the DHCP server.dhcp-hostnameDHCP_HOSTNAMEHostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.never-defaultDEFROUTE (GATEWAYDEV in /etc/sysconfig/network)yesDEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.may-failIPV4_FAILURE_FATAL(+)noIPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.route-metricIPV4_ROUTE_METRIC(+)-1IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.route-tableIPV4_ROUTE_TABLE(+)0IPV4_ROUTE_TABLE enables policy-routing and sets the default routing table.dns-priorityIPV4_DNS_PRIORITY(+)0The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used. +Example: GATEWAY=10.5.5.1routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ...List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.ignore-auto-routesPEERROUTES(+)yesPEERROUTES has the opposite meaning as 'ignore-auto-routes' property.ignore-auto-dnsPEERDNSyesPEERDNS has the opposite meaning as 'ignore-auto-dns' property.dhcp-send-hostnameDHCP_SEND_HOSTNAME(+)yesWhether DHCP_HOSTNAME should be sent to the DHCP server.dhcp-hostnameDHCP_HOSTNAMEHostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.never-defaultDEFROUTE (GATEWAYDEV in /etc/sysconfig/network)yesDEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.may-failIPV4_FAILURE_FATAL(+)noIPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.route-metricIPV4_ROUTE_METRIC(+)-1IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.route-tableIPV4_ROUTE_TABLE(+)0IPV4_ROUTE_TABLE enables policy-routing and sets the default routing table.dns-optionsRES_OPTIONS(+)List of DNS options to be added to /etc/resolv.conf + +Example: RES_OPTIONS=ndots:2 timeout:3dns-priorityIPV4_DNS_PRIORITY(+)0The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used. Example: IPV4_DNS_PRIORITY=20dhcp-client-idDHCP_CLIENT_ID(+)A string sent to the DHCP server to identify the local machine. A binary value can be specified using hex notation ('aa:bb:cc'). @@ -306,13 +308,15 @@ Example: ARPING_WAIT=2dhcp-tim Example: IPV4_DHCP_TIMEOUT=10dhcp-fqdnDHCP_FQDNFQDN to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used. -Example: DHCP_FQDN=foo.bar.com
ipv6 settingPropertyIfcfg-rh VariableDefaultDescriptionmethodIPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6CIPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=noMethod used for IPv6 protocol configuration. ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yesdnsDNS1, DNS2, ...List of DNS servers. NetworkManager uses the variables both for IPv4 and IPv6.dns-searchDOMAINList of DNS search domains.addressesIPV6ADDR, IPV6ADDR_SECONDARIESList of static IP addresses. +Example: DHCP_FQDN=foo.bar.com
ipv6 settingPropertyIfcfg-rh VariableDefaultDescriptionmethodIPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6CIPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=noMethod used for IPv6 protocol configuration. ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yesdnsDNS1, DNS2, ...List of DNS servers. NetworkManager uses the variables both for IPv4 and IPv6.dns-searchIPV6_DOMAINList of DNS search domains.addressesIPV6ADDR, IPV6ADDR_SECONDARIESList of static IP addresses. Example: IPV6ADDR=ab12:9876::1 IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3"gatewayIPV6_DEFAULTGWGateway IP address. Example: IPV6_DEFAULTGW=abbe::1routes(none)List of static routes. They are not stored in ifcfg-* file, but in route6-* file instead in the form of command line for 'ip route add'.ignore-auto-routesIPV6_PEERROUTES(+)yesIPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.ignore-auto-dnsIPV6_PEERDNS(+)yesIPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property.dhcp-hostnameDHCP_HOSTNAMEHostname to send the DHCP server.never-defaultIPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)IPV6_DEFROUTE=yes (when no variable specified)IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.may-failIPV6_FAILURE_FATAL(+)noIPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property.route-metricIPV6_ROUTE_METRIC(+)-1IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. If set to -1, a default metric based on the device type is used.route-tableIPV6_ROUTE_TABLE(+)0IPV6_ROUTE_TABLE enables policy-routing and sets the default routing table.dns-priorityIPV6_DNS_PRIORITY(+)0The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used. -Example: IPV6_DNS_PRIORITY=20ip6-privacyIPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+)noConfigure IPv6 Privacy Extensions for SLAAC (RFC4941). +Example: IPV6_DNS_PRIORITY=20dns-optionsIPV6_RES_OPTIONS(+)List of DNS options to be added to /etc/resolv.conf + +Example: IPV6_RES_OPTIONS=ndots:2 timeout:3ip6-privacyIPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+)noConfigure IPv6 Privacy Extensions for SLAAC (RFC4941). Example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes @@ -328,7 +332,11 @@ Allowed values: none, autobrow Example: PAC_URL=http://wpad.mycompany.com/wpad.datpac-scriptPAC_SCRIPT(+)Path of the PAC script. -Example: PAC_SCRIPT=/home/joe/proxy.pac
team-port settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_PORT_CONFIGTeam port configuration in JSON. See man teamd.conf for details.
team settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_CONFIGTeam configuration in JSON. See man teamd.conf for details.
user settingPropertyIfcfg-rh VariableDefaultDescriptiondataNM_USER_*each key/value pair is stored as a separate variable with name composed by concatenating NM_USER_ with the encoded key. The key is encoded by substituting lowercase letters with uppercase and prepending uppercase letters with an underscore. A dot is encoded as a double underscore. Remaining characters are encoded as underscore followed by a 3 digit octal representation of the character. +Example: PAC_SCRIPT=/home/joe/proxy.pac
tc settingPropertyIfcfg-rh VariableDefaultDescriptionqdiscsQDISC1, QDISC2, ...Queueing disciplines + +Example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel"qdiscsFILTER1, FILTER2, ...Traffic filters + +Example: FILTER1="parent ffff: matchall action simple sdata Input", ...
team-port settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_PORT_CONFIGTeam port configuration in JSON. See man teamd.conf for details.
team settingPropertyIfcfg-rh VariableDefaultDescriptionconfigTEAM_CONFIGTeam configuration in JSON. See man teamd.conf for details.
user settingPropertyIfcfg-rh VariableDefaultDescriptiondataNM_USER_*each key/value pair is stored as a separate variable with name composed by concatenating NM_USER_ with the encoded key. The key is encoded by substituting lowercase letters with uppercase and prepending uppercase letters with an underscore. A dot is encoded as a double underscore. Remaining characters are encoded as underscore followed by a 3 digit octal representation of the character. Example: NM_USER_FOO__BAR=something
vlan settingPropertyIfcfg-rh VariableDefaultDescriptionparentDEVICE or PHYSDEVParent interface of the VLAN.idVLAN_ID or DEVICEVLAN identifier.flagsGVRP, MVRP, VLAN_FLAGSVLAN flags. @@ -364,7 +372,7 @@ Example: PMF=required Allowed values: default, disable, optional, requiredleap-usernameIEEE_8021X_IDENTITY(+)Login name for LEAP.wep-key0KEY1, KEY_PASSPHRASE1(+)The first WEP key (used in most networks). See also DEFAULTKEY for key index.wep-key1KEY2, KEY_PASSPHRASE2(+)WEP key with index 1. See also DEFAULTKEY for key index.wep-key2KEY3, KEY_PASSPHRASE3(+)WEP key with index 2. See also DEFAULTKEY for key index.wep-key3KEY4, KEY_PASSPHRASE4(+)WEP key with index 3. See also DEFAULTKEY for key index.wep-key-flagsWEP_KEY_FLAGS(+)Password flags for KEY<i>, KEY_PASSPHRASE<i> password. (see for _FLAGS values)pskWPA_PSKPre-Shared-Key for WPA networks.psk-flagsWPA_PSK_FLAGS(+)Password flags for WPA_PSK_FLAGS. (see for _FLAGS values) -Example: WPA_PSK_FLAGS=userleap-passwordIEEE_8021X_PASSWORD(+)Password for LEAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.leap-password-flagsIEEE_8021X_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PASSWORD_FLAGS. (see for _FLAGS values)wep-key-typeKEY<i> or KEY_PASSPHRASE<i>(+)KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used for WEP passphrases. +Example: WPA_PSK_FLAGS=userleap-passwordIEEE_8021X_PASSWORD(+)Password for LEAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.leap-password-flagsIEEE_8021X_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PASSWORD_FLAGS. (see for _FLAGS values)wep-key-typeKEY<i> or KEY_PASSPHRASE<i>(+); KEY_TYPE(+)KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used for WEP passphrases. KEY_TYPE specifies the key type and can be either 'key' or 'passphrase'. KEY_TYPE is redundant and can be omitted. Example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkeywps-methodWPS_METHODUsed to control the WPS methods to be used Valid values are "default", "auto", "disabled", "pin" and "pbc". If omitted, whatver the AP announces is used. diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index f60023af..253777c7 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.0" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index f656d3d6..98242d6d 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.0nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.2nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing @@ -204,6 +204,7 @@ Example: parity=n +
vpn setting (section)PropertyKeyfile VariableFormatDescriptiondataseparate variables named after keys of the dictionaryThe keys of the data dictionary are used as variable names directly under [vpn] section. diff --git a/man/nm-settings.5 b/man/nm-settings.5 index e987f8e0..e920294a 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.0" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -3234,6 +3234,54 @@ Number of stop bits for communication on the serial port\&. Either 1 or 2\&. Th T} .TE .sp 1 +.SS "tc setting" +.PP +Linux Traffic Contril Settings\&.\&. +.TS +allbox tab(:); +lB lB lB lB. +T{ +Key Name +T}:T{ +Value Type +T}:T{ +Default Value +T}:T{ +Value Description +T} +.T& +l l l l +l l l l +l l l l. +T{ +name +T}:T{ +string +T}:T{ +tc +T}:T{ +The setting\*(Aqs name, which uniquely identifies the setting within the connection\&. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"\&. +T} +T{ +qdiscs +T}:T{ +array of vardict +T}:T{ +[] +T}:T{ +Array of TC queuening disciplines\&. +T} +T{ +tfilters +T}:T{ +array of vardict +T}:T{ +[] +T}:T{ +Array of TC traffic filters\&. +T} +.TE +.sp 1 .SS "team setting" .PP Teaming Settings\&. @@ -3252,6 +3300,21 @@ T} .T& l l l l l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l l l l l. T{ config @@ -3272,6 +3335,33 @@ T}:T{ Deprecated in favor of connection\&.interface\-name, but can be used for backward\-compatibility with older daemons, to set the team\*(Aqs interface name\&. T} T{ +link\-watchers +T}:T{ +array of vardict +T}:T{ +[] +T}:T{ +Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are: ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-incative\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&. +T} +T{ +mcast\-rejoin\-count +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd mcast_rejoin\&.count\&. +T} +T{ +mcast\-rejoin\-interval +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd mcast_rejoin\&.interval\&. +T} +T{ name T}:T{ string @@ -3280,6 +3370,114 @@ team T}:T{ The setting\*(Aqs name, which uniquely identifies the setting within the connection\&. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"\&. T} +T{ +notify\-peers\-count +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd notify_peers\&.count\&. +T} +T{ +notify\-peers\-interval +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd notify_peers\&.interval\&. +T} +T{ +runner +T}:T{ +string +T}:T{ +"roundrobin" +T}:T{ +Corresponds to the teamd runner\&.name\&. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp"\&. +T} +T{ +runner\-active +T}:T{ +boolean +T}:T{ +FALSE +T}:T{ +Corresponds to the teamd runner\&.active\&. +T} +T{ +runner\-agg\-select\-policy +T}:T{ +string +T}:T{ +\ \& +T}:T{ +Corresponds to the teamd runner\&.agg_select_policy\&. +T} +T{ +runner\-fast\-rate +T}:T{ +boolean +T}:T{ +FALSE +T}:T{ +Corresponds to the teamd runner\&.fast_rate\&. +T} +T{ +runner\-hwaddr\-policy +T}:T{ +string +T}:T{ +\ \& +T}:T{ +Corresponds to the teamd runner\&.hwaddr_policy\&. +T} +T{ +runner\-min\-ports +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Corresponds to the teamd runner\&.min_ports\&. +T} +T{ +runner\-sys\-prio +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Corresponds to the teamd runner\&.sys_prio\&. +T} +T{ +runner\-tx\-balancer +T}:T{ +string +T}:T{ +\ \& +T}:T{ +Corresponds to the teamd runner\&.tx_balancer\&.name\&. +T} +T{ +runner\-tx\-balancer\-interval +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Corresponds to the teamd runner\&.tx_balancer\&.interval\&. +T} +T{ +runner\-tx\-hash +T}:T{ +array of string +T}:T{ +[] +T}:T{ +Corresponds to the teamd runner\&.tx_hash\&. +T} .TE .sp 1 .SS "team\-port setting" @@ -3299,6 +3497,12 @@ Value Description T} .T& l l l l +l l l l +l l l l +l l l l +l l l l +l l l l +l l l l l l l l. T{ config @@ -3310,6 +3514,33 @@ T}:T{ The JSON configuration for the team port\&. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd\&. If not specified, the default configuration is used\&. See man teamd\&.conf for the format details\&. T} T{ +lacp\-key +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd ports\&.PORTIFNAME\&.lacp_key\&. +T} +T{ +lacp\-prio +T}:T{ +int32 +T}:T{ +255 +T}:T{ +Corresponds to the teamd ports\&.PORTIFNAME\&.lacp_prio\&. +T} +T{ +link\-watchers +T}:T{ +array of vardict +T}:T{ +[] +T}:T{ +Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are: ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-incative\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&. +T} +T{ name T}:T{ string @@ -3318,6 +3549,33 @@ team\-port T}:T{ The setting\*(Aqs name, which uniquely identifies the setting within the connection\&. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired"\&. T} +T{ +prio +T}:T{ +int32 +T}:T{ +0 +T}:T{ +Corresponds to the teamd ports\&.PORTIFNAME\&.prio\&. +T} +T{ +queue\-id +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Corresponds to the teamd ports\&.PORTIFNAME\&.queue_id\&. When set to \-1 means the parameter is skipped from the json config\&. +T} +T{ +sticky +T}:T{ +boolean +T}:T{ +FALSE +T}:T{ +Corresponds to the teamd ports\&.PORTIFNAME\&.sticky\&. +T} .TE .sp 1 .SS "tun setting" diff --git a/man/nm-settings.xml b/man/nm-settings.xml index b05af142..4aaedaff 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.2nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -356,14 +356,40 @@ send-delayuint640Time to delay between each byte sent to the modem, in microseconds. stopbitsuint321Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in "8n1" for example. + tc settingLinux Traffic Contril Settings..Key NameValue TypeDefault ValueValue Description + namestringtcThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". + qdiscsarray of vardict[]Array of TC queuening disciplines. + tfiltersarray of vardict[]Array of TC traffic filters. + team settingTeaming Settings.Key NameValue TypeDefault ValueValue DescriptionconfigstringThe JSON configuration for the team network interface. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name. + link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details. + mcast-rejoin-countint320Corresponds to the teamd mcast_rejoin.count. + mcast-rejoin-intervalint320Corresponds to the teamd mcast_rejoin.interval.namestringteamThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". + notify-peers-countint320Corresponds to the teamd notify_peers.count. + notify-peers-intervalint320Corresponds to the teamd notify_peers.interval. + runnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". + runner-activebooleanFALSECorresponds to the teamd runner.active. + runner-agg-select-policystringCorresponds to the teamd runner.agg_select_policy. + runner-fast-ratebooleanFALSECorresponds to the teamd runner.fast_rate. + runner-hwaddr-policystringCorresponds to the teamd runner.hwaddr_policy. + runner-min-portsint32-1Corresponds to the teamd runner.min_ports. + runner-sys-prioint32-1Corresponds to the teamd runner.sys_prio. + runner-tx-balancerstringCorresponds to the teamd runner.tx_balancer.name. + runner-tx-balancer-intervalint32-1Corresponds to the teamd runner.tx_balancer.interval. + runner-tx-hasharray of string[]Corresponds to the teamd runner.tx_hash.team-port settingTeam Port Settings.Key NameValue TypeDefault ValueValue DescriptionconfigstringThe JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details. + lacp-keyint320Corresponds to the teamd ports.PORTIFNAME.lacp_key. + lacp-prioint32255Corresponds to the teamd ports.PORTIFNAME.lacp_prio. + link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.namestringteam-portThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". + prioint320Corresponds to the teamd ports.PORTIFNAME.prio. + queue-idint32-1Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the parameter is skipped from the json config. + stickybooleanFALSECorresponds to the teamd ports.PORTIFNAME.sticky.tun settingTunnel Settings.Key NameValue TypeDefault ValueValue DescriptiongroupstringThe group ID which will own the device. If set to NULL everyone will be able to use the device. diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index e59fd766..65fb1af3 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: Examples -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.0" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.2" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 68335f5a..b584d056 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.0" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index db40f593..d3a84594 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/10/2017 +.\" Date: 12/12/2017 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.0 +.\" Source: NetworkManager 1.10.2 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.0" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- -- cgit 1.3.0-6-gf8a5 From 50f6b47074e01dffb8dc536c0a20961dcf28ae9b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:39:23 +0100 Subject: New upstream version 1.10.4 --- man/NetworkManager.8 | 6 +++--- man/NetworkManager.conf.5 | 6 +++--- man/nm-online.1 | 6 +++--- man/nm-openvswitch.7 | 26 +++++++++++++------------- man/nm-openvswitch.xml | 20 ++++++++++---------- man/nm-settings-ifcfg-rh.5 | 6 +++--- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +++--- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 8 ++++---- man/nm-settings.xml | 4 ++-- man/nmcli-examples.7 | 6 +++--- man/nmcli.1 | 6 +++--- man/nmtui.1 | 6 +++--- 14 files changed, 55 insertions(+), 55 deletions(-) (limited to 'man') diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index a2238ee9..b0a29589 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index aa31c809..16c17964 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: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index c185d50b..7719ab4b 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index d1cc7551..e7086b91 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: OpenVSwitch support overview -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.2" "OpenVSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.4" "OpenVSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -129,11 +129,11 @@ of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("in .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-bridge conn\&.interface bridge0\fR +$ \fBnmcli conn add type ovs\-bridge conn\&.interface bridge0\fR Connection \*(Aqovs\-bridge\-bridge0\*(Aq (d10fc64d\-1d48\-4394\-a1b8\-e1aea72f27d5) successfully added\&. -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port0 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port0 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-port0\*(Aq (5ae22bae\-bba4\-4815\-9ade\-7e635633e1f0) successfully added\&. -$ \fBnmcli conn add conn\&.type ovs\-interface conn\&.interface iface0 conn\&.master port0 \e +$ \fBnmcli conn add type ovs\-interface conn\&.interface iface0 conn\&.master port0 \e ipv4\&.method manual ipv4\&.address 192\&.0\&.2\&.1/24\fR Connection \*(Aqovs\-interface\-iface0\*(Aq (3640d2a1\-a2fd\-4718\-92f1\-cffadb5b6cdc) successfully added\&. .fi @@ -150,9 +150,9 @@ As said above, you need to create a Port even for a single interface\&. Also, be .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port1 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port1 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-port1\*(Aq (67d041eb\-8e7b\-4458\-afee\-a1d07c9c4552) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth0 conn\&.master port1\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth0 conn\&.master port1\fR Connection \*(Aqovs\-slave\-eth0\*(Aq (d459c45c\-cf78\-4c1c\-b4b7\-505e71379624) successfully added\&. .fi .if n \{\ @@ -167,9 +167,9 @@ Again, you need a port\&. .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port2 conn\&.master bridge0 ovs\-port\&.tag 120\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port2 conn\&.master bridge0 ovs\-port\&.tag 120\fR Connection \*(Aqovs\-port\-port2\*(Aq (3994c093\-4ef7\-4549\-a4fd\-627b831c3cb8) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth1 conn\&.master port2\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth1 conn\&.master port2\fR Connection \*(Aqovs\-slave\-eth1\*(Aq (099be06e\-71ad\-484d\-8d5a\-fcadc5f207f5) successfully added\&. .fi .if n \{\ @@ -184,11 +184,11 @@ It\*(Aqs just a port with a tag\&. .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface bond0 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-bond0\*(Aq (d154ebf9\-e999\-4e1b\-a084\-a3de53d25d8a) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth2 conn\&.master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth2 conn\&.master bond0\fR Connection \*(Aqovs\-slave\-eth2\*(Aq (475ac1bf\-30b2\-4534\-a877\-27f33f58b082) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth3 conn\&.master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth3 conn\&.master bond0\fR Connection \*(Aqovs\-slave\-eth3\*(Aq (8dedeecb\-ed12\-482b\-b77a\-24a4fb835136) successfully added\&. .fi .if n \{\ diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 5573046c..c71e2008 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -130,11 +130,11 @@ Examples Creating a Bridge with a single internal Interface -$ nmcli conn add conn.type ovs-bridge conn.interface bridge0 +$ nmcli conn add type ovs-bridge conn.interface bridge0 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added. -$ nmcli conn add conn.type ovs-port conn.interface port0 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface port0 conn.master bridge0 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -$ nmcli conn add conn.type ovs-interface conn.interface iface0 conn.master port0 \ +$ nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \ ipv4.method manual ipv4.address 192.0.2.1/24 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. @@ -145,29 +145,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success Adding a Linux interface to a Bridge -$ nmcli conn add conn.type ovs-port conn.interface port1 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface port1 conn.master bridge0 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth0 conn.master port1 +$ nmcli conn add type ethernet conn.interface eth0 conn.master port1 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added. Again, you need a port. Creating a VLAN -$ nmcli conn add conn.type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120 +$ nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth1 conn.master port2 +$ nmcli conn add type ethernet conn.interface eth1 conn.master port2 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added. It's just a port with a tag. Creating a Bond -$ nmcli conn add conn.type ovs-port conn.interface bond0 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth2 conn.master bond0 +$ nmcli conn add type ethernet conn.interface eth2 conn.master bond0 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth3 conn.master bond0 +$ nmcli conn add type ethernet conn.interface eth3 conn.master bond0 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added. It's just a Port with multiple interfaces. See nm-settings manual for diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 8ac7d7eb..5237910f 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 8799e550..7d7037e8 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 253777c7..549c9af8 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 98242d6d..7d539d57 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.2nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.4nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index e920294a..6ad3b7e0 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -3395,7 +3395,7 @@ string T}:T{ "roundrobin" T}:T{ -Corresponds to the teamd runner\&.name\&. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp"\&. +Corresponds to the teamd runner\&.name\&. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp"\&. When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value)\&. T} T{ runner\-active diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 4aaedaff..dea3e6b5 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.2nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.4nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -370,7 +370,7 @@ namestringteamThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". notify-peers-countint320Corresponds to the teamd notify_peers.count. notify-peers-intervalint320Corresponds to the teamd notify_peers.interval. - runnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". + runnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value). runner-activebooleanFALSECorresponds to the teamd runner.active. runner-agg-select-policystringCorresponds to the teamd runner.agg_select_policy. runner-fast-ratebooleanFALSECorresponds to the teamd runner.fast_rate. diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index 65fb1af3..78698a7f 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Examples -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.2" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.4" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index b584d056..f585d1ab 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index d3a84594..5db4fbe6 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- -- cgit 1.3.0-6-gf8a5