Merge branch 'debian/master' into ubuntu/master

1 files changed, 16 insertions, 16 deletions

diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html
index 4a154d49..cd464bac 100644
--- a/docs/api/html/settings-ip-tunnel.html
+++ b/docs/api/html/settings-ip-tunnel.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="Configuration Settings">
 <link rel="prev" href="settings-ipv6.html" title="ipv6">
 <link rel="next" href="settings-macsec.html" title="macsec">
-<meta name="generator" content="GTK-Doc V1.33.0 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -29,7 +29,7 @@
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2>ip-tunnel</h2>
-<p>ip-tunnel — IP Tunneling Settings</p>
+<p>ip-tunnel —  IP Tunneling Settings</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
@@ -57,79 +57,79 @@
 <td><pre class="screen">encapsulation-limit</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">flags</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">flow-label</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">input-key</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">local</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">mode</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">mtu</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">output-key</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">parent</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">path-mtu-discovery</pre></td>
 <td><pre class="screen">boolean</pre></td>
 <td><pre class="screen">TRUE</pre></td>
-<td>Whether to enable Path MTU Discovery on this tunnel.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">remote</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">tos</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">ttl</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.</td>
+<td> </td>
 </tr>
 </tbody>
 </table></div>
@@ -138,6 +138,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.33.0</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>
\ No newline at end of file