summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-09-29 10:58:16 -0400
committerDan Winship <danw@gnome.org>2014-10-10 12:40:19 -0400
commit6f3d1f95262abbf5101d6f88ecfa292d575e0d4f (patch)
treebffa6c50529d46377f71da8907dcd734a8e7a366 /docs
parentc1f1e9618126e618e9f10d9a5ce74b2ef7101e76 (diff)
downloadNetworkManager-6f3d1f95262abbf5101d6f88ecfa292d575e0d4f.tar.gz
libnm: merge NMRemoteSettings into NMClient
Make NMRemoteSettings internal and have NMClient wrap all of its APIs, just like it does with NMManager.
Diffstat (limited to 'docs')
-rw-r--r--docs/libnm/Makefile.am2
-rw-r--r--docs/libnm/libnm-docs.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 5556aadb97..1e1e9ae276 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -34,10 +34,12 @@ IGNORE_HFILES= \
nm-dbus-helpers-private.h \
nm-core-internal.h \
nm-device-private.h \
+ nm-manager.h \
nm-object-cache.h \
nm-object-private.h \
nm-param-spec-dbus.h \
nm-remote-connection-private.h \
+ nm-remote-settings.h \
nm-setting-private.h \
nm-types-private.h \
nm-utils-private.h
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 3d1de81fe5..00eba8abb2 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -66,7 +66,6 @@
<chapter>
<title>Client Object API Reference</title>
<xi:include href="xml/nm-client.xml"/>
- <xi:include href="xml/nm-remote-settings.xml"/>
<xi:include href="xml/nm-secret-agent.xml"/>
<xi:include href="xml/nm-object.xml"/>
</chapter>