diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-06-09 21:28:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 21:28:40 +0200 |
| commit | d643a60a9e0be4bea0495f4f1a3792eb2300e48d (patch) | |
| tree | 147dc3dda2b0bb902d76e0c5ead2577b9ac40109 /man/systemd.network.xml | |
| parent | 267fabd2ab3c05e9899e4f238ac090b0d3943739 (diff) | |
| parent | f921f5739e003c5e99cd78cfedab253be884525e (diff) | |
Merge pull request #3456 from poettering/ipv6-ra-rename
networkd: rename IPv6AcceptRouterAdvertisements to IPv6AcceptRA
Diffstat (limited to 'man/systemd.network.xml')
| -rw-r--r-- | man/systemd.network.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 487bb2ab3f..24deb0d1d7 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -240,7 +240,7 @@ By enabling DHCPv6 support explicitly, the DHCPv6 client will be started regardless of the presence of routers on the link, or what flags the routers pass. See - <literal>IPv6AcceptRouterAdvertisements=</literal>.</para> + <literal>IPv6AcceptRA=</literal>.</para> <para>Furthermore, note that by default the domain name specified through DHCP is not used for name resolution. @@ -527,7 +527,7 @@ <literal>no</literal>.</para></listitem> </varlistentry> <varlistentry> - <term><varname>IPv6AcceptRouterAdvertisements=</varname></term> + <term><varname>IPv6AcceptRA=</varname></term> <listitem><para>Enable or disable IPv6 Router Advertisement (RA) reception support for the interface. Takes a boolean parameter. If true, RAs are accepted; if false, RAs are ignored, independently of the local forwarding state. When not set, the kernel default is used, and RAs are accepted only when local forwarding @@ -535,7 +535,7 @@ the relevant flags are set in the RA data, or if no routers are found on the link.</para> <para>Further settings for the IPv6 RA support may be configured in the - <literal>[IPv6AcceptRouterAdvertisements]</literal> section, see below.</para> + <literal>[IPv6AcceptRA]</literal> section, see below.</para> <para>Also see <ulink url="https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt">ip-sysctl.txt</ulink> in the kernel @@ -895,9 +895,9 @@ </refsect1> <refsect1> - <title>[IPv6AcceptRouterAdvertisements] Section Options</title> - <para>The <literal>[IPv6AcceptRouterAdvertisements]</literal> section configures the IPv6 Router Advertisement - (RA) client, if it is enabled with the <varname>IPv6AcceptRouterAdvertisements=</varname> setting described + <title>[IPv6AcceptRA] Section Options</title> + <para>The <literal>[IPv6AcceptRA]</literal> section configures the IPv6 Router Advertisement + (RA) client, if it is enabled with the <varname>IPv6AcceptRA=</varname> setting described above:</para> <variablelist class='network-directives'> |