From a6ece1a2aa19a6268335c87d4fdef20123dd04a5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2015 00:06:32 +0100 Subject: Imported Upstream version 1.0.8 --- man/Makefile.in | 1 + man/NetworkManager.8 | 7 ++++++- man/NetworkManager.conf.5 | 2 +- man/nm-settings-ifcfg-rh.5 | 14 +++++++------- man/nm-settings-ifcfg-rh.xml | 10 +++++----- man/nm-settings-ifcfg-rh.xsl | 4 ++-- man/nm-settings-keyfile.5 | 6 +++--- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 8 ++++---- man/nm-settings.xml | 4 ++-- man/nmcli.1.in | 16 ++++++++++++++-- 11 files changed, 46 insertions(+), 28 deletions(-) (limited to 'man') diff --git a/man/Makefile.in b/man/Makefile.in index d62aa0f8..7f421ea9 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -304,6 +304,7 @@ LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 6ea90010..52b0aa3a 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,7 +2,7 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/27/2015 +.\" Date: 11/23/2015 .\" Manual: Network management daemons .\" Source: NetworkManager 1.0 .\" Language: English @@ -239,6 +239,11 @@ in \fBNetworkManager.conf\fR(5) for more information\&. .RE +.PP +\fB\-\-print\-config\fR +.RS 4 +Print the NetworkMangager configuration to stdout and exit\&. +.RE .SH "UDEV PROPERTIES" .PP \fBudev\fR(7) diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 011b98d3..376d528d 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,7 +2,7 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/27/2015 +.\" Date: 11/23/2015 .\" Manual: Configuration .\" Source: NetworkManager 1.0 .\" Language: English diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 26ac28d8..a843aa5f 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: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 27 August 2015 +.\" Date: 23 November 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.6 +.\" Source: NetworkManager 1.0.7 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.6" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -38,7 +38,7 @@ for details)\&. The profiles can be stored in various formats\&. NetworkManager .PP The \fIifcfg\-rh\fR -plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read/write configuration from/to the standard +plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read/write configuration from/to the traditional /etc/sysconfig/network\-scripts/ifcfg\-* files\&. Each NetworkManager connection maps to one ifcfg\-* @@ -48,7 +48,7 @@ for passwords, route\-* for static IPv4 routes and route6\-* -for static IPv6 routes\&. The plugin currently supports reading and writing Ethernet, Wi\-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections\&. Unsupported connection types (such as WWAN, PPPoE, VPN, or ADSL are handled by +for static IPv6 routes\&. The plugin currently supports reading and writing Ethernet, Wi\-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections\&. Unsupported connection types (such as WWAN, PPPoE, VPN, or ADSL) are handled by \fIkeyfile\fR plugin (\fBnm-settings-keyfile\fR(5))\&. The main reason for using \fIifcfg\-rh\fR @@ -1765,7 +1765,7 @@ VLAN flags\&.\fB Allowed values: \fR"GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDR T} T{ -ingress\-property\-map +ingress\-priority\-map T}:T{ VLAN_INGRESS_PRIORITY_MAP T}:T{ @@ -1776,7 +1776,7 @@ Ingress priority mapping\&.\fB Example: \fRVLAN_INGRESS_PRIORITY_MAP=4:2,3:5 T} T{ -egress\-property\-map +egress\-priority\-map T}:T{ VLAN_EGRESS_PRIORITY_MAP T}:T{ diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 868e7420..3fc7403f 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -27 August 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.6nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION +23 November 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.7nm-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 @@ -8,13 +8,13 @@ The ifcfg-rh plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read/write configuration from/to - the standard /etc/sysconfig/network-scripts/ifcfg-* files. + the traditional /etc/sysconfig/network-scripts/ifcfg-* files. Each NetworkManager connection maps to one ifcfg-* file, with possible usage of keys-* for passwords, route-* for static IPv4 routes and route6-* for static IPv6 routes. The plugin currently supports reading and writing Ethernet, Wi-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections. Unsupported connection types (such as - WWAN, PPPoE, VPN, or ADSL are handled by keyfile plugin + WWAN, PPPoE, VPN, or ADSL) are handled by keyfile plugin (nm-settings-keyfile5). The main reason for using ifcfg-rh plugin is the compatibility with legacy configurations for ifup and ifdown @@ -290,9 +290,9 @@ Example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yesIPV6_PRIVACY: no, yes (rfc3041 or rfc4941); IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, noteam-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.
vlan settingPropertyIfcfg-rh VariableDefaultDescriptionparentDEVICE or PHYSDEVParent interface of the VLAN.idVLAN_ID or DEVICEVLAN identifier.flagsVLAN_FLAGS, REORDER_HDRVLAN flags. -Allowed values: "GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDRingress-property-mapVLAN_INGRESS_PRIORITY_MAPIngress priority mapping. +Allowed values: "GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDRingress-priority-mapVLAN_INGRESS_PRIORITY_MAPIngress priority mapping. -Example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5egress-property-mapVLAN_EGRESS_PRIORITY_MAPEgress priority mapping. +Example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5egress-priority-mapVLAN_EGRESS_PRIORITY_MAPEgress priority mapping. Example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7interface-namePHYSDEV and VLAN_ID, or DEVICEVLAN interface name. If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, but VLAN id from DEVICE takes precedence over VLAN_ID. diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index e0e3eb9a..4338b90d 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -45,13 +45,13 @@ The ifcfg-rh plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read/write configuration from/to - the standard /etc/sysconfig/network-scripts/ifcfg-* files. + the traditional /etc/sysconfig/network-scripts/ifcfg-* files. Each NetworkManager connection maps to one ifcfg-* file, with possible usage of keys-* for passwords, route-* for static IPv4 routes and route6-* for static IPv6 routes. The plugin currently supports reading and writing Ethernet, Wi-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections. Unsupported connection types (such as - WWAN, PPPoE, VPN, or ADSL are handled by keyfile plugin + WWAN, PPPoE, VPN, or ADSL) are handled by keyfile plugin (nm-settings-keyfile5). The main reason for using ifcfg-rh plugin is the compatibility with legacy configurations for ifup and ifdown diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 61367072..7f712d18 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 27 August 2015 +.\" Date: 23 November 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.6 +.\" Source: NetworkManager 1.0.7 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.6" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index cd6e0443..d999a2aa 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -27 August 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.6nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION +23 November 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.7nm-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 144c9ab9..9f96278c 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 27 August 2015 +.\" Date: 23 November 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.6 +.\" Source: NetworkManager 1.0.7 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.6" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2729,7 +2729,7 @@ uint32 T}:T{ 1 T}:T{ -The NMSettingWiredWakeOnLan options to enable\&. Not all devices support all options\&. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40)\&. +The NMSettingWiredWakeOnLan options to enable\&. Not all devices support all options\&. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake\-on\-LAN in NetworkManager)\&. T} T{ wake\-on\-lan\-password diff --git a/man/nm-settings.xml b/man/nm-settings.xml index ae274a0d..b191aa1b 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -27 August 2015nm-settings5NetworkManagerConfiguration1.0.6nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION +23 November 2015nm-settings5NetworkManagerConfiguration1.0.7nm-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 @@ -296,7 +296,7 @@ s390-optionsdict of string to string{}Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include "portno", "layer2", "portname", "protocol", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]). s390-subchannelsarray of string[]Identifies specific subchannels that this network device uses for communication with z/VM or s390 host. Like the "mac-address" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character. speeduint320If non-zero, request that the device use only the specified speed. In Mbit/s, ie 100 == 100Mbit/s. - wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40). + wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager). wake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.
802-11-wireless settingKey NameValue TypeDefault ValueValue Description diff --git a/man/nmcli.1.in b/man/nmcli.1.in index 6df844de..8cd2afac 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -329,10 +329,10 @@ When no command is given to the \fIconnection\fP object, the default action is 'nmcli connection show'. .RE .TP -.B up [ id | uuid | path ] [ifname ] [ap ] [nsp ] [passwd ] +.B up [ id | uuid | path ] [ifname ] [ap ] [nsp ] [passwd-file ] .RE .RS -.B up ifname [ap ] [nsp ] [passwd ] +.B up ifname [ap ] [nsp ] [passwd-file ] .RS .br Activate a connection. The connection is identified by its name, UUID or D-Bus @@ -619,6 +619,18 @@ to be sent back out through the slave the frame was received on (default: yes) .RE .RS .TP +.B adsl: +.IP "\fIusername \fP" 42 +\(en ADSL user name +.IP "\fIprotocol pppoa|pppoe|ipoatm\fP" 42 +\(en ADSL protocol +.IP "\fI[password ]\fP" 42 +\(en ADSL password +.IP "\fI[encapsulation vcmux|llc]\fP" 42 +\(en ADSL encapsulation +.RE +.RS +.TP .B IP_OPTIONS: .IP "\fI[ip4 ] [gw4 ]\fP" 42 \(en IPv4 addresses -- cgit 1.3.0-6-gf8a5