8 files changed, 87 insertions, 6 deletions
diff --git a/docs/404.rst b/docs/404.rst
index 5073773a..2ae79f2e 100644
--- a/docs/404.rst
+++ b/docs/404.rst
@@ -8,4 +8,5 @@ Try using the search box or go to the release homepage:
 
   * `1.2.x (crux) <https://docs.vyos.io/en/crux/>`_
   * `1.3.x (equuleus) <https://docs.vyos.io/en/equuleus/>`_
-  * `rolling release (sagitta) <https://docs.vyos.io/en/latest/>`_
+  * `1.4.x (sagitta) <https://docs.vyos.io/en/sagitta/>`_
+  * `rolling release (circinus) <https://docs.vyos.io/en/latest/>`_
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject fd9e2c24e739fd327f860c45fa00241fd1acca7
+Subproject 9f92b9ff69477fa93a87f49666a1f7b79949d58
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index e7ede58c..6cb68508 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -1,5 +1,5 @@
 {% extends "!layout.html" %}
-{%- set current_version = "1.4.x sagitta" %}
+{%- set current_version = "1.5.x circinus" %}
 {% block extrahead %}
     <link href="{{ pathto("_static/css/custom.css", True) }}" rel="stylesheet" type="text/css">
     <link href="{{ pathto("_static/css/datatables.css", True) }}" rel="stylesheet" type="text/css">
diff --git a/docs/automation/command-scripting.rst b/docs/automation/command-scripting.rst
index 64564e5a..c8a72a36 100644
--- a/docs/automation/command-scripting.rst
+++ b/docs/automation/command-scripting.rst
@@ -94,7 +94,7 @@ Here is a simple example:
   #!/bin/vbash
   source /opt/vyatta/etc/functions/script-template
   configure
-  source < /config/scripts/setfirewallgroup.py
+  source <(/config/scripts/setfirewallgroup.py)
   commit
 
 
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index c5192eab..a5fafa98 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,18 @@
    _ext/releasenotes.py
 
 
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T4269` ``(feature): node.def generator should automatically add default values``
+
+
 2023-10-26
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 86b201df..9210e40f 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,41 @@
    _ext/releasenotes.py
 
 
+2023-11-10
+==========
+
+* :vytask:`T5727` ``(bug): validator: Use native URL validator instead of regex-based validator``
+
+
+2023-11-08
+==========
+
+* :vytask:`T5720` ``(bug): PPPoE-server adding new interface does not work``
+* :vytask:`T5716` ``(bug): PPPoE-server shaper template bug down-limiter option does not rely on fwmark``
+* :vytask:`T5702` ``(feature): Add ability to set include_ifmib_iface_prefix and ifmib_max_num_ifaces  for SNMP``
+* :vytask:`T5648` ``(bug): ldpd neighbour template errors``
+* :vytask:`T5564` ``(bug): Both show firewall group and show firewall summary fails``
+* :vytask:`T5559` ``(feature): Selective proxy-arp/proxy-ndp when doing SNAT/DNAT``
+* :vytask:`T5541` ``(bug): Zone-Based Firewalling in VyOS Sagitta 1.4``
+* :vytask:`T5513` ``(bug): Anomalies in show firewall command after refactoring``
+* :vytask:`T4864` ``(bug): `show firewall` command errors``
+
+
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T5705` ``(bug): rsyslog - Not working when using facility=all``
+* :vytask:`T5704` ``(feature): PPPoE-server add max-starting option``
+* :vytask:`T5707` ``(bug): Wireguard peer public key update leaves redundant peers and breaks connectivity``
+* :vytask:`T4269` ``(feature): node.def generator should automatically add default values``
+
+
 2023-11-05
 ==========
 
diff --git a/docs/changelog/1.5.rst b/docs/changelog/1.5.rst
index 3cb54a85..5d550447 100644
--- a/docs/changelog/1.5.rst
+++ b/docs/changelog/1.5.rst
@@ -8,6 +8,39 @@
    _ext/releasenotes.py
 
 
+2023-11-10
+==========
+
+* :vytask:`T5727` ``(bug): validator: Use native URL validator instead of regex-based validator``
+
+
+2023-11-08
+==========
+
+* :vytask:`T5720` ``(bug): PPPoE-server adding new interface does not work``
+* :vytask:`T5716` ``(bug): PPPoE-server shaper template bug down-limiter option does not rely on fwmark``
+* :vytask:`T5702` ``(feature): Add ability to set include_ifmib_iface_prefix and ifmib_max_num_ifaces  for SNMP``
+* :vytask:`T5693` ``(feature): Adding variable vyos_persistence_dir (and improve variable vyos_rootfs_dir)``
+* :vytask:`T5648` ``(bug): ldpd neighbour template errors``
+* :vytask:`T5564` ``(bug): Both show firewall group and show firewall summary fails``
+* :vytask:`T5559` ``(feature): Selective proxy-arp/proxy-ndp when doing SNAT/DNAT``
+* :vytask:`T5541` ``(bug): Zone-Based Firewalling in VyOS Sagitta 1.4``
+
+
+2023-11-07
+==========
+
+* :vytask:`T5586` ``(feature): Disable by default SNMP for Keepalived VRRP``
+
+
+2023-11-06
+==========
+
+* :vytask:`T5705` ``(bug): rsyslog - Not working when using facility=all``
+* :vytask:`T5704` ``(feature): PPPoE-server add max-starting option``
+* :vytask:`T5707` ``(bug): Wireguard peer public key update leaves redundant peers and breaks connectivity``
+
+
 2023-11-03
 ==========
 
diff --git a/docs/conf.py b/docs/conf.py
index 4807472e..3fe1c6e1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,14 +22,14 @@ from docutils.parsers.rst.roles import set_classes
 # -- Project information -----------------------------------------------------
 
 project = u'VyOS'
-copyright = u'2021, VyOS maintainers and contributors'
+copyright = u'2023, VyOS maintainers and contributors'
 author = u'VyOS maintainers and contributors'
 
 # The short X.Y version
-version = u'1.4'
+version = u'1.5'
 
 # The full version, including alpha/beta/rc tags
-release = u'1.4.x (sagitta)'
+release = u'1.5.x (circinus)'
 
 # -- General configuration ---------------------------------------------------