diff options
| -rw-r--r-- | docs/_include/interface-common-without-dhcp1.txt | 7 | ||||
| -rw-r--r-- | docs/configuration/interfaces/tunnel.rst | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/docs/_include/interface-common-without-dhcp1.txt b/docs/_include/interface-common-without-dhcp1.txt deleted file mode 100644 index 60ac951d..00000000 --- a/docs/_include/interface-common-without-dhcp1.txt +++ /dev/null @@ -1,7 +0,0 @@ -.. cmdinclude:: /_include/interface-address.txt - :var0: {{ var0 }} - :var1: {{ var1 }} - -.. cmdinclude:: /_include/interface-common-without-mac.txt - :var0: {{ var0 }} - :var1: {{ var1 }} diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst index bd7a8460..31539d9f 100644 --- a/docs/configuration/interfaces/tunnel.rst +++ b/docs/configuration/interfaces/tunnel.rst @@ -18,7 +18,11 @@ a closer look at the protocols and options currently supported by VyOS. Common interface configuration ------------------------------ -.. cmdinclude:: /_include/interface-common-without-dhcp1.txt +.. cmdinclude:: /_include/interface-address.txt + :var0: tunnel + :var1: tun0 + +.. cmdinclude:: /_include/interface-common-without-mac.txt :var0: tunnel :var1: tun0 @@ -207,7 +211,7 @@ GRETAP ^^^^^^^ While normal GRE is for layer 3, GRETAP is for layer 2. GRETAP can encapsulate -Ethernet frames, thus it can be bridged with other interfaces to create +Ethernet frames, thus it can be bridged with other interfaces to create datalink layer segments that span multiple remote sites. .. code-block:: none |