Merge tag 'upstream/1.0.0' into experimental

Upstream version 1.0.0

1 files changed, 77 insertions, 0 deletions

diff --git a/docs/libnm/tmpl/nm-object.sgml b/docs/libnm/tmpl/nm-object.sgml
new file mode 100644
index 00000000..53ed0566
--- /dev/null
+++ b/docs/libnm/tmpl/nm-object.sgml
@@ -0,0 +1,77 @@
+<!-- ##### SECTION Title ##### -->
+NMObject
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO NM_OBJECT_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT NMObject ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG NMObject:dbus-connection ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMObject:nm-running-internal ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMObject:path ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT NMObjectClass ##### -->
+<para>
+
+</para>
+
+@parent: 
+@init_dbus: 
+@object_creation_failed: 
+
+<!-- ##### FUNCTION nm_object_get_path ##### -->
+<para>
+
+</para>
+
+@object: 
+@Returns: 
+
+