summaryrefslogtreecommitdiff
path: root/docs/libnm-glib
diff options
context:
space:
mode:
authorDaniel Gnoutcheff <daniel@gnoutcheff.name>2010-08-02 20:15:16 -0400
committerDaniel Gnoutcheff <daniel@gnoutcheff.name>2010-08-06 13:05:46 -0400
commitaee48901f42b852f60c73383a4d05b0d0dbb2fdc (patch)
treef2d215f7e18e9ba5f1f9ac639a66bb9ad4f0ae81 /docs/libnm-glib
parentda6816a03b0a70c15ec00da58cfdbad97486ff4f (diff)
downloadNetworkManager-aee48901f42b852f60c73383a4d05b0d0dbb2fdc.tar.gz
Merged NM{Exported,Sysconfig}Connection
In continuation of the theme, the removal of user settings services means that the distinction between NMSysconfigConnection and NMExportedConnection is no longer needed. Merge NMExportedConnection into NMSysconfigConnection.
Diffstat (limited to 'docs/libnm-glib')
-rw-r--r--docs/libnm-glib/Makefile.am3
-rw-r--r--docs/libnm-glib/libnm-glib-docs.sgml2
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index b12e730a4c..f3665f2bcd 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -45,8 +45,7 @@ IGNORE_HFILES= \
nm-device-wifi-bindings.h \
nm-dhcp4-config-bindings.h \
nm-dhcp6-config-bindings.h \
- nm-exported-connection-bindings.h \
- nm-exported-connection-glue.h \
+ nm-sysconfig-connection-glue.h \
nm-ip4-config-bindings.h \
nm-ip6-config-bindings.h \
nm-settings-bindings.h \
diff --git a/docs/libnm-glib/libnm-glib-docs.sgml b/docs/libnm-glib/libnm-glib-docs.sgml
index 87e6b40d0c..c730710ba0 100644
--- a/docs/libnm-glib/libnm-glib-docs.sgml
+++ b/docs/libnm-glib/libnm-glib-docs.sgml
@@ -27,7 +27,7 @@
<xi:include href="xml/nm-ip6-config.xml"/>
<xi:include href="xml/nm-dhcp4-config.xml"/>
<xi:include href="xml/nm-dhcp6-config.xml"/>
- <xi:include href="xml/nm-exported-connection.xml"/>
+ <xi:include href="xml/nm-sysconfig-connection.xml"/>
<xi:include href="xml/nm-object.xml"/>
<xi:include href="xml/nm-remote-connection.xml"/>
<xi:include href="xml/nm-remote-settings.xml"/>