diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
| commit | 44826499c23720be3d74ab674c4fd38912c5b8c2 (patch) | |
| tree | 613bec9c2242e5e0700bef1ba87ca2d25d755795 /docs/libnm-glib/html/NMDevice.html | |
| parent | 9a8ff86a032d1e4dd04238fcde856b145406df6f (diff) | |
| parent | 8c98b34228abb4dfde822ad89106b4d8b2287639 (diff) | |
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'docs/libnm-glib/html/NMDevice.html')
| -rw-r--r-- | docs/libnm-glib/html/NMDevice.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 7602b851..fd8061ce 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -119,6 +119,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMDev +----<a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a> +----<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a> +----<a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a> + +----<a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> +----<a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">NMDeviceInfiniband</a> +----<a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a> +----<a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a> @@ -632,7 +633,7 @@ Gets the current <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config" </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <span class="type">NMDHCPConfig</span> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not +<td>the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> @@ -656,7 +657,7 @@ Gets the current <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config" </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <span class="type">NMDHCPConfig</span> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not +<td>the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> |