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

network-manager Debian release 1.42.4-1

1 files changed, 100 insertions, 100 deletions

diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index 69bb333c..12b405b1 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -189,7 +189,93 @@ id=4
 <tr><td>802-11-wireless-security  =  wifi-security</td></tr>
 </table>
 <div class="table">
-<a name="id-1.2.11.6.4"></a><p class="title"><b>Table 1. bridge setting (section)</b></p>
+<a name="id-1.2.11.6.4"></a><p class="title"><b>Table 1. 802-11-wireless setting (section)</b></p>
+<div class="table-contents"><table class="table" summary="802-11-wireless 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">ssid</td>
+<td align="left"> </td>
+<td align="left">string (or decimal-byte list - obsolete)</td>
+<td align="left">SSID of Wi-Fi network.<span class="bold"><strong>
+
+Example: </strong></span>ssid=Quick Net</td>
+</tr>
+<tr>
+<td align="left">mac-address</td>
+<td align="left"> </td>
+<td align="left">usual hex-digits-and-colons notation</td>
+<td align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</td>
+</tr>
+<tr>
+<td align="left">cloned-mac-address</td>
+<td align="left"> </td>
+<td align="left">usual hex-digits-and-colons notation</td>
+<td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
+</tr>
+<tr>
+<td align="left">mac-address-blacklist</td>
+<td align="left"> </td>
+<td align="left">list of MACs (separated with semicolons)</td>
+<td align="left">MAC address blacklist.<span class="bold"><strong>
+
+Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break"><div class="table">
+<a name="id-1.2.11.6.5"></a><p class="title"><b>Table 2. 802-3-ethernet setting (section)</b></p>
+<div class="table-contents"><table class="table" summary="802-3-ethernet 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"> </td>
+<td align="left">usual hex-digits-and-colons notation</td>
+<td align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)</td>
+</tr>
+<tr>
+<td align="left">cloned-mac-address</td>
+<td align="left"> </td>
+<td align="left">usual hex-digits-and-colons notation</td>
+<td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
+</tr>
+<tr>
+<td align="left">mac-address-blacklist</td>
+<td align="left"> </td>
+<td align="left">list of MACs (separated with semicolons)</td>
+<td align="left">MAC address blacklist.<span class="bold"><strong>
+
+Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break"><div class="table">
+<a name="id-1.2.11.6.6"></a><p class="title"><b>Table 3. bridge setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="bridge setting (section)" border="1">
 <colgroup>
 <col>
@@ -205,7 +291,7 @@ id=4
 </tr></thead>
 <tbody><tr>
 <td align="left">mac-address</td>
-<td align="left">mac-address</td>
+<td align="left"> </td>
 <td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete)<span class="bold"><strong>
 
@@ -214,7 +300,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.11.6.5"></a><p class="title"><b>Table 2. infiniband setting (section)</b></p>
+<a name="id-1.2.11.6.7"></a><p class="title"><b>Table 4. infiniband setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="infiniband setting (section)" border="1">
 <colgroup>
 <col>
@@ -230,7 +316,7 @@ Example: </strong></span>mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;1
 </tr></thead>
 <tbody><tr>
 <td align="left">mac-address</td>
-<td align="left">mac-address</td>
+<td align="left"> </td>
 <td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete)<span class="bold"><strong>
 
@@ -239,7 +325,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.11.6.6"></a><p class="title"><b>Table 3. ipv4 setting (section)</b></p>
+<a name="id-1.2.11.6.8"></a><p class="title"><b>Table 5. ipv4 setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="ipv4 setting (section)" border="1">
 <colgroup>
 <col>
@@ -256,7 +342,7 @@ Example: </strong></span>mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:
 <tbody>
 <tr>
 <td align="left">dns</td>
-<td align="left">dns</td>
+<td align="left"> </td>
 <td align="left">list of DNS IP addresses</td>
 <td align="left">List of DNS servers.<span class="bold"><strong>
 
@@ -290,7 +376,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.11.6.7"></a><p class="title"><b>Table 4. ipv6 setting (section)</b></p>
+<a name="id-1.2.11.6.9"></a><p class="title"><b>Table 6. ipv6 setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="ipv6 setting (section)" border="1">
 <colgroup>
 <col>
@@ -307,7 +393,7 @@ Example: </strong></span>route1=8.8.8.0/24,10.1.1.1,77 route2=7.7.0.0/16</td>
 <tbody>
 <tr>
 <td align="left">dns</td>
-<td align="left">dns</td>
+<td align="left"> </td>
 <td align="left">list of DNS IP addresses</td>
 <td align="left">List of DNS servers.<span class="bold"><strong>
 
@@ -341,7 +427,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.11.6.8"></a><p class="title"><b>Table 5. serial setting (section)</b></p>
+<a name="id-1.2.11.6.10"></a><p class="title"><b>Table 7. serial setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="serial setting (section)" border="1">
 <colgroup>
 <col>
@@ -357,7 +443,7 @@ Example: </strong></span>route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11
 </tr></thead>
 <tbody><tr>
 <td align="left">parity</td>
-<td align="left">parity</td>
+<td align="left"> </td>
 <td align="left">'e', 'o', or 'n'</td>
 <td align="left">The connection parity; even, odd, or none. Note that older versions of NetworkManager stored this as an integer: 69 ('E') for even, 111 ('o') for odd, or 110 ('n') for none.<span class="bold"><strong>
 
@@ -366,7 +452,7 @@ Example: </strong></span>parity=n</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.11.6.9"></a><p class="title"><b>Table 6. vpn setting (section)</b></p>
+<a name="id-1.2.11.6.11"></a><p class="title"><b>Table 8. vpn setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="vpn setting (section)" border="1">
 <colgroup>
 <col>
@@ -401,7 +487,7 @@ Example: </strong></span>password=Popocatepetl</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.11.6.10"></a><p class="title"><b>Table 7. wifi-p2p setting (section)</b></p>
+<a name="id-1.2.11.6.12"></a><p class="title"><b>Table 9. wifi-p2p setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="wifi-p2p setting (section)" border="1">
 <colgroup>
 <col>
@@ -417,99 +503,13 @@ Example: </strong></span>password=Popocatepetl</td>
 </tr></thead>
 <tbody><tr>
 <td align="left">peer</td>
-<td align="left">peer</td>
+<td align="left"> </td>
 <td align="left">usual hex-digits-and-colons notation</td>
 <td align="left">MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</td>
 </tr></tbody>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.11.6.11"></a><p class="title"><b>Table 8. 802-3-ethernet setting (section)</b></p>
-<div class="table-contents"><table class="table" summary="802-3-ethernet 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 traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)</td>
-</tr>
-<tr>
-<td align="left">cloned-mac-address</td>
-<td align="left">cloned-mac-address</td>
-<td align="left">usual hex-digits-and-colons notation</td>
-<td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
-</tr>
-<tr>
-<td align="left">mac-address-blacklist</td>
-<td align="left">mac-address-blacklist</td>
-<td align="left">list of MACs (separated with semicolons)</td>
-<td align="left">MAC address blacklist.<span class="bold"><strong>
-
-Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.11.6.12"></a><p class="title"><b>Table 9. 802-11-wireless setting (section)</b></p>
-<div class="table-contents"><table class="table" summary="802-11-wireless 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">ssid</td>
-<td align="left">ssid</td>
-<td align="left">string (or decimal-byte list - obsolete)</td>
-<td align="left">SSID of Wi-Fi network.<span class="bold"><strong>
-
-Example: </strong></span>ssid=Quick Net</td>
-</tr>
-<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 traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).</td>
-</tr>
-<tr>
-<td align="left">cloned-mac-address</td>
-<td align="left">cloned-mac-address</td>
-<td align="left">usual hex-digits-and-colons notation</td>
-<td align="left">Cloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).</td>
-</tr>
-<tr>
-<td align="left">mac-address-blacklist</td>
-<td align="left">mac-address-blacklist</td>
-<td align="left">list of MACs (separated with semicolons)</td>
-<td align="left">MAC address blacklist.<span class="bold"><strong>
-
-Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
 <a name="id-1.2.11.6.13"></a><p class="title"><b>Table 10. wpan setting (section)</b></p>
 <div class="table-contents"><table class="table" summary="wpan setting (section)" border="1">
 <colgroup>
@@ -526,7 +526,7 @@ Example: </strong></span>mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 </tr></thead>
 <tbody><tr>
 <td align="left">mac-address</td>
-<td align="left">mac-address</td>
+<td align="left"> </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>