summaryrefslogtreecommitdiff
path: root/docs/configuration/interfaces/tunnel.rst
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-02-26 21:17:18 +0100
committerChristian Breunig <christian@breunig.cc>2023-02-26 21:17:18 +0100
commitf80febaf8c815ac5b73bc865171d618696547520 (patch)
tree6def7cbe0e48664a906543c5f9e867138caf0b9e /docs/configuration/interfaces/tunnel.rst
parente1229bca25d62cd3beb1fc27e348cb8c8e12f15e (diff)
downloadvyos-documentation-f80febaf8c815ac5b73bc865171d618696547520.tar.gz
vyos-documentation-f80febaf8c815ac5b73bc865171d618696547520.zip
Drop interface-common-without-dhcp1.txt which was referenced only once by tunnel
Use full inline code instead of maintaining a weird file with a 1 at the end ;).
Diffstat (limited to 'docs/configuration/interfaces/tunnel.rst')
-rw-r--r--docs/configuration/interfaces/tunnel.rst8
1 files changed, 6 insertions, 2 deletions
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