Merge branch 'debian/master' into ubuntu/master

1 files changed, 64 insertions, 3 deletions

diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 576f152c..52c01144 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -8,14 +8,16 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBridge.html" title="NMDeviceBridge">
 <link rel="next" href="NMDeviceDummy.html" title="NMDeviceDummy">
-<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">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
-                  <a href="#NMDeviceBt.description" class="shortcut">Description</a></span>
+                  <a href="#NMDeviceBt.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBt.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBt.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch04.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -65,6 +67,29 @@
 </table></div>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBt.properties"></a><h2>Properties</h2>
+<div class="informaltable"><table class="informaltable" border="0">
+<colgroup>
+<col width="150px" class="properties_type">
+<col width="300px" class="properties_name">
+<col width="200px" class="properties_flags">
+</colgroup>
+<tbody>
+<tr>
+<td class="property_type"><a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></td>
+<td class="property_name"><a class="link" href="NMDeviceBt.html#NMDeviceBt--bt-capabilities" title="The “bt-capabilities” property">bt-capabilities</a></td>
+<td class="property_flags">Read</td>
+</tr>
+<tr>
+<td class="property_type">
+<span class="type">char</span> *</td>
+<td class="property_name"><a class="link" href="NMDeviceBt.html#NMDeviceBt--name" title="The “name” property">name</a></td>
+<td class="property_flags">Read</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBt.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
@@ -84,10 +109,22 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS" title="NM_DEVICE_BT_CAPABILITIES">NM_DEVICE_BT_CAPABILITIES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceBt.html#NMDeviceBt-struct" title="NMDeviceBt">NMDeviceBt</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBt.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+    <span class="lineart">╰──</span> <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+        <span class="lineart">╰──</span> <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+            <span class="lineart">╰──</span> NMDeviceBt
+</pre>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBt.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -195,9 +232,33 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <pre class="programlisting">#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBt-struct"></a><h3>NMDeviceBt</h3>
+<pre class="programlisting">typedef struct _NMDeviceBt NMDeviceBt;</pre>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMDeviceBt.property-details"></a><h2>Property Details</h2>
+<div class="refsect2">
+<a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities”</code> property</h3>
+<pre class="programlisting">  “bt-capabilities”          <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></pre>
+<p>The device's bluetooth capabilities, a combination of <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
+<p>Owner: NMDeviceBt</p>
+<p>Flags: Read</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBt--name"></a><h3>The <code class="literal">“name”</code> property</h3>
+<pre class="programlisting">  “name”                     <span class="type">char</span> *</pre>
+<p>The name of the bluetooth device.</p>
+<p>Owner: NMDeviceBt</p>
+<p>Flags: Read</p>
+<p>Default value: NULL</p>
+</div>
 </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