diff options
Diffstat (limited to 'docs/api/html')
| -rw-r--r-- | docs/api/html/NetworkManager.conf.html | 2 | ||||
| -rw-r--r-- | docs/api/html/index.html | 2 | ||||
| -rw-r--r-- | docs/api/html/nm-settings-dbus.html | 2 | ||||
| -rw-r--r-- | docs/api/html/nm-settings-nmcli.html | 6 | ||||
| -rw-r--r-- | docs/api/html/nmcli.html | 5 | ||||
| -rw-r--r-- | docs/api/html/settings-ip-tunnel.html | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index abd47cea..42c5b4b6 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -1182,7 +1182,7 @@ managed=1 <td> <p> Specify the timeout for waiting for carrier in milliseconds. - The default is 5000 milliseconds. + The default is 6000 milliseconds. This setting exists because certain drivers/hardware can take a long time to detect whether the cable is plugged in. </p> diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 7f6ebb52..929c65da 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for NetworkManager 1.44.0 + for NetworkManager 1.44.2 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>. diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index ee13ceaf..9810171f 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -2410,7 +2410,7 @@ When set, the token is used as IPv6 interface identifier instead of the hardware <a name="nm-settings-dbus.property.ip-tunnel.mode"></a>mode</td> <td align="left">uint32</td> <td align="left">0</td> -<td>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</td> +<td>The tunneling mode. Valid values: NM_IP_TUNNEL_MODE_IPIP (1), NM_IP_TUNNEL_MODE_GRE (2), NM_IP_TUNNEL_MODE_SIT (3), NM_IP_TUNNEL_MODE_ISATAP (4), NM_IP_TUNNEL_MODE_VTI (5), NM_IP_TUNNEL_MODE_IP6IP6 (6), NM_IP_TUNNEL_MODE_IPIP6 (7), NM_IP_TUNNEL_MODE_IP6GRE (8), NM_IP_TUNNEL_MODE_VTI6 (9), NM_IP_TUNNEL_MODE_GRETAP (10) and NM_IP_TUNNEL_MODE_IP6GRETAP (11)</td> </tr> <tr> <td align="left"> diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index 9e45cfc6..40cf154e 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -2803,7 +2803,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code> <tr> <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ip-tunnel.encapsulation-limit"></a>ip-tunnel.encapsulation-limit</code></span></p></td> <td> -<p>How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels. To disable this option, add NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1) to ip-tunnel flags.</p> +<p>How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels. To disable this option, add 0x1 (ip6-ign-encap-limit) to ip-tunnel flags.</p> <p> Format: uint32</p> </td> @@ -2811,7 +2811,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code> <tr> <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.ip-tunnel.flags"></a>ip-tunnel.flags</code></span></p></td> <td> -<p>Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.</p> +<p>Tunnel flags. Currently, the following values are supported: 0x1 (ip6-ign-encap-limit), 0x2 (ip6-use-orig-tclass), 0x4 (ip6-use-orig-flowlabel), 0x8 (ip6-mip6-dev), 0x10 (ip6-rcv-dscp-copy) and 0x20 (ip6-use-orig-fwmark). They are valid only for IPv6 tunnels.</p> <p> Format: uint32</p> </td> @@ -2855,7 +2855,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code> <td> <p> Alias: mode</p> -<p>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</p> +<p>The tunneling mode. Valid values: ipip (1), gre (2), sit (3), isatap (4), vti (5), ip6ip6 (6), ipip6 (7), ip6gre (8), vti6 (9), gretap (10) and ip6gretap (11)</p> <p> Format: uint32</p> </td> diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index 8443d500..1672c5dc 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -82,8 +82,9 @@ <span class="citerefentry"><span class="refentrytitle">terminal-colors.d</span>(5)</span>. Please refer to the <a class="link" href="nmcli.html#colors" title="Colors">Colors</a> section for a list of color names supported by <span class="command"><strong>nmcli</strong></span>.</p> -<p>If the environment variable <code class="literal">NO_COLOR</code> is set (to any value), - then coloring is disabled with mode "auto". Explicitly enabling coloring overrides +<p>If the environment variable <code class="literal">NO_COLOR</code> is set (to any non-empty value), + then coloring is disabled with mode "auto". If the environment variable <code class="literal">CLICOLOR_FORCE</code> + is set (to any non-empty value), then coloring is enabled with mode "auto". Explicitly enabling coloring overrides the environment variable.</p> </td> </tr> diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html index a012de37..25615224 100644 --- a/docs/api/html/settings-ip-tunnel.html +++ b/docs/api/html/settings-ip-tunnel.html @@ -93,7 +93,7 @@ <td><pre class="screen">mode</pre></td> <td><pre class="screen">uint32</pre></td> <td><pre class="screen">0</pre></td> -<td>The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).</td> +<td>The tunneling mode. Valid values: NM_IP_TUNNEL_MODE_IPIP (1), NM_IP_TUNNEL_MODE_GRE (2), NM_IP_TUNNEL_MODE_SIT (3), NM_IP_TUNNEL_MODE_ISATAP (4), NM_IP_TUNNEL_MODE_VTI (5), NM_IP_TUNNEL_MODE_IP6IP6 (6), NM_IP_TUNNEL_MODE_IPIP6 (7), NM_IP_TUNNEL_MODE_IP6GRE (8), NM_IP_TUNNEL_MODE_VTI6 (9), NM_IP_TUNNEL_MODE_GRETAP (10) and NM_IP_TUNNEL_MODE_IP6GRETAP (11)</td> </tr> <tr> <td><pre class="screen">mtu</pre></td> |