summaryrefslogtreecommitdiff
path: root/docs/_include
diff options
context:
space:
mode:
Diffstat (limited to 'docs/_include')
-rw-r--r--docs/_include/common-references.txt2
-rw-r--r--docs/_include/interface-address-with-dhcp.txt8
-rw-r--r--docs/_include/interface-common-without-dhcp1.txt7
m---------docs/_include/vyos-1x0
4 files changed, 9 insertions, 8 deletions
diff --git a/docs/_include/common-references.txt b/docs/_include/common-references.txt
index a921ec67..2e3f934a 100644
--- a/docs/_include/common-references.txt
+++ b/docs/_include/common-references.txt
@@ -2,7 +2,7 @@
.. _`accel-ppp`: https://accel-ppp.org/
.. _`Secure Socket Tunneling Protocol`: https://en.wikipedia.org/wiki/Secure_Socket_Tunneling_Protocol
-.. _Phabricator: https://phabricator.vyos.net/
+.. _Phabricator: https://vyos.dev/
.. _802.1ad: https://en.wikipedia.org/wiki/IEEE_802.1ad
.. _802.1q: https://en.wikipedia.org/wiki/IEEE_802.1Q
.. _`VyOS CI`: https://ci.vyos.net
diff --git a/docs/_include/interface-address-with-dhcp.txt b/docs/_include/interface-address-with-dhcp.txt
index de51a887..d454d051 100644
--- a/docs/_include/interface-address-with-dhcp.txt
+++ b/docs/_include/interface-address-with-dhcp.txt
@@ -11,6 +11,14 @@
* **dhcpv6** interface address is received by DHCPv6 from a DHCPv6
server on this segment.
+ .. note:: When using DHCP to retrieve IPv4 address and if local
+ customizations are needed, they should be possible using the enter and
+ exit hooks provided. The hook dirs are:
+
+ * ``/config/scripts/dhcp-client/pre-hooks.d/``
+ * ``/config/scripts/dhcp-client/post-hooks.d/``
+
+
Example:
.. code-block:: none
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/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject a0d3c5702dfcf0ac0008039357a2e0e02c62523
+Subproject f5d40cf3cf8b29a289da31bb3f0368fcfaeae3c