From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Jan 2016 16:26:51 +0100 Subject: Imported Upstream version 1.1.90 --- docs/libnm/html/ch03.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'docs/libnm/html/ch03.html') diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html index e30c11dc..2bd5219f 100644 --- a/docs/libnm/html/ch03.html +++ b/docs/libnm/html/ch03.html @@ -69,17 +69,23 @@ NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
+NMSettingIP4Config — Describes IPv4 addressing, routing, and name service properties +
+
+NMSettingIP6Config — Describes IPv6 addressing, routing, and name service properties +
+
NMSettingIPConfig — Abstract base class for IPv4 and IPv6 addressing, routing, and name service properties
-NMSettingIP4Config — Describes IPv4 addressing, routing, and name service properties +NMSettingIPTunnel — Describes connection properties for IP tunnel devices
-NMSettingIP6Config — Describes IPv6 addressing, routing, and name service properties +NMSettingMacvlan — Describes connection properties for macvlan interfaces
-NMSettingOlpcMesh +NMSettingOlpcMesh — Describes connection properties for OLPC-Mesh devices
NMSettingPpp — Describes connection properties for devices/networks @@ -99,12 +105,18 @@ serial communications NMSettingTeamPort — Describes connection properties for team ports
+NMSettingTun — Describes connection properties for TUN/TAP interfaces +
+
NMSettingVlan — Describes connection properties for VLAN interfaces
NMSettingVpn — Describes connection properties for Virtual Private Networks
+NMSettingVxlan — Describes connection properties for VXLAN interfaces +
+
NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties
-- cgit 1.3.0-6-gf8a5