diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /docs/libnm-util/html/libnm-util-NetworkManager.html | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'docs/libnm-util/html/libnm-util-NetworkManager.html')
| -rw-r--r-- | docs/libnm-util/html/libnm-util-NetworkManager.html | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index 1154416a..007d5dfd 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -770,6 +770,20 @@ 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-TUN:CAPS"></a>NM_DEVICE_TYPE_TUN</p></td> +<td class="enum_member_description"> +<p>a TUN/TAP interface</p> +</td> +<td class="enum_member_annotations"> </td> +</tr> +<tr> +<td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-IP-TUNNEL:CAPS"></a>NM_DEVICE_TYPE_IP_TUNNEL</p></td> +<td class="enum_member_description"> +<p>an IP tunnel interface</p> +</td> +<td class="enum_member_annotations"> </td> +</tr> </tbody> </table></div> </div> |