New upstream version 1.12.4 upstream/1.12.4

1 files changed, 8 insertions, 31 deletions

diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index 664dd255..a9db7ad2 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -188,7 +188,7 @@ id=4
 <tr><td>802-11-wireless-security  =  wifi-security</td></tr>
 </table>
 <div class="table">
-<a name="id-1.2.8.6.4"></a><p class="title"><b>Table 28. bridge setting (section)</b></p>
+<a name="id-1.2.8.6.4"></a><p class="title"><b>Table 26. bridge setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="bridge setting (section)" border="1">
 <colgroup>
 <col>
@@ -213,7 +213,7 @@ Example: </strong></span>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.5"></a><p class="title"><b>Table 29. infiniband setting (section)</b></p>
+<a name="id-1.2.8.6.5"></a><p class="title"><b>Table 27. infiniband setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="infiniband setting (section)" border="1">
 <colgroup>
 <col>
@@ -238,7 +238,7 @@ Example: </strong></span>mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.6"></a><p class="title"><b>Table 30. ipv4 setting (section)</b></p>
+<a name="id-1.2.8.6.6"></a><p class="title"><b>Table 28. ipv4 setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="ipv4 setting (section)" border="1">
 <colgroup>
 <col>
@@ -289,7 +289,7 @@ Example: </strong></span>route1=8.8.8.0/24,10.1.1.1,77 route2=7.7.0.0/16</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.7"></a><p class="title"><b>Table 31. ipv6 setting (section)</b></p>
+<a name="id-1.2.8.6.7"></a><p class="title"><b>Table 29. ipv6 setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="ipv6 setting (section)" border="1">
 <colgroup>
 <col>
@@ -340,7 +340,7 @@ Example: </strong></span>route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.8"></a><p class="title"><b>Table 32. serial setting (section)</b></p>
+<a name="id-1.2.8.6.8"></a><p class="title"><b>Table 30. serial setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="serial setting (section)" border="1">
 <colgroup>
 <col>
@@ -365,7 +365,7 @@ Example: </strong></span>parity=n</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.9"></a><p class="title"><b>Table 33. vpn setting (section)</b></p>
+<a name="id-1.2.8.6.9"></a><p class="title"><b>Table 31. vpn setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="vpn setting (section)" border="1">
 <colgroup>
 <col>
@@ -400,7 +400,7 @@ Example: </strong></span>password=Popocatepetl</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.10"></a><p class="title"><b>Table 34. 802-3-ethernet setting (section)</b></p>
+<a name="id-1.2.8.6.10"></a><p class="title"><b>Table 32. 802-3-ethernet setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="802-3-ethernet setting (section)" border="1">
 <colgroup>
 <col>
@@ -439,7 +439,7 @@ Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.6.11"></a><p class="title"><b>Table 35. 802-11-wireless setting (section)</b></p>
+<a name="id-1.2.8.6.11"></a><p class="title"><b>Table 33. 802-11-wireless setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="802-11-wireless setting (section)" border="1">
 <colgroup>
 <col>
@@ -485,29 +485,6 @@ Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 </tbody>
 </table></div>
 </div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.8.6.12"></a><p class="title"><b>Table 36. wpan setting (section)</b></p>
-<div class="table-contents"><table class="table" summary="wpan setting (section)" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Property</th>
-<th>Keyfile Variable</th>
-<th>Format</th>
-<th>Description</th>
-</tr></thead>
-<tbody><tr>
-<td align="left">mac-address</td>
-<td align="left">mac-address</td>
-<td align="left">usual hex-digits-and-colons notation</td>
-<td align="left">MAC address in hex-digits-and-colons notation (e.g. 76:d8:9b:87:66:60:84:ee).</td>
-</tr></tbody>
-</table></div>
-</div>
 <br class="table-break"><div class="refsect2">
 <a name="secrets-flags"></a><h3>Secret flags</h3>
 <p>