summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/interfaces/tunnel.rst2
-rw-r--r--docs/configuration/nat/nptv6.rst12
-rw-r--r--docs/configuration/protocols/bgp.rst3
3 files changed, 9 insertions, 8 deletions
diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst
index 9ea825ac..576c3c55 100644
--- a/docs/configuration/interfaces/tunnel.rst
+++ b/docs/configuration/interfaces/tunnel.rst
@@ -18,7 +18,7 @@ a closer look at the protocols and options currently supported by VyOS.
Common interface configuration
------------------------------
-.. cmdinclude:: /_include/interface-common-without-dhcp.txt
+.. cmdinclude:: /_include/interface-common-without-dhcp1.txt
:var0: tunnel
:var1: tun0
diff --git a/docs/configuration/nat/nptv6.rst b/docs/configuration/nat/nptv6.rst
index c09c8336..cffb2a14 100644
--- a/docs/configuration/nat/nptv6.rst
+++ b/docs/configuration/nat/nptv6.rst
@@ -44,12 +44,12 @@ NPTv6 support has been added in VyOS 1.2 (Crux) and is available through
.. code-block:: none
- set rule 10 source prefix 'fc00:dead:beef::/48'
- set rule 10 outbound-interface 'eth1'
- set rule 10 translation prefix '2001:db8:e1::/48'
- set rule 20 source prefix 'fc00:dead:beef::/48'
- set rule 20 outbound-interface 'eth2'
- set rule 20 translation prefix '2001:db8:e2::/48'
+ set nat nptv6 rule 10 source prefix 'fc00:dead:beef::/48'
+ set nat nptv6 rule 10 outbound-interface 'eth1'
+ set nat nptv6 rule 10 translation prefix '2001:db8:e1::/48'
+ set nat nptv6 rule 20 source prefix 'fc00:dead:beef::/48'
+ set nat nptv6 rule 20 outbound-interface 'eth2'
+ set nat nptv6 rule 20 translation prefix '2001:db8:e2::/48'
Resulting in the following ip6tables rules:
diff --git a/docs/configuration/protocols/bgp.rst b/docs/configuration/protocols/bgp.rst
index 8481f0e2..5b9cb762 100644
--- a/docs/configuration/protocols/bgp.rst
+++ b/docs/configuration/protocols/bgp.rst
@@ -538,7 +538,8 @@ Common parametrs
This command specifies the router-ID. If router ID is not specified it will
use the highest interface IP address.
-.. cfgcmd:: set protocols bgp <asn> maximum-paths <ebgp|ibgp> <number>
+.. cfgcmd:: set protocols bgp <asn> address-family <ipv4-unicast|ipv6-unicast>
+ maximum-paths <ebgp|ibgp> <number>
This command defines the maximum number of parallel routes that
the BGP can support. In order for BGP to use the second path, the