about summary refs log tree commit diff
path: root/docs/api/html/nm-settings-ifcfg-rh.html
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-01-07 16:43:07 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-01-07 16:43:07 +0100
commita524db35ac5c2099671d16318524e277e88631be (patch)
tree54b29c42a317b9a13c3049ff85b14f7dce734cf6 /docs/api/html/nm-settings-ifcfg-rh.html
parent6917e28d2d16138d6d497dc96efafe573b4b0979 (diff)
parent724bcc5c7be3aed3646ed2b2989c34d438217176 (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream
Diffstat (limited to 'docs/api/html/nm-settings-ifcfg-rh.html')
-rw-r--r--docs/api/html/nm-settings-ifcfg-rh.html10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index e05ad396..8921a324 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -562,6 +562,12 @@ Example: </strong></span>IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12</td>
 <td align="left">0</td>
 <td align="left">Timeout in seconds for the 802.1X authentication. Zero means the global default or 25.</td>
 </tr>
+<tr>
+<td align="left">optional</td>
+<td align="left">IEEE_8021X_OPTIONAL<span class="emphasis"><em>(+)</em></span> default=no</td>
+<td align="left"> </td>
+<td align="left">whether the 802.1X authentication is optional</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1408,7 +1414,9 @@ Example: </strong></span>IPV6_DEFAULTGW=abbe::1</td>
 <td align="left">never-default</td>
 <td align="left">IPV6_DEFROUTE<span class="emphasis"><em>(+)</em></span>, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)</td>
 <td align="left">IPV6_DEFROUTE=yes (when no variable specified)</td>
-<td align="left">IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.</td>
+<td align="left">IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.<span class="bold"><strong>
+
+Example: </strong></span>DHCPV6_HOSTNAME_FLAGS=5 */ </td>
 </tr>
 <tr>
 <td align="left">may-fail</td>