Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 30 insertions, 7 deletions

diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index b4843dd7..d1ea1056 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="NMSettingVpn.html" title="NMSettingVpn">
+<link rel="prev" href="NMSettingVxlan.html" title="NMSettingVxlan">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -21,7 +21,7 @@
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="NMSettingVpn.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMSettingVxlan.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSettingWired.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -124,6 +124,9 @@
 <a name="NMSettingWimax.description"></a><h2>Description</h2>
 <p>The <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties
 necessary for connection to 802.16e Mobile WiMAX networks.</p>
+<p>NetworkManager no longer supports WiMAX; while this API remains available for
+backward-compatibility reasons, it serves no real purpose, since WiMAX
+connections cannot be activated.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingWimax.functions_details"></a><h2>Functions</h2>
@@ -131,9 +134,13 @@ necessary for connection to 802.16e Mobile WiMAX networks.</p>
 <a name="nm-setting-wimax-new"></a><h3>nm_setting_wimax_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
 nm_setting_wimax_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<div class="warning">
+<p><code class="literal">nm_setting_wimax_new</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
+<p>WiMAX is no longer supported.</p>
+</div>
 <p>Creates a new <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> object with default values.</p>
 <div class="refsect3">
-<a name="id-1.4.28.8.2.5"></a><h4>Returns</h4>
+<a name="id-1.4.32.8.2.6"></a><h4>Returns</h4>
 <p> the new empty <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> object</p>
 </div>
 </div>
@@ -142,10 +149,14 @@ nm_setting_wimax_new (<em class="parameter"><code><span class="type">void</span>
 <a name="nm-setting-wimax-get-network-name"></a><h3>nm_setting_wimax_get_network_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_wimax_get_network_name (<em class="parameter"><code><a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> *setting</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">nm_setting_wimax_get_network_name</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
+<p>WiMAX is no longer supported.</p>
+</div>
 <p>Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
 specific WiMAX network this setting describes a connection to.</p>
 <div class="refsect3">
-<a name="id-1.4.28.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.4.32.8.3.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -160,7 +171,7 @@ specific WiMAX network this setting describes a connection to.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.28.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.4.32.8.3.7"></a><h4>Returns</h4>
 <p> the WiMAX NSP name</p>
 </div>
 </div>
@@ -169,10 +180,14 @@ specific WiMAX network this setting describes a connection to.</p>
 <a name="nm-setting-wimax-get-mac-address"></a><h3>nm_setting_wimax_get_mac_address ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_setting_wimax_get_mac_address (<em class="parameter"><code><a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> *setting</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">nm_setting_wimax_get_mac_address</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
+<p>WiMAX is no longer supported.</p>
+</div>
 <p>Returns the MAC address of a WiMAX device which this connection is locked
 to.</p>
 <div class="refsect3">
-<a name="id-1.4.28.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.4.32.8.4.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -187,7 +202,7 @@ to.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.28.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.4.32.8.4.7"></a><h4>Returns</h4>
 <p> the MAC address</p>
 </div>
 </div>
@@ -220,6 +235,10 @@ to.</p>
 <p>If specified, this connection will only apply to the WiMAX device whose
 MAC address matches. This property does not change the MAC address of the
 device (known as MAC spoofing).</p>
+<div class="warning">
+<p><code class="literal">NMSettingWimax:mac-address</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
+<p>WiMAX is no longer supported.</p>
+</div>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -229,6 +248,10 @@ device (known as MAC spoofing).</p>
 <pre class="programlisting">  “network-name”             <span class="type">gchar</span> *</pre>
 <p>Network Service Provider (NSP) name of the WiMAX network this connection
 should use.</p>
+<div class="warning">
+<p><code class="literal">NMSettingWimax:network-name</code> has been deprecated since version 1.2 and should not be used in newly-written code.</p>
+<p>WiMAX is no longer supported.</p>
+</div>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>