diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-05-06 17:07:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-06 17:07:43 +0200 |
| commit | 82ecb4c3ecaa1f62163ad7cdd6de5b1623bc6507 (patch) | |
| tree | 36e9dd12653c1d6d8c993f8975c1af5346439089 /man/systemd.network.xml | |
| parent | networkd: move the IAID configuration option into the [DHCP] section (diff) | |
| download | systemd-82ecb4c3ecaa1f62163ad7cdd6de5b1623bc6507.tar.xz systemd-82ecb4c3ecaa1f62163ad7cdd6de5b1623bc6507.zip | |
man: move IPv6 note to the right section
Make the XML validate again.
Diffstat (limited to '')
| -rw-r--r-- | man/systemd.network.xml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 40e40b8308..866a5bf7ae 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -79,6 +79,11 @@ needed. As a special case, an empty file (file size 0) or symlink with the same name pointing to <filename>/dev/null</filename> disables the configuration file entirely (it is "masked").</para> + + <para>Note that an interface without any static IPv6 addresses configured, and neither DHCPv6 nor IPv6LL enabled, + shall be considered to have no IPv6 support. IPv6 will be automatically disabled for that interface by writing "1" + to <filename>/proc/sys/net/ipv6/conf/<replaceable>ifname</replaceable>/disable_ipv6</filename>. + </para> </refsect1> <refsect1> @@ -206,15 +211,6 @@ below 1280 (the minimum MTU for IPv6) it will automatically be increased to this value.</para> </listitem> </varlistentry> - <varlistentry> - <listitem> - <para>Note that an interface without any static IPv6 addresses configured, and neither - DHCPv6 nor IPv6LL enabled, shall be considered to have no IPv6 support. IPv6 will be - automatically disabled for that interface by writing "1" to - <filename>/proc/sys/net/ipv6/conf/<replaceable>ifname</replaceable>/disable_ipv6</filename>. - </para> - </listitem> - </varlistentry> </variablelist> </refsect1> |