diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-27 19:57:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-27 19:57:41 +0200 |
| commit | 8529df552804e5cd05ac785f658cd16ab56f7247 (patch) | |
| tree | 30af064ab23262d7eed0c6f44e41c37a94d7911a /docs/libnm-glib/html/libnm-glib.devhelp2 | |
| parent | f537c885beb1336d5d497d6261f2d2d8223a57e7 (diff) | |
| parent | d465e5fac63f36bcf4069e36827f4b62c494556d (diff) | |
Merge commit 'upstream/0.8.9997' into experimental
Diffstat (limited to 'docs/libnm-glib/html/libnm-glib.devhelp2')
| -rw-r--r-- | docs/libnm-glib/html/libnm-glib.devhelp2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 4cc1d64b..a74fd687 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -122,6 +122,7 @@ <keyword type="macro" name="NM_DEVICE_IP6_CONFIG" link="NMDevice.html#NM-DEVICE-IP6-CONFIG:CAPS"/> <keyword type="macro" name="NM_DEVICE_DHCP6_CONFIG" link="NMDevice.html#NM-DEVICE-DHCP6-CONFIG:CAPS"/> <keyword type="macro" name="NM_DEVICE_STATE" link="NMDevice.html#NM-DEVICE-STATE:CAPS"/> + <keyword type="macro" name="NM_DEVICE_ACTIVE_CONNECTION" link="NMDevice.html#NM-DEVICE-ACTIVE-CONNECTION:CAPS"/> <keyword type="macro" name="NM_DEVICE_VENDOR" link="NMDevice.html#NM-DEVICE-VENDOR:CAPS"/> <keyword type="macro" name="NM_DEVICE_PRODUCT" link="NMDevice.html#NM-DEVICE-PRODUCT:CAPS"/> <keyword type="struct" name="NMDevice" link="NMDevice.html#NMDevice-struct"/> @@ -140,12 +141,14 @@ <keyword type="function" name="nm_device_get_ip6_config ()" link="NMDevice.html#nm-device-get-ip6-config"/> <keyword type="function" name="nm_device_get_dhcp6_config ()" link="NMDevice.html#nm-device-get-dhcp6-config"/> <keyword type="function" name="nm_device_get_state ()" link="NMDevice.html#nm-device-get-state"/> + <keyword type="function" name="nm_device_get_active_connection ()" link="NMDevice.html#nm-device-get-active-connection"/> <keyword type="function" name="nm_device_get_product ()" link="NMDevice.html#nm-device-get-product"/> <keyword type="function" name="nm_device_get_vendor ()" link="NMDevice.html#nm-device-get-vendor"/> <keyword type="function" name="NMDeviceDeactivateFn ()" link="NMDevice.html#NMDeviceDeactivateFn"/> <keyword type="function" name="nm_device_disconnect ()" link="NMDevice.html#nm-device-disconnect"/> <keyword type="function" name="nm_device_filter_connections ()" link="NMDevice.html#nm-device-filter-connections"/> <keyword type="function" name="nm_device_connection_valid ()" link="NMDevice.html#nm-device-connection-valid"/> + <keyword type="property" name="The "active-connection" property" link="NMDevice.html#NMDevice--active-connection"/> <keyword type="property" name="The "capabilities" property" link="NMDevice.html#NMDevice--capabilities"/> <keyword type="property" name="The "device-type" property" link="NMDevice.html#NMDevice--device-type"/> <keyword type="property" name="The "dhcp4-config" property" link="NMDevice.html#NMDevice--dhcp4-config"/> |