Imported Upstream version 0.9.4.0 upstream/0.9.4.0

1 files changed, 116 insertions, 2 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 7bbce879..cee42ea4 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -9,13 +9,11 @@ NMSettingConnection
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -38,6 +36,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:master ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingConnection:permissions ##### -->
 <para>
 
@@ -48,6 +51,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:slave-type ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingConnection:timestamp ##### -->
 <para>
 
@@ -63,6 +71,11 @@ NMSettingConnection
 
 </para>
 
+<!-- ##### ARG NMSettingConnection:zone ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT NMSettingConnectionClass ##### -->
 <para>
 
@@ -83,6 +96,7 @@ NMSettingConnection
 @NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
 @NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
+@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
 
 <!-- ##### MACRO NM_SETTING_CONNECTION_AUTOCONNECT ##### -->
 <para>
@@ -91,6 +105,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_ID ##### -->
 <para>
 
@@ -98,6 +119,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_MASTER ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_PERMISSIONS ##### -->
 <para>
 
@@ -119,6 +147,13 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_SLAVE_TYPE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_CONNECTION_TIMESTAMP ##### -->
 <para>
 
@@ -140,6 +175,48 @@ NMSettingConnection
 
 
 
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_BLOCK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_HOME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_PUBLIC ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_TRUSTED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_CONNECTION_ZONE_WORK ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION nm_setting_connection_add_permission ##### -->
 <para>
 
@@ -188,6 +265,15 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_master ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_get_num_permissions ##### -->
 <para>
 
@@ -219,6 +305,15 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_slave_type ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_get_timestamp ##### -->
 <para>
 
@@ -237,6 +332,25 @@ NMSettingConnection
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_connection_get_zone ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_connection_is_slave_type ##### -->
+<para>
+
+</para>
+
+@setting: 
+@type: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_connection_new ##### -->
 <para>