New upstream version 1.9.90 upstream/1.9.90

1 files changed, 83 insertions, 23 deletions

diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
index b94c6fbc..ae218265 100644
--- a/docs/api/html/nmcli.html
+++ b/docs/api/html/nmcli.html
@@ -1227,7 +1227,7 @@
 <tr>
 <td align="left">type</td>
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.type">connection.type</a></td>
-<td align="left" valign="top">This option also accepts values of <code class="option">bond-slave</code>,
+<td align="left" valign="top">This alias also accepts values of <code class="option">bond-slave</code>,
 <code class="option">team-slave</code> and <code class="option">bridge-slave</code>. They create
 <code class="option">ethernet</code> connection profiles. Their use is discouraged in
 favor of using a specific type with <code class="option">master</code> option.</td>
@@ -1289,6 +1289,10 @@ or <code class="literal">id/</code> to disambiguate it.</td>
 <td align="left">service</td>
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.pppoe.service">pppoe.service</a></td>
 </tr>
+<tr>
+<td align="left">parent</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.pppoe.parent">pppoe.parent</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1484,10 +1488,10 @@ or <code class="literal">id/</code> to disambiguate it.</td>
 <tr>
 <td align="left">bt-type</td>
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bluetooth.type">bluetooth.type</a></td>
-<td align="left" valign="top">Apart from the usual <code class="literal">dun</code> and
-<code class="literal">panu</code> options, the values of <code class="literal">dun-gsm</code>
-and <code class="literal">dun-cdma</code> can be used for compatibility with older
-versions. They are equivalent to using <code class="literal">dun</code> and setting
+<td align="left" valign="top">Apart from the usual <code class="literal">panu</code>,
+<code class="literal">nap</code> and <code class="literal">dun</code> options, the values of
+<code class="literal">dun-gsm</code> and <code class="literal">dun-cdma</code> can be used for compatibility
+with older versions. They are equivalent to using <code class="literal">dun</code> and setting
 appropriate <code class="literal">gsm.*</code> or <code class="literal">cdma.*</code> properties.</td>
 </tr>
 </tbody>
@@ -1546,7 +1550,7 @@ appropriate <code class="literal">gsm.*</code> or <code class="literal">cdma.*</
 <td align="left">mode</td>
 <td rowspan="8" align="left">bond.options</td>
 <td rowspan="8" align="left" valign="top">Setting each of these adds the option to <code class="literal">bond.options</code> property.
-It's equivalent of using the <code class="literal">+bond.options 'option=value'</code> syntax.</td>
+It's equivalent to the <code class="literal">+bond.options 'option=value'</code> syntax.</td>
 </tr>
 <tr><td align="left">primary</td></tr>
 <tr><td align="left">miimon</td></tr>
@@ -1635,6 +1639,10 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.ageing-time">bridge.ageing-time</a></td>
 </tr>
 <tr>
+<td align="left">group-forward-mask</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.group-forward-mask">bridge.group-forward-mask</a></td>
+</tr>
+<tr>
 <td align="left">multicast-snooping</td>
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.multicast-snooping">bridge.multicast-snooping</a></td>
 </tr>
@@ -1766,7 +1774,46 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.22"></a><p class="title"><b>Table 19. VxLAN options</b></p>
+<a name="id-1.2.4.14.22"></a><p class="title"><b>Table 19. MACsec options</b></p>
+<div class="table-contents"><table class="table" summary="MACsec options" border="1">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Alias</th>
+<th>Property</th>
+</tr></thead>
+<tbody>
+<tr>
+<td align="left">dev</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macsec.parent">macsec.parent</a></td>
+</tr>
+<tr>
+<td align="left">mode</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macsec.mode">macsec.mode</a></td>
+</tr>
+<tr>
+<td align="left">encrypt</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macsec.encrypt">macsec.encrypt</a></td>
+</tr>
+<tr>
+<td align="left">cak</td>
+<td align="left">macsec.cak</td>
+</tr>
+<tr>
+<td align="left">ckn</td>
+<td align="left">macsec.ckn</td>
+</tr>
+<tr>
+<td align="left">port</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macsec.port">macsec.port</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break"><div class="table">
+<a name="id-1.2.4.14.23"></a><p class="title"><b>Table 20. VxLAN options</b></p>
 <div class="table-contents"><table class="table" summary="VxLAN options" border="1">
 <colgroup>
 <col>
@@ -1809,7 +1856,7 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.23"></a><p class="title"><b>Table 20. Tun options</b></p>
+<a name="id-1.2.4.14.24"></a><p class="title"><b>Table 21. Tun options</b></p>
 <div class="table-contents"><table class="table" summary="Tun options" border="1">
 <colgroup>
 <col>
@@ -1848,7 +1895,7 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.24"></a><p class="title"><b>Table 21. IP tunneling options</b></p>
+<a name="id-1.2.4.14.25"></a><p class="title"><b>Table 22. IP tunneling options</b></p>
 <div class="table-contents"><table class="table" summary="IP tunneling options" border="1">
 <colgroup>
 <col>
@@ -1879,7 +1926,7 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.25"></a><p class="title"><b>Table 22. IPv4 options</b></p>
+<a name="id-1.2.4.14.26"></a><p class="title"><b>Table 23. IPv4 options</b></p>
 <div class="table-contents"><table class="table" summary="IPv4 options" border="1">
 <colgroup>
 <col>
@@ -1895,11 +1942,9 @@ It's equivalent of using the <code class="literal">+bond.options 'option=value'<
 <tr>
 <td align="left">ip4</td>
 <td align="left">
-<a class="link" href="nm-settings.html#nm-settings.property.ipv4.addresses">ipv4.addresses</a>
-                            <a class="link" href="nm-settings.html#nm-settings.property.ipv4.method">ipv4.method</a>
+<a class="link" href="nm-settings.html#nm-settings.property.ipv4.addresses">ipv4.addresses</a> <a class="link" href="nm-settings.html#nm-settings.property.ipv4.method">ipv4.method</a>
 </td>
-<td align="left" valign="top">This option can be specified multiple times.
-It's equivalent of using <code class="literal">+ipv4.addresses</code> syntax and setting <code class="literal">ipv4.method</code> to <code class="literal">manual</code>.</td>
+<td align="left" valign="top">The alias is equivalent to the <code class="literal">+ipv4.addresses</code> syntax and also sets <code class="literal">ipv4.method</code> to <code class="literal">manual</code>. It can be specified multiple times.</td>
 </tr>
 <tr>
 <td align="left">gw4</td>
@@ -1910,7 +1955,7 @@ It's equivalent of using <code class="literal">+ipv4.addresses</code> syntax and
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.26"></a><p class="title"><b>Table 23. IPv6 options</b></p>
+<a name="id-1.2.4.14.27"></a><p class="title"><b>Table 24. IPv6 options</b></p>
 <div class="table-contents"><table class="table" summary="IPv6 options" border="1">
 <colgroup>
 <col>
@@ -1926,11 +1971,9 @@ It's equivalent of using <code class="literal">+ipv4.addresses</code> syntax and
 <tr>
 <td align="left">ip6</td>
 <td align="left">
-<a class="link" href="nm-settings.html#nm-settings.property.ipv6.addresses">ipv6.addresses</a>
-                            <a class="link" href="nm-settings.html#nm-settings.property.ipv6.method">ipv6.method</a>
+<a class="link" href="nm-settings.html#nm-settings.property.ipv6.addresses">ipv6.addresses</a> <a class="link" href="nm-settings.html#nm-settings.property.ipv6.method">ipv6.method</a>
 </td>
-<td align="left" valign="top">This option can be specified multiple times.
-It's equivalent of using <code class="literal">+ipv6.addresses</code> syntax and setting <code class="literal">ipv6.method</code> to <code class="literal">manual</code>.</td>
+<td align="left" valign="top">The alias is equivalent to the <code class="literal">+ipv6.addresses</code> syntax and also sets <code class="literal">ipv6.method</code> to <code class="literal">manual</code>. It can be specified multiple times.</td>
 </tr>
 <tr>
 <td align="left">gw6</td>
@@ -1941,7 +1984,7 @@ It's equivalent of using <code class="literal">+ipv6.addresses</code> syntax and
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.4.14.27"></a><p class="title"><b>Table 24. Proxy options</b></p>
+<a name="id-1.2.4.14.28"></a><p class="title"><b>Table 25. Proxy options</b></p>
 <div class="table-contents"><table class="table" summary="Proxy options" border="1">
 <colgroup>
 <col>
@@ -1953,11 +1996,28 @@ It's equivalent of using <code class="literal">+ipv6.addresses</code> syntax and
 <th>Property</th>
 <th>Note</th>
 </tr></thead>
-<tbody><tr>
+<tbody>
+<tr>
+<td align="left">method</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.proxy.method">proxy.method</a></td>
 <td align="left"> </td>
+</tr>
+<tr>
+<td align="left">browser-only</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.proxy.browser-only">proxy.browser-only</a></td>
+<td align="left"> </td>
+</tr>
+<tr>
+<td align="left">pac-url</td>
+<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.proxy.pac-url">proxy.pac-url</a></td>
+<td align="left"> </td>
+</tr>
+<tr>
+<td align="left">pac-script</td>
 <td align="left"><a class="link" href="nm-settings.html#nm-settings.property.proxy.pac-script">proxy.pac-script</a></td>
-<td align="left" valign="top">Read the java script pac-script from file or pass it directly on the command line. Prefix the value with "file://" or "js://" to force one or the other.</td>
-</tr></tbody>
+<td align="left" valign="top">Read the JavaScript PAC (proxy auto-config) script from file or pass it directly on the command line. Prefix the value with "file://" or "js://" to force one or the other.</td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <br class="table-break">