Merge branch 'debian/master' into ubuntu/master

1 files changed, 9 insertions, 9 deletions

diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html
index afd1ac72..cdd8c3ad 100644
--- a/docs/api/html/settings-vpn.html
+++ b/docs/api/html/settings-vpn.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="Configuration Settings">
 <link rel="prev" href="settings-vlan.html" title="vlan">
 <link rel="next" href="settings-vrf.html" title="vrf">
-<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>vpn</h2>
-<p>vpn — VPN Settings</p>
+<p>vpn —  VPN Settings</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
@@ -57,37 +57,37 @@
 <td><pre class="screen">data</pre></td>
 <td><pre class="screen">dict of string to string</pre></td>
 <td><pre class="screen">{}</pre></td>
-<td>Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">persistent</pre></td>
 <td><pre class="screen">boolean</pre></td>
 <td><pre class="screen">FALSE</pre></td>
-<td>If the VPN service supports persistence, and this property is TRUE, the VPN will attempt to stay connected across link changes and outages, until explicitly disconnected.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">secrets</pre></td>
 <td><pre class="screen">dict of string to string</pre></td>
 <td><pre class="screen">{}</pre></td>
-<td>Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">service-type</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">timeout</pre></td>
 <td><pre class="screen">uint32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overridden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.</td>
+<td> </td>
 </tr>
 <tr>
 <td><pre class="screen">user-name</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.</td>
+<td> </td>
 </tr>
 </tbody>
 </table></div>
@@ -96,6 +96,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