about summary refs log tree commit diff
path: root/docs/libnm-util/html/index.sgml
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-03-18 20:18:01 +0100
committerMichael Biebl <biebl@debian.org>2011-03-18 20:18:01 +0100
commit7638c999f0a44ad6c1734d53ad3d057cbaf04273 (patch)
treea3b60d74304f5717135fa7f430a52c4519be6b39 /docs/libnm-util/html/index.sgml
parent3d5624f02b77c669786cd29dc942dfe78b77ec81 (diff)
parente22c6e05e9ebc6cce941762020c5710b8014677b (diff)
Merge commit 'upstream/0.8.3.998'
Diffstat (limited to 'docs/libnm-util/html/index.sgml')
-rw-r--r--docs/libnm-util/html/index.sgml7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 8c58af38..ee50d977 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -30,6 +30,7 @@
 <ANCHOR id="nm-connection-get-setting-by-name" href="libnm-util/NMConnection.html#nm-connection-get-setting-by-name">
 <ANCHOR id="nm-connection-replace-settings" href="libnm-util/NMConnection.html#nm-connection-replace-settings">
 <ANCHOR id="nm-connection-compare" href="libnm-util/NMConnection.html#nm-connection-compare">
+<ANCHOR id="nm-connection-diff" href="libnm-util/NMConnection.html#nm-connection-diff">
 <ANCHOR id="nm-connection-verify" href="libnm-util/NMConnection.html#nm-connection-verify">
 <ANCHOR id="nm-connection-need-secrets" href="libnm-util/NMConnection.html#nm-connection-need-secrets">
 <ANCHOR id="nm-connection-clear-secrets" href="libnm-util/NMConnection.html#nm-connection-clear-secrets">
@@ -83,6 +84,11 @@
 <ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-ID:CAPS">
 <ANCHOR id="NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-COMPARE-FLAG-IGNORE-SECRETS:CAPS">
 <ANCHOR id="nm-setting-compare" href="libnm-util/NMSetting.html#nm-setting-compare">
+<ANCHOR id="NMSettingDiffResult" href="libnm-util/NMSetting.html#NMSettingDiffResult">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-UNKNOWN:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-A:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-A:CAPS">
+<ANCHOR id="NM-SETTING-DIFF-RESULT-IN-B:CAPS" href="libnm-util/NMSetting.html#NM-SETTING-DIFF-RESULT-IN-B:CAPS">
+<ANCHOR id="nm-setting-diff" href="libnm-util/NMSetting.html#nm-setting-diff">
 <ANCHOR id="nm-setting-enumerate-values" href="libnm-util/NMSetting.html#nm-setting-enumerate-values">
 <ANCHOR id="nm-setting-to-string" href="libnm-util/NMSetting.html#nm-setting-to-string">
 <ANCHOR id="nm-setting-clear-secrets" href="libnm-util/NMSetting.html#nm-setting-clear-secrets">
@@ -948,3 +954,4 @@
 <ANCHOR id="nm-utils-wifi-channel-to-freq" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-channel-to-freq">
 <ANCHOR id="nm-utils-wifi-find-next-channel" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-find-next-channel">
 <ANCHOR id="nm-utils-wifi-is-channel-valid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-wifi-is-channel-valid">
+<ANCHOR id="annotation-glossterm-element-type" href="libnm-util/annotation-glossary.html#annotation-glossterm-element-type">