diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-22 13:48:18 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
| commit | ca18b2d44290c938894dc63f7b03d04a3be271bc (patch) | |
| tree | 9fdf5a36bd0de1c788fa810864801f5c4495f2cc /docs | |
| parent | d34910b12860eb080b1a519f441946cbc378f769 (diff) | |
| download | NetworkManager-ca18b2d44290c938894dc63f7b03d04a3be271bc.tar.gz | |
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config
As with NMIP4Config and NMIP6Config, merge the two DHCP config classes
into one in the public API.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libnm/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/libnm/libnm-docs.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 0c82e751a9..2d1200b485 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -34,6 +34,8 @@ IGNORE_HFILES= \ nm-dbus-helpers-private.h \ nm-core-internal.h \ nm-device-private.h \ + nm-dhcp4-config.h \ + nm-dhcp6-config.h \ nm-ip4-config.h \ nm-ip6-config.h \ nm-manager.h \ diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index c60b4727e6..e722a30964 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -129,8 +129,7 @@ <xi:include href="xml/nm-access-point.xml"/> <xi:include href="xml/nm-wimax-nsp.xml"/> <xi:include href="xml/nm-ip-config.xml"/> - <xi:include href="xml/nm-dhcp4-config.xml"/> - <xi:include href="xml/nm-dhcp6-config.xml"/> + <xi:include href="xml/nm-dhcp-config.xml"/> </chapter> <chapter> |