diff options
author | Dan Winship <danw@gnome.org> | 2014-09-16 16:42:46 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
commit | 21c8a6b20effbe1e689505a0cbb23594be06068c (patch) | |
tree | 15e43867853d0242950e40e049499e1c2d29cc78 /docs | |
parent | 303e84e65e5b9b5a403e4f8366e094447d51a9fa (diff) | |
download | NetworkManager-21c8a6b20effbe1e689505a0cbb23594be06068c.tar.gz |
libnm-core, all: merge IPv4 and IPv6 address/route types
Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route
and NMIP6Route into NMIPRoute. The new types represent IP addresses as
strings, rather than in binary, and so are address-family agnostic.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/libnm/libnm-docs.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 007cbe4108..130c690429 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -87,6 +87,7 @@ <xi:include href="xml/nm-setting-generic.xml"/> <xi:include href="xml/nm-setting-gsm.xml"/> <xi:include href="xml/nm-setting-infiniband.xml"/> + <xi:include href="xml/nm-setting-ip-config.xml"/> <xi:include href="xml/nm-setting-ip4-config.xml"/> <xi:include href="xml/nm-setting-ip6-config.xml"/> <xi:include href="xml/nm-setting-olpc-mesh.xml"/> |