diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /docs/libnm-util/html/libnm-util-NetworkManager.html | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'docs/libnm-util/html/libnm-util-NetworkManager.html')
| -rw-r--r-- | docs/libnm-util/html/libnm-util-NetworkManager.html | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index 007d5dfd..cf1ba5fb 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -646,7 +646,7 @@ <div class="refsect2"> <a name="NMDeviceType"></a><h3>enum NMDeviceType</h3> <p><a class="link" href="libnm-util-NetworkManager.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by -an <a href="https://developer.gnome.org/libnm-glib/0.9/NMDevice.html"><span class="type">NMDevice</span></a>.</p> +an <span class="type">NMDevice</span>.</p> <p>(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)</p> <div class="refsect3"> <a name="id-1.2.31.6.45.5"></a><h4>Members</h4> @@ -784,6 +784,27 @@ GSM/UMTS, or LTE network access protocols</p> </td> <td class="enum_member_annotations"> </td> </tr> +<tr> +<td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-MACVLAN:CAPS"></a>NM_DEVICE_TYPE_MACVLAN</p></td> +<td class="enum_member_description"> +<p>a MACVLAN interface</p> +</td> +<td class="enum_member_annotations"> </td> +</tr> +<tr> +<td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-VXLAN:CAPS"></a>NM_DEVICE_TYPE_VXLAN</p></td> +<td class="enum_member_description"> +<p>a VXLAN interface</p> +</td> +<td class="enum_member_annotations"> </td> +</tr> +<tr> +<td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-VETH:CAPS"></a>NM_DEVICE_TYPE_VETH</p></td> +<td class="enum_member_description"> +<p>a VETH interface</p> +</td> +<td class="enum_member_annotations"> </td> +</tr> </tbody> </table></div> </div> |