5 files changed, 86 insertions, 0 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 11d531ece3e06dc68349d8ea1fd3bf39d5d857f
+Subproject 18b2bb669bb87cde14324cbc2ae3a16d11fa578
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 05adb0c5..11d3be91 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,24 @@
    _ext/releasenotes.py
 
 
+2023-11-30
+==========
+
+* :vytask:`T4601` ``(bug): dhcp : relay agent IP address issue.``
+
+
+2023-11-28
+==========
+
+* :vytask:`T5777` ``(bug): frr: backport and upstream recent bgpd daemon crashes``
+
+
+2023-11-27
+==========
+
+* :vytask:`T5763` ``(bug): Fix imprecise check for remote file name in vyos-load-config.py``
+
+
 2023-11-25
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index d22cfb7a..3919ade7 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
    _ext/releasenotes.py
 
 
+2023-12-03
+==========
+
+* :vytask:`T5753` ``(feature): Add VXLAN vnifilter support``
+* :vytask:`T5759` ``(feature): Change VXLAN default MTU to 1500 bytes``
+
+
+2023-11-30
+==========
+
+* :vytask:`T4601` ``(bug): dhcp : relay agent IP address issue.``
+
+
+2023-11-28
+==========
+
+* :vytask:`T4276` ``(bug): IPsec peers dh-group negotiation issue with pfs enabled and multiple proposals configured with IKEv1``
+
+
+2023-11-27
+==========
+
+* :vytask:`T5763` ``(bug): Fix imprecise check for remote file name in vyos-load-config.py``
+* :vytask:`T5783` ``(feature): frr: smoketests must notice any daemon crash``
+
+
 2023-11-26
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index e24aca9a..00f105e6 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,20 @@
    _ext/releasenotes.py
 
 
+2023-12-03
+==========
+
+* :vytask:`T5753` ``(feature): Add VXLAN vnifilter support``
+* :vytask:`T5759` ``(feature): Change VXLAN default MTU to 1500 bytes``
+
+
+2023-11-27
+==========
+
+* :vytask:`T5763` ``(bug): Fix imprecise check for remote file name in vyos-load-config.py``
+* :vytask:`T5783` ``(feature): frr: smoketests must notice any daemon crash``
+
+
 2023-11-26
 ==========
 
diff --git a/docs/configuration/protocols/isis.rst b/docs/configuration/protocols/isis.rst
index 18a7c166..1f779d0a 100644
--- a/docs/configuration/protocols/isis.rst
+++ b/docs/configuration/protocols/isis.rst
@@ -302,6 +302,34 @@ Timers
   control the timing of the execution of SPF calculations in response
   to IGP events. The process described in :rfc:`8405`.
 
+Loop Free Alternate (LFA)
+-------------------------
+
+.. cfgcmd:: set protocols isis fast-reroute lfa remote prefix-list <name>
+  <level-1|level-2>
+
+  This command enables IP fast re-routing that is part of :rfc:`5286`.
+  Specifically this is a prefix list which references a prefix in which
+  will select eligible PQ nodes for remote LFA backups. 
+
+.. cfgcmd:: set protocols isis fast-reroute lfa local load-sharing disable
+  <level-1|level-2>
+
+  This command disables the load sharing across multiple LFA backups.
+
+.. cfgcmd:: set protocols isis fast-reroute lfa local tiebreaker
+  <downstream|lowest-backup-metric|node-protecting> index <number>
+  <level-1|level-2>
+
+  This command will configure a tie-breaker for multiple local LFA backups.
+  The lower index numbers will be processed first.
+  
+.. cfgcmd:: set protocols isis fast-reroute lfa local priority-limit
+  <medium|high|critical> <level-1|level-2>
+  
+  This command will limit LFA backup computation up to the specified
+  prefix priority. 
+
 
 ********
 Examples