diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /libnm/nm-ifcfg-rh-docs.xml | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'libnm/nm-ifcfg-rh-docs.xml')
| -rw-r--r-- | libnm/nm-ifcfg-rh-docs.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm/nm-ifcfg-rh-docs.xml b/libnm/nm-ifcfg-rh-docs.xml index 438f4b71..0c287f26 100644 --- a/libnm/nm-ifcfg-rh-docs.xml +++ b/libnm/nm-ifcfg-rh-docs.xml @@ -86,6 +86,8 @@ the connection type."/> <property name="slave-type" variable="MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE" format="" values="" default="" example="" description="Slave type doesn't map directly to a variable, but it is recognized using different variables. MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging."/> +<property name="autoconnect-slaves" variable="AUTOCONNECT-SLAVES(+)" format="" values="" default="missing variable means global default" example="" description="Whether slaves of this connection should be auto-connected +when this connection is activated."/> <property name="secondaries" variable="SECONDARY_UUIDS(+)" format="" values="" default="" example="" description="UUID of VPN connections that should be activated together with this connection."/> <property name="gateway-ping-timeout" variable="GATEWAY_PING_TIMEOUT(+)" format="" values="" default="0" example="GATEWAY_PING_TIMEOUT=5" description="If greater than zero, the IP connectivity will be checked by |