summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrebortg <github@ghlr.de>2020-12-08 15:12:56 +0100
committerrebortg <github@ghlr.de>2020-12-08 15:12:56 +0100
commitb8a2fd5e578f200928a457b9f967ed92619bda88 (patch)
treee580965b5201e581678f1f6da06313f973353d53
parentf6c43343bbea7c98b6e735f5204da1759343ca23 (diff)
downloadvyos-documentation-b8a2fd5e578f200928a457b9f967ed92619bda88.tar.gz
vyos-documentation-b8a2fd5e578f200928a457b9f967ed92619bda88.zip
fix build error after merge
-rw-r--r--docs/_include/interface-common-with-dhcp.txt2
-rw-r--r--docs/_include/interface-common.txt4
-rw-r--r--docs/_include/interface-vlan-8021ad.txt8
-rw-r--r--docs/_include/interface-vlan-8021q.txt8
-rw-r--r--docs/configuration/protocols/index.rst2
-rw-r--r--docs/configuration/protocols/isis.rst2
-rw-r--r--docs/contributing/documentation.rst2
7 files changed, 14 insertions, 14 deletions
diff --git a/docs/_include/interface-common-with-dhcp.txt b/docs/_include/interface-common-with-dhcp.txt
index 46dddb9b..47b4796f 100644
--- a/docs/_include/interface-common-with-dhcp.txt
+++ b/docs/_include/interface-common-with-dhcp.txt
@@ -16,6 +16,6 @@
:var0: {{ var0 }}
:var1: {{ var1 }}
-.. cmdinclude:: ../_include/interface-dhcpv6-prefix-delegation.txt
+.. cmdinclude:: /_include/interface-dhcpv6-prefix-delegation.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
diff --git a/docs/_include/interface-common.txt b/docs/_include/interface-common.txt
index 79269fe3..5a997482 100644
--- a/docs/_include/interface-common.txt
+++ b/docs/_include/interface-common.txt
@@ -22,11 +22,11 @@
:var0: {{ var0 }}
:var1: {{ var1 }}
-.. cmdinclude:: ../_include/interface-ip.txt
+.. cmdinclude:: /_include/interface-ip.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
-.. cmdinclude:: ../_include/interface-ipv6.txt
+.. cmdinclude:: /_include/interface-ipv6.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
diff --git a/docs/_include/interface-vlan-8021ad.txt b/docs/_include/interface-vlan-8021ad.txt
index 6a34786f..0a1722dc 100644
--- a/docs/_include/interface-vlan-8021ad.txt
+++ b/docs/_include/interface-vlan-8021ad.txt
@@ -88,7 +88,7 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG
:var6: <vlan-id>
:var7: 20
-.. cmdinclude:: ../_include/interface-ip.txt
+.. cmdinclude:: /_include/interface-ip.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif-s
@@ -98,7 +98,7 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG
:var6: <vlan-id>
:var7: 20
-.. cmdinclude:: ../_include/interface-ipv6.txt
+.. cmdinclude:: /_include/interface-ipv6.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif-s
@@ -140,7 +140,7 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG
:var6: <vlan-id>
:var7: 20
-.. cmdinclude:: ../_include/interface-dhcpv6-prefix-delegation.txt
+.. cmdinclude:: /_include/interface-dhcpv6-prefix-delegation.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif-s
@@ -150,4 +150,4 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG
:var6: <vlan-id>
:var7: 20
-.. include:: ../common-references.rst
+.. include:: /_include/common-references.txt
diff --git a/docs/_include/interface-vlan-8021q.txt b/docs/_include/interface-vlan-8021q.txt
index e4ed9db0..63f4433f 100644
--- a/docs/_include/interface-vlan-8021q.txt
+++ b/docs/_include/interface-vlan-8021q.txt
@@ -71,14 +71,14 @@ term used for this is ``vif``.
:var3: <vlan-id>
:var4: 10
-.. cmdinclude:: ../_include/interface-ip.txt
+.. cmdinclude:: /_include/interface-ip.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif
:var3: <vlan-id>
:var4: 10
-.. cmdinclude:: ../_include/interface-ipv6.txt
+.. cmdinclude:: /_include/interface-ipv6.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif
@@ -108,11 +108,11 @@ term used for this is ``vif``.
:var3: <vlan-id>
:var4: 10
-.. cmdinclude:: ../_include/interface-dhcpv6-prefix-delegation.txt
+.. cmdinclude:: /_include/interface-dhcpv6-prefix-delegation.txt
:var0: {{ var0 }}
:var1: {{ var1 }}
:var2: vif
:var3: <vlan-id>
:var4: 10
-.. include:: ../common-references.rst
+.. include:: /_include/common-references.txt
diff --git a/docs/configuration/protocols/index.rst b/docs/configuration/protocols/index.rst
index 819db4df..8ef35b5d 100644
--- a/docs/configuration/protocols/index.rst
+++ b/docs/configuration/protocols/index.rst
@@ -11,7 +11,7 @@ Protocols
bgp
igmp
igmp-proxy
- is-is
+ isis
mpls
ospf
ospfv3
diff --git a/docs/configuration/protocols/isis.rst b/docs/configuration/protocols/isis.rst
index 807dca83..64cc2535 100644
--- a/docs/configuration/protocols/isis.rst
+++ b/docs/configuration/protocols/isis.rst
@@ -1,4 +1,4 @@
-.. include:: ../_include/need_improvement.txt
+.. include:: /_include/need_improvement.txt
.. _isis:
diff --git a/docs/contributing/documentation.rst b/docs/contributing/documentation.rst
index 1766d6ca..ddd21396 100644
--- a/docs/contributing/documentation.rst
+++ b/docs/contributing/documentation.rst
@@ -213,7 +213,7 @@ file and replace the ``{{ var0 }}`` - ``{{ var9 }}`` with the correct value
.. code-block:: none
- .. cmdinclude:: interface-address.txt
+ .. cmdinclude:: /_include/interface-address.txt
:var0: ethernet
:var1: eth1