Merge commit 'upstream/0.8.2' into experimental

1 files changed, 127 insertions, 0 deletions

diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 4ac2c691..ef5c784b 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -94,6 +94,13 @@ NMSettingWired
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRED_CLONED_MAC_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO NM_SETTING_WIRED_MTU ##### -->
 <para>
 
@@ -101,6 +108,27 @@ NMSettingWired
 
 
 
+<!-- ##### MACRO NM_SETTING_WIRED_S390_SUBCHANNELS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_WIRED_S390_NETTYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO NM_SETTING_WIRED_S390_OPTIONS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### STRUCT NMSettingWired ##### -->
 <para>
 
@@ -112,6 +140,11 @@ NMSettingWired
 
 </para>
 
+<!-- ##### ARG NMSettingWired:cloned-mac-address ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWired:duplex ##### -->
 <para>
 
@@ -132,6 +165,21 @@ NMSettingWired
 
 </para>
 
+<!-- ##### ARG NMSettingWired:s390-nettype ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingWired:s390-options ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG NMSettingWired:s390-subchannels ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG NMSettingWired:speed ##### -->
 <para>
 
@@ -211,6 +259,15 @@ NMSettingWired
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wired_get_cloned_mac_address ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
 <!-- ##### FUNCTION nm_setting_wired_get_mtu ##### -->
 <para>
 
@@ -220,3 +277,73 @@ NMSettingWired
 @Returns: 
 
 
+<!-- ##### FUNCTION nm_setting_wired_get_s390_subchannels ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_nettype ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_num_s390_options ##### -->
+<para>
+
+</para>
+
+@setting: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@idx: 
+@out_key: 
+@out_value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_get_s390_option_by_key ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_add_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@item: 
+@Returns: 
+
+
+<!-- ##### FUNCTION nm_setting_wired_remove_s390_option ##### -->
+<para>
+
+</para>
+
+@setting: 
+@key: 
+@Returns: 
+
+