New upstream version 1.25.90 upstream/1.25.90

1 files changed, 12 insertions, 882 deletions

diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
index 9c5099e0..9f808e66 100644
--- a/docs/api/html/nmcli.html
+++ b/docs/api/html/nmcli.html
@@ -483,7 +483,7 @@
 </table></div>
 <p>You can also specify particular fields. For static configuration, use
           setting and property names as described in
-          <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> manual page. For active data use GENERAL, IP4, DHCP4, IP6,
+          <span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span> manual page. For active data use GENERAL, IP4, DHCP4, IP6,
           DHCP6, VPN.</p>
 <p>When no command is given to the <span class="command"><strong>nmcli connection</strong></span>,
           the default action is <span class="command"><strong>nmcli connection show</strong></span>.</p>
@@ -608,9 +608,9 @@
 <p>To set the property just specify the property name followed by the
           value. An empty value (<code class="literal">""</code>) resets the property value to
           the default.</p>
-<p>In addition to the properties, you can also use short names for some of
-          the properties. Consult the <a class="link" href="nmcli.html#property_aliases" title="Property Aliases">Property Aliases</a>
-          section for details.</p>
+<p>See <span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span> for complete reference of setting and property names, their descriptions
+          and default values. The <em class="replaceable"><code>setting</code></em> and
+          <em class="replaceable"><code>property</code></em> can be abbreviated provided they are unique.</p>
 <p>If you want to append an item or a flag to the existing value, use
           <code class="literal">+</code> prefix for the property name or alias. If you want to
           remove items from a container-type or flag property, use <code class="literal">-</code> prefix.
@@ -621,9 +621,6 @@
           These are for example multi-value (container) properties or flags like <code class="literal">ipv4.dns</code>,
           <code class="literal">ip4</code>, <code class="literal">ipv4.addresses</code>, <code class="literal">bond.options</code>,
           <code class="literal">802-1x.phase1-auth-flags</code> etc.</p>
-<p>See <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for complete reference of setting and property names, their descriptions
-          and default values. The <em class="replaceable"><code>setting</code></em> and
-          <em class="replaceable"><code>property</code></em> can be abbreviated provided they are unique.</p>
 <p>The connection is identified by its name, UUID or D-Bus path. If
           <em class="replaceable"><code>ID</code></em> is ambiguous, a keyword <code class="option">id</code>,
           <code class="option">uuid</code> or <code class="option">path</code> can be used.</p>
@@ -650,8 +647,7 @@
 <td>
 <p>Create a new connection using specified properties.</p>
 <p>You need to describe the newly created connections with the property and value pairs.
-          See <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for the complete reference. You can also use the aliases described in
-          <a class="link" href="nmcli.html#property_aliases" title="Property Aliases">Property Aliases</a> section. The syntax is
+          See <span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span> for the complete reference. The syntax is
           the same as of the <span class="command"><strong>nmcli connection modify</strong></span> command.</p>
 <p>To construct a meaningful connection you at the very least need to set the
           <code class="option">connection.type</code> property (or use the <code class="option">type</code> alias)
@@ -745,7 +741,7 @@
 </tbody>
 </table></div>
 <p>See also
-          <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for all NetworkManager settings and property names, and their
+          <span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span> for all NetworkManager settings and property names, and their
           descriptions; and
           <a class="link" href="nmcli-examples.html" title="nmcli-examples"><span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></a>
           for sample editor sessions.</p>
@@ -948,11 +944,8 @@
 <p>Modify the settings currently active on the device.</p>
 <p>This command lets you do temporary changes to a configuration active on
           a particular device. The changes are not preserved in the connection profile.</p>
-<p>See <span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span> for the list of available properties. Please note that some
+<p>See <span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span> for the list of available properties. Please note that some
           properties can't be changed on an already connected device.</p>
-<p>You can also use the aliases described in
-          <a class="link" href="nmcli.html#property_aliases" title="Property Aliases">Property Aliases</a> section. The syntax is
-          the same as of the <span class="command"><strong>nmcli connection modify</strong></span> command.</p>
 </td>
 </tr>
 <tr>
@@ -1242,871 +1235,6 @@
 </table></div>
 </div>
 <div class="refsect1">
-<a name="property_aliases"></a><h2>Property Aliases</h2>
-<p>Apart from the property-value pairs, <span class="command"><strong>connection add</strong></span>,
-    <span class="command"><strong>connection modify</strong></span> and <span class="command"><strong>device modify</strong></span> also
-    accept short forms of some properties. They exist for convenience. Some aliases can
-    affect multiple connection properties at once.</p>
-<p>The overview of the aliases is below. An actual connection type is used to
-   disambiguate these options from the options of the same name that are valid for
-   multiple connection types (such as <code class="option">mtu</code>).</p>
-<div class="table">
-<a name="id-1.2.4.14.4"></a><p class="title"><b>Table 1. Options for all connections</b></p>
-<div class="table-contents"><table class="table" summary="Options for all connections" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody>
-<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 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>
-</tr>
-<tr>
-<td align="left">con-name</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.id">connection.id</a></td>
-<td align="left" valign="top">When not provided a default name is generated: &lt;type&gt;[-&lt;ifname&gt;][-&lt;num&gt;]).</td>
-</tr>
-<tr>
-<td align="left">autoconnect</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.autoconnect">connection.autoconnect</a></td>
-<td align="left"> </td>
-</tr>
-<tr>
-<td align="left">ifname</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.interface-name">connection.interface-name</a></td>
-<td align="left" valign="top">A value of <code class="literal">*</code> will be interpreted as
-no value, making the connection profile interface-independent.
-Note: use quotes around <code class="literal">*</code> to suppress shell expansion.
-For bond, team and bridge connections a default name will be generated if not set.</td>
-</tr>
-<tr>
-<td align="left">master</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.master">connection.master</a></td>
-<td align="left" valign="top">Value specified here will be canonicalized.
-It can be prefixed with <code class="literal">ifname/</code>, <code class="literal">uuid/</code>
-or <code class="literal">id/</code> to disambiguate it.</td>
-</tr>
-<tr>
-<td align="left">slave-type</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.connection.slave-type">connection.slave-type</a></td>
-<td align="left"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.5"></a><p class="title"><b>Table 2. PPPoE options</b></p>
-<div class="table-contents"><table class="table" summary="PPPoE options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">username</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.pppoe.username">pppoe.username</a></td>
-</tr>
-<tr>
-<td align="left">password</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.pppoe.password">pppoe.password</a></td>
-</tr>
-<tr>
-<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>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.6"></a><p class="title"><b>Table 3. Wired Ethernet options</b></p>
-<div class="table-contents"><table class="table" summary="Wired Ethernet options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">mtu</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-3-ethernet.mtu">wired.mtu</a></td>
-</tr>
-<tr>
-<td align="left">mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-3-ethernet.mac-address">wired.mac-address</a></td>
-</tr>
-<tr>
-<td align="left">cloned-mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-3-ethernet.cloned-mac-address">wired.cloned-mac-address</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.7"></a><p class="title"><b>Table 4. Infiniband options</b></p>
-<div class="table-contents"><table class="table" summary="Infiniband options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">mtu</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.infiniband.mtu">infiniband.mtu</a></td>
-</tr>
-<tr>
-<td align="left">mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.infiniband.mac-address">infiniband.mac-address</a></td>
-</tr>
-<tr>
-<td align="left">transport-mode</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.infiniband.transport-mode">infiniband.transport-mode</a></td>
-</tr>
-<tr>
-<td align="left">parent</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.infiniband.parent">infiniband.parent</a></td>
-</tr>
-<tr>
-<td align="left">p-key</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.infiniband.p-key">infiniband.p-key</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.8"></a><p class="title"><b>Table 5. Wi-Fi options</b></p>
-<div class="table-contents"><table class="table" summary="Wi-Fi options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">ssid</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-wireless.ssid">wireless.ssid</a></td>
-</tr>
-<tr>
-<td align="left">mode</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-wireless.mode">wireless.mode</a></td>
-</tr>
-<tr>
-<td align="left">mtu</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-wireless.mtu">wireless.mtu</a></td>
-</tr>
-<tr>
-<td align="left">mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-wireless.mac-address">wireless.mac-address</a></td>
-</tr>
-<tr>
-<td align="left">cloned-mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-wireless.cloned-mac-address">wireless.cloned-mac-address</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.9"></a><p class="title"><b>Table 6. WiMax options</b></p>
-<div class="table-contents"><table class="table" summary="WiMax options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">nsp</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.wimax.network-name">wimax.network-name</a></td>
-</tr>
-<tr>
-<td align="left">mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.wimax.mac-address">wimax.mac-address</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.10"></a><p class="title"><b>Table 7. GSM options</b></p>
-<div class="table-contents"><table class="table" summary="GSM options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">apn</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.gsm.apn">gsm.apn</a></td>
-</tr>
-<tr>
-<td align="left">user</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.gsm.username">gsm.username</a></td>
-</tr>
-<tr>
-<td align="left">password</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.gsm.password">gsm.password</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.11"></a><p class="title"><b>Table 8. CDMA options</b></p>
-<div class="table-contents"><table class="table" summary="CDMA options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">user</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.cdma.username">cdma.username</a></td>
-</tr>
-<tr>
-<td align="left">password</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.cdma.password">cdma.password</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.12"></a><p class="title"><b>Table 9. Bluetooth options</b></p>
-<div class="table-contents"><table class="table" summary="Bluetooth options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">addr</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bluetooth.bdaddr">bluetooth.bdaddr</a></td>
-<td align="left"> </td>
-</tr>
-<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">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>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.13"></a><p class="title"><b>Table 10. VLAN options</b></p>
-<div class="table-contents"><table class="table" summary="VLAN 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.vlan.parent">vlan.parent</a></td>
-</tr>
-<tr>
-<td align="left">id</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vlan.id">vlan.id</a></td>
-</tr>
-<tr>
-<td align="left">flags</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vlan.flags">vlan.flags</a></td>
-</tr>
-<tr>
-<td align="left">ingress</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vlan.ingress-priority-map">vlan.ingress-priority-map</a></td>
-</tr>
-<tr>
-<td align="left">egress</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vlan.egress-priority-map">vlan.egress-priority-map</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.14"></a><p class="title"><b>Table 11. Bonding options</b></p>
-<div class="table-contents"><table class="table" summary="Bonding options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody>
-<tr>
-<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 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>
-<tr><td align="left">downdelay</td></tr>
-<tr><td align="left">updelay</td></tr>
-<tr><td align="left">arp-interval</td></tr>
-<tr><td align="left">arp-ip-target</td></tr>
-<tr><td align="left">lacp-rate</td></tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.15"></a><p class="title"><b>Table 12. Team options</b></p>
-<div class="table-contents"><table class="table" summary="Team options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody><tr>
-<td align="left">config</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.team.config">team.config</a></td>
-<td align="left">Either a filename or a team configuration in JSON format. To enforce one or the other, the value can be prefixed with "file://" or "json://".</td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.16"></a><p class="title"><b>Table 13. Team port options</b></p>
-<div class="table-contents"><table class="table" summary="Team port options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody><tr>
-<td align="left">config</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.team-port.config">team-port.config</a></td>
-<td align="left">Either a filename or a team configuration in JSON format. To enforce one or the other, the value can be prefixed with "file://" or "json://".</td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.17"></a><p class="title"><b>Table 14. Bridge options</b></p>
-<div class="table-contents"><table class="table" summary="Bridge options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">stp</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.stp">bridge.stp</a></td>
-</tr>
-<tr>
-<td align="left">priority</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.priority">bridge.priority</a></td>
-</tr>
-<tr>
-<td align="left">forward-delay</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.forward-delay">bridge.forward-delay</a></td>
-</tr>
-<tr>
-<td align="left">hello-time</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.hello-time">bridge.hello-time</a></td>
-</tr>
-<tr>
-<td align="left">max-age</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.max-age">bridge.max-age</a></td>
-</tr>
-<tr>
-<td align="left">ageing-time</td>
-<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>
-<tr>
-<td align="left">mac</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge.mac-address">bridge.mac-address</a></td>
-</tr>
-<tr>
-<td align="left">priority</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge-port.priority">bridge-port.priority</a></td>
-</tr>
-<tr>
-<td align="left">path-cost</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge-port.path-cost">bridge-port.path-cost</a></td>
-</tr>
-<tr>
-<td align="left">hairpin</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.bridge-port.hairpin-mode">bridge-port.hairpin-mode</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.18"></a><p class="title"><b>Table 15. VPN options</b></p>
-<div class="table-contents"><table class="table" summary="VPN options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">vpn-type</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vpn.service-type">vpn.service-type</a></td>
-</tr>
-<tr>
-<td align="left">user</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vpn.user-name">vpn.user-name</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.19"></a><p class="title"><b>Table 16. OLPC Mesh options</b></p>
-<div class="table-contents"><table class="table" summary="OLPC Mesh options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">ssid</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-olpc-mesh.ssid">olpc-mesh.ssid</a></td>
-</tr>
-<tr>
-<td align="left">channel</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-olpc-mesh.channel">olpc-mesh.channel</a></td>
-</tr>
-<tr>
-<td align="left">dhcp-anycast</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.802-11-olpc-mesh.dhcp-anycast-address">olpc-mesh.dhcp-anycast-address</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.20"></a><p class="title"><b>Table 17. ADSL options</b></p>
-<div class="table-contents"><table class="table" summary="ADSL options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">username</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.adsl.username">adsl.username</a></td>
-</tr>
-<tr>
-<td align="left">protocol</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.adsl.protocol">adsl.protocol</a></td>
-</tr>
-<tr>
-<td align="left">password</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.adsl.password">adsl.password</a></td>
-</tr>
-<tr>
-<td align="left">encapsulation</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.adsl.encapsulation">adsl.encapsulation</a></td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.21"></a><p class="title"><b>Table 18. MACVLAN options</b></p>
-<div class="table-contents"><table class="table" summary="MACVLAN 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.macvlan.parent">macvlan.parent</a></td>
-</tr>
-<tr>
-<td align="left">mode</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macvlan.mode">macvlan.mode</a></td>
-</tr>
-<tr>
-<td align="left">tap</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.macvlan.tap">macvlan.tap</a></td>
-</tr>
-</tbody>
-</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. 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>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">id</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.id">vxlan.id</a></td>
-</tr>
-<tr>
-<td align="left">remote</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.remote">vxlan.remote</a></td>
-</tr>
-<tr>
-<td align="left">dev</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.parent">vxlan.parent</a></td>
-</tr>
-<tr>
-<td align="left">local</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.local">vxlan.local</a></td>
-</tr>
-<tr>
-<td align="left">source-port-min</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.source-port-min">vxlan.source-port-min</a></td>
-</tr>
-<tr>
-<td align="left">source-port-max</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.source-port-max">vxlan.source-port-max</a></td>
-</tr>
-<tr>
-<td align="left">destination-port</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.vxlan.destination-port">vxlan.destination-port</a></td>
-</tr>
-</tbody>
-</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. Tun options</b></p>
-<div class="table-contents"><table class="table" summary="Tun options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">mode</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.mode">tun.mode</a></td>
-</tr>
-<tr>
-<td align="left">owner</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.owner">tun.owner</a></td>
-</tr>
-<tr>
-<td align="left">group</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.group">tun.group</a></td>
-</tr>
-<tr>
-<td align="left">pi</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.pi">tun.pi</a></td>
-</tr>
-<tr>
-<td align="left">vnet-hdr</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.vnet-hdr">tun.vnet-hdr</a></td>
-</tr>
-<tr>
-<td align="left">multi-queue</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.tun.multi-queue">tun.multi-queue</a></td>
-</tr>
-</tbody>
-</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. IP tunneling options</b></p>
-<div class="table-contents"><table class="table" summary="IP tunneling options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">mode</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ip-tunnel.mode">ip-tunnel.mode</a></td>
-</tr>
-<tr>
-<td align="left">local</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ip-tunnel.local">ip-tunnel.local</a></td>
-</tr>
-<tr>
-<td align="left">remote</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ip-tunnel.remote">ip-tunnel.remote</a></td>
-</tr>
-<tr>
-<td align="left">dev</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ip-tunnel.parent">ip-tunnel.parent</a></td>
-</tr>
-</tbody>
-</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. WPAN options</b></p>
-<div class="table-contents"><table class="table" summary="WPAN options" border="1">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-</tr></thead>
-<tbody>
-<tr>
-<td align="left">mac</td>
-<td align="left">wpan.mac</td>
-</tr>
-<tr>
-<td align="left">short-addr</td>
-<td align="left">wpan.short-addr</td>
-</tr>
-<tr>
-<td align="left">pan-id</td>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.wpan.pan-id">wpan.pan-id</a></td>
-</tr>
-</tbody>
-</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. 6LoWPAN options</b></p>
-<div class="table-contents"><table class="table" summary="6LoWPAN 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">6lowpan.parent</td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.28"></a><p class="title"><b>Table 25. IPv4 options</b></p>
-<div class="table-contents"><table class="table" summary="IPv4 options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody>
-<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>
-</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>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ipv4.gateway">ipv4.gateway</a></td>
-<td align="left"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.29"></a><p class="title"><b>Table 26. IPv6 options</b></p>
-<div class="table-contents"><table class="table" summary="IPv6 options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<tbody>
-<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>
-</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>
-<td align="left"><a class="link" href="nm-settings.html#nm-settings.property.ipv6.gateway">ipv6.gateway</a></td>
-<td align="left"> </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.4.14.30"></a><p class="title"><b>Table 27. Proxy options</b></p>
-<div class="table-contents"><table class="table" summary="Proxy options" border="1">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>Alias</th>
-<th>Property</th>
-<th>Note</th>
-</tr></thead>
-<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 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">
-</div>
-<div class="refsect1">
 <a name="colors"></a><h2>Colors</h2>
 <p>Implicit coloring can be disabled by an empty file
     <code class="filename">/etc/terminal-colors.d/nmcli.disable</code>.</p>
@@ -2561,14 +1689,16 @@ It's equivalent to the <code class="literal">+bond.options 'option=value'</code>
 </div>
 <div class="refsect1">
 <a name="see_also"></a><h2>See Also</h2>
-<p><a class="link" href="nmcli-examples.html" title="nmcli-examples"><span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></a>,
+<p>
+    <a class="link" href="nmcli-examples.html" title="nmcli-examples"><span class="citerefentry"><span class="refentrytitle">nmcli-examples</span>(7)</span></a>,
+    <a class="link" href="nm-settings-nmcli.html" title="nm-settings-nmcli"><span class="citerefentry"><span class="refentrytitle">nm-settings-nmcli</span>(5)</span></a>,
     <a class="link" href="nm-online.html" title="nm-online"><span class="citerefentry"><span class="refentrytitle">nm-online</span>(1)</span></a>,
     <a class="link" href="NetworkManager.html" title="NetworkManager"><span class="citerefentry"><span class="refentrytitle">NetworkManager</span>(8)</span></a>,
     <a class="link" href="NetworkManager.conf.html" title="NetworkManager.conf"><span class="citerefentry"><span class="refentrytitle">NetworkManager.conf</span>(5)</span></a>,
-    <a class="link" href="nm-settings.html" title="nm-settings"><span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span></a>,
     <span class="citerefentry"><span class="refentrytitle">nm-applet</span>(1)</span>,
     <span class="citerefentry"><span class="refentrytitle">nm-connection-editor</span>(1)</span>,
-    <span class="citerefentry"><span class="refentrytitle">terminal-colors.d</span>(5)</span>.</p>
+    <span class="citerefentry"><span class="refentrytitle">terminal-colors.d</span>(5)</span>.
+    </p>
 </div>
 </div>
 <div class="footer">