Merge tag 'upstream/0.9.4.0'

Upstream version 0.9.4.0

1 files changed, 17 insertions, 3 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 912a47c6..a5198c10 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -9,13 +9,11 @@ NMSetting
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### SECTION Stability_Level ##### -->
 
 
@@ -46,8 +44,8 @@ NMSetting
 @set_secret_flags: 
 @compare_property: 
 @clear_secrets_with_flags: 
+@get_virtual_iface_name: 
 @_reserved1: 
-@_reserved2: 
 
 <!-- ##### USER_FUNCTION NMSettingClearSecretsWithFlagsFn ##### -->
 <para>
@@ -123,6 +121,13 @@ NMSetting
 @user_data: 
 
 
+<!-- ##### MACRO NM_SETTING_ERROR ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_NAME ##### -->
 <para>
 
@@ -249,6 +254,15 @@ NMSetting
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_get_virtual_iface_name ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_need_secrets ##### -->
 <para>