Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream

1 files changed, 64 insertions, 0 deletions

diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 99655f9c..3178fbde 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -111,6 +111,18 @@
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-20-FOR:CAPS" title="NM_DEPRECATED_IN_1_20_FOR()">NM_DEPRECATED_IN_1_20_FOR</a><span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-22-FOR:CAPS" title="NM_DEPRECATED_IN_1_22_FOR()">NM_DEPRECATED_IN_1_22_FOR</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-22-2-FOR:CAPS" title="NM_DEPRECATED_IN_1_22_2_FOR()">NM_DEPRECATED_IN_1_22_2_FOR</a><span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -226,6 +238,22 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-20:CAPS" title="NM_AVAILABLE_IN_1_20">NM_AVAILABLE_IN_1_20</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-22:CAPS" title="NM_DEPRECATED_IN_1_22">NM_DEPRECATED_IN_1_22</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-22:CAPS" title="NM_AVAILABLE_IN_1_22">NM_AVAILABLE_IN_1_22</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-22-2:CAPS" title="NM_DEPRECATED_IN_1_22_2">NM_DEPRECATED_IN_1_22_2</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-2:CAPS" title="NM_AVAILABLE_IN_1_22_2">NM_AVAILABLE_IN_1_22_2</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -304,6 +332,18 @@
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_20_FOR(f)    G_DEPRECATED_FOR(f)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-22-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_22_FOR()</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_22_FOR(f)    G_DEPRECATED_FOR(f)
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-22-2-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_22_2_FOR()</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_22_2_FOR(f)    G_DEPRECATED_FOR(f)
+</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.other_details"></a><h2>Types and Values</h2>
@@ -460,6 +500,30 @@
 <pre class="programlisting"># define NM_AVAILABLE_IN_1_20            G_UNAVAILABLE(1,20)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-22:CAPS"></a><h3>NM_DEPRECATED_IN_1_22</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_22           G_DEPRECATED
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-22:CAPS"></a><h3>NM_AVAILABLE_IN_1_22</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_22            G_UNAVAILABLE(1,22)
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-22-2:CAPS"></a><h3>NM_DEPRECATED_IN_1_22_2</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_22_2           G_DEPRECATED
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-22-2:CAPS"></a><h3>NM_AVAILABLE_IN_1_22_2</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_22_2            G_UNAVAILABLE(1,22.2)
+</pre>
+</div>
 </div>
 </div>
 <div class="footer">