Merge commit 'upstream/0.9.2.0'

1 files changed, 132 insertions, 0 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
new file mode 100644
index 00000000..ef059fad
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -0,0 +1,132 @@
+<!-- ##### SECTION Title ##### -->
+NMSettingBluetooth
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT NMSettingBluetooth ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMSettingBluetooth:bdaddr ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingBluetooth:type ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMSettingBluetoothClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+<!-- ##### ENUM NMSettingBluetoothError ##### -->
+<para>
+
+</para>
+
+@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
+@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
+
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_BDADDR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_SETTING_NAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_DUN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_BLUETOOTH_TYPE_PANU ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION nm_setting_bluetooth_error_quark ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bluetooth_get_bdaddr ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bluetooth_get_connection_type ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_bluetooth_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+