3 files changed, 160 insertions, 11 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 0284d6796298bca0b06385ef9e8dd7565a7551b
+Subproject 0dd9037036c6b4909bfcb10c50b587a4456a9c2
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index ec00a1e3..225eba65 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,91 @@
    _ext/releasenotes.py
 
 
+2021-08-15
+==========
+
+* :vytask:`T3756` (default): VyOS generates invalid QR code for wireguard clients
+* :vytask:`T3275` (default): Disable conntrack helpers by default
+
+
+2021-08-14
+==========
+
+* :vytask:`T3745` (feature): op-mode IPSec show vpn ipse sa sorting
+* :vytask:`T1083` (feature): Implement "--persistent" option to NAT rules
+* :vytask:`T521` (bug): Network services may fail if vyatta-router.service startup takes longer than a few seconds
+
+
+2021-08-13
+==========
+
+* :vytask:`T3740` (bug): HTTPs API breaks when the address is IPv6
+* :vytask:`T3734` (bug): Move EVPN VRF up in FRR config
+
+
+2021-08-12
+==========
+
+* :vytask:`T3731` (bug): verify_accel_ppp_base_service return wrong config error for SSP
+* :vytask:`T3405` (feature): PPPoE server unit-cache
+* :vytask:`T2432` (default): dhcpd: Can't create new lease file: Permission denied
+* :vytask:`T3746` (feature): Inform users logging into the system about a pending reboot
+* :vytask:`T3744` (default): Dns forwarding statistics formatting missing a new line
+
+
+2021-08-10
+==========
+
+* :vytask:`T3730` (bug): op-mode conntrack-sync miss some functions
+
+
+2021-08-09
+==========
+
+* :vytask:`T1501` (bug): VPN Commit Errors
+
+
+2021-08-08
+==========
+
+* :vytask:`T2027` (bug): get_config_dict is failing when the configuration section is empty/missing
+* :vytask:`T169` (feature): Image install should put correct serial console device in created grub menuentry
+
+
+2021-08-07
+==========
+
+* :vytask:`T548` (feature): BGP IPv6 multipath support
+
+
+2021-08-06
+==========
+
+* :vytask:`T3196` (bug): No NAT translations showing up
+* :vytask:`T1153` (bug): VyOS 1.2.0RC10, RAID-1, fresh install, unable to save config
+
+
+2021-08-05
+==========
+
+* :vytask:`T696` (feature): Rewrite conntrack  sync to XML
+
+
+2021-08-04
+==========
+
+* :vytask:`T3704` (feature): Add ability to interact with Areca RAID adapers
+* :vytask:`T320` (default): ospf does not redistribute connected routes associated with virtuan tunnel interfaces
+
+
+2021-08-02
+==========
+
+* :vytask:`T2623` (bug): Creating sit tunnel fails with “Can not set “local” for tunnel sit tun1 at tunnel creation”
+* :vytask:`T2161` (default): snmpd cannot start if ipv6 disabled
+* :vytask:`T3601` (default): Error in ssh keys for vmware cloud-init if ssh keys is left empty.
+
+
 2021-08-01
 ==========
 
@@ -129,12 +214,6 @@
 * :vytask:`T3632` (bug): policy: route-map: unable to configure route-target / site-of-origin
 
 
-2021-06-18
-==========
-
-* :vytask:`T3634` (feature): Add op command option for ping for do not fragment bit to be set
-
-
 2021-06-17
 ==========
 
@@ -672,7 +751,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.135 / 5.10.53
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.140 / 5.10.58
 
 
 2021-02-14
@@ -1757,7 +1836,6 @@
 * :vytask:`T1486` (bug): Unknown LLDP version reported to peers
 * :vytask:`T1414` (enhancment):  equuleus: buster: 10-unmountfs.chroot fail under apply
 * :vytask:`T1076` (bug): SSH: make configuration (sshd_config) volatile and store it to /run
-* :vytask:`T770` (bug): Bonded interfaces get updated with incorrect hw-id in config.
 * :vytask:`T2724` (feature): Support for IPv6 Toolset
 * :vytask:`T2323` (bug): LLDP: "show lldp neighbors detail" returns warnings when service is not configured
 * :vytask:`T1754` (bug): DHCPv6 client is impossible to restart
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index cccbca51..b2ab4ba5 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,79 @@
    _ext/releasenotes.py
 
 
+2021-08-15
+==========
+
+* :vytask:`T3756` (default): VyOS generates invalid QR code for wireguard clients
+* :vytask:`T3757` (default): OSPF: add support to configure the area at an interface level
+
+
+2021-08-14
+==========
+
+* :vytask:`T3745` (feature): op-mode IPSec show vpn ipse sa sorting
+* :vytask:`T1083` (feature): Implement "--persistent" option to NAT rules
+
+
+2021-08-13
+==========
+
+* :vytask:`T3749` (bug): V4/V6 Counters in network container validation aren't being reset
+* :vytask:`T3728` (bug): FRR not respect configured RD and RT for L3VNI
+* :vytask:`T3727` (bug): VPN IPsec ESP proposal and ESP presented in config missmatch
+* :vytask:`T3740` (bug): HTTPs API breaks when the address is IPv6
+* :vytask:`T3734` (bug): Move EVPN VRF up in FRR config
+
+
+2021-08-12
+==========
+
+* :vytask:`T3731` (bug): verify_accel_ppp_base_service return wrong config error for SSP
+* :vytask:`T3405` (feature): PPPoE server unit-cache
+* :vytask:`T2432` (default): dhcpd: Can't create new lease file: Permission denied
+* :vytask:`T3746` (feature): Inform users logging into the system about a pending reboot
+* :vytask:`T3744` (default): Dns forwarding statistics formatting missing a new line
+
+
+2021-08-11
+==========
+
+* :vytask:`T3709` (feature): Snmp: Allow enable MIDs/OIDs ipCidrRouteTable
+
+
+2021-08-09
+==========
+
+* :vytask:`T3720` (bug): IPSec set vti secondary address cause interface disable
+
+
+2021-08-08
+==========
+
+* :vytask:`T3705` (bug): IPSec: VTI interface does not honor default-esp-group
+* :vytask:`T2027` (bug): get_config_dict is failing when the configuration section is empty/missing
+
+
+2021-08-05
+==========
+
+* :vytask:`T3719` (bug): Restart vpn shows some missed files
+* :vytask:`T696` (feature): Rewrite conntrack  sync to XML
+
+
+2021-08-04
+==========
+
+* :vytask:`T3704` (feature): Add ability to interact with Areca RAID adapers
+* :vytask:`T3718` (bug): VPN IPsec IKE group by default not use DH-group 2
+
+
+2021-08-02
+==========
+
+* :vytask:`T3601` (default): Error in ssh keys for vmware cloud-init if ssh keys is left empty.
+
+
 2021-08-01
 ==========
 
@@ -138,7 +211,6 @@
 2021-06-18
 ==========
 
-* :vytask:`T3634` (feature): Add op command option for ping for do not fragment bit to be set
 * :vytask:`T3599` (default): Migrate NHRP to XML/Python
 
 
@@ -603,7 +675,6 @@
 2021-03-22
 ==========
 
-* :vytask:`T3402` (feature): Add VyOS programming library for operational level commands
 * :vytask:`T3284` (bug): merge/load fail silently if unable to resolve host
 
 
@@ -768,7 +839,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.135 / 5.10.53
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.140 / 5.10.58
 
 
 2021-02-15