Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 24 insertions, 12 deletions

diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html
index c99302eb..c5633ef8 100644
--- a/docs/libnm/html/NMSettingEthtool.html
+++ b/docs/libnm/html/NMSettingEthtool.html
@@ -139,11 +139,6 @@ to control network driver and hardware settings.</p>
 nm_ethtool_optname_is_feature (<em class="parameter"><code>const <span class="type">char</span> *optname</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>optname</code></em>
  is a valid option name for an offload feature.</p>
-<p><code class="literal">Returns</code>: <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
- is valid</p>
-<p>Note that <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> was first added to the libnm header files
-in 1.14.0 but forgot to actually add to the library. This happened belatedly in 1.20.0 and
-the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8").</p>
 <div class="refsect3">
 <a name="nm-ethtool-optname-is-feature.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -159,6 +154,14 @@ the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ethtool-optname-is-feature.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
+is valid</p>
+<p>Note that <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> was first added to the libnm header files
+in 1.14.0 but forgot to actually add to the library. This happened belatedly in 1.20.0 and
+the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8").</p>
+</div>
 <p class="since">Since: 1.20</p>
 </div>
 <hr>
@@ -168,8 +171,6 @@ the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8
 nm_ethtool_optname_is_coalesce (<em class="parameter"><code>const <span class="type">char</span> *optname</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>optname</code></em>
  is a valid option name for a coalesce setting.</p>
-<p><code class="literal">Returns</code>: <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
- is valid</p>
 <div class="refsect3">
 <a name="nm-ethtool-optname-is-coalesce.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -185,6 +186,11 @@ nm_ethtool_optname_is_coalesce (<em class="parameter"><code>const <span class="t
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ethtool-optname-is-coalesce.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
+is valid</p>
+</div>
 <p class="since">Since: 1.26</p>
 </div>
 <hr>
@@ -194,8 +200,6 @@ nm_ethtool_optname_is_coalesce (<em class="parameter"><code>const <span class="t
 nm_ethtool_optname_is_ring (<em class="parameter"><code>const <span class="type">char</span> *optname</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>optname</code></em>
  is a valid option name for a ring setting.</p>
-<p><code class="literal">Returns</code>: <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
- is valid</p>
 <div class="refsect3">
 <a name="nm-ethtool-optname-is-ring.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -211,6 +215,11 @@ nm_ethtool_optname_is_ring (<em class="parameter"><code>const <span class="type"
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ethtool-optname-is-ring.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
+is valid</p>
+</div>
 <p class="since">Since: 1.26</p>
 </div>
 <hr>
@@ -220,8 +229,6 @@ nm_ethtool_optname_is_ring (<em class="parameter"><code>const <span class="type"
 nm_ethtool_optname_is_pause (<em class="parameter"><code>const <span class="type">char</span> *optname</code></em>);</pre>
 <p>Checks whether <em class="parameter"><code>optname</code></em>
  is a valid option name for a pause setting.</p>
-<p><code class="literal">Returns</code>: <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
- is valid</p>
 <div class="refsect3">
 <a name="nm-ethtool-optname-is-pause.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -237,6 +244,11 @@ nm_ethtool_optname_is_pause (<em class="parameter"><code>const <span class="type
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ethtool-optname-is-pause.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, if <em class="parameter"><code>optname</code></em>
+is valid</p>
+</div>
 <p class="since">Since: 1.32</p>
 </div>
 <hr>
@@ -263,7 +275,7 @@ nm_setting_ethtool_get_optnames (<em class="parameter"><code><a class="link" hre
 <p>use <a class="link" href="NMSetting.html#nm-setting-option-get-all-names" title="nm_setting_option_get_all_names ()"><code class="function">nm_setting_option_get_all_names()</code></a> instead.</p>
 </div>
 <p>This returns all options names that are set. This includes the feature names
-like <code class="literal">NM_ETHTOOL_OPTNAME_FEATURE_GRO</code>. See <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> to
+like <a class="link" href="libnm-nm-ethtool-utils.html#NM-ETHTOOL-OPTNAME-FEATURE-GRO:CAPS" title="NM_ETHTOOL_OPTNAME_FEATURE_GRO"><code class="literal">NM_ETHTOOL_OPTNAME_FEATURE_GRO</code></a>. See <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> to
 check whether the option name is valid for offload features.</p>
 <div class="refsect3">
 <a name="nm-setting-ethtool-get-optnames.parameters"></a><h4>Parameters</h4>