2 files changed, 43 insertions, 21 deletions
diff --git a/docs/changelog/1.2.4.rst b/docs/changelog/1.2.4.rst
index 397c9bb9..3e228880 100644
--- a/docs/changelog/1.2.4.rst
+++ b/docs/changelog/1.2.4.rst
@@ -8,21 +8,26 @@ Resolved issues
 
 * :vytask:`T258` Can not configure wan load-balancing on vyos-1.2
 * :vytask:`T818` SNMP v3 - remove required engineid from user node
-* :vytask:`T1030` Upgrade ddclient from 3.8.2 to 3.9.0 (support Cloudflare API v4)
+* :vytask:`T1030` Upgrade ddclient from 3.8.2 to 3.9.
+  (support Cloudflare API v4)
 * :vytask:`T1183` BFD Support via FRR
 * :vytask:`T1299` Allow SNMPd to be extended with custom scripts
 * :vytask:`T1351` accel-pppoe adding CIDR based IP pool option
 * :vytask:`T1391` In route-map set community additive
 * :vytask:`T1394` syslog systemd and host_name.py race condition
-* :vytask:`T1401` Copying files with the FTP protocol fails if the password contains special characters
-* :vytask:`T1421` OpenVPN client push-route stopped working, needs added quotes to fix
+* :vytask:`T1401` Copying files with the FTP protocol fails if the passwor
+  contains special characters
+* :vytask:`T1421` OpenVPN client push-route stopped working, needs added quotes
+  to fix
 * :vytask:`T1430` Add options for custom DHCP client-id and hostname
 * :vytask:`T1447` Python subprocess called without import in host_name.py
 * :vytask:`T1470` improve output of "show dhcpv6 server leases"
 * :vytask:`T1485` Enable 'AdvIntervalOpt' option in for radvd.conf
 * :vytask:`T1496` Separate rolling release and LTS kernel builds
-* :vytask:`T1560` "set load-balancing wan rule 0" causes segfault and prevents load balancing from starting
-* :vytask:`T1568` strip-private command improvement for additional masking of IPv6 and MAC address
+* :vytask:`T1560` "set load-balancing wan rule 0" causes segfault and prevent
+  load balancing from starting
+* :vytask:`T1568` strip-private command improvement for additional masking o
+  IPv6 and MAC address
 * :vytask:`T1578` completion offers "show table", but show table does not exist
 * :vytask:`T1593` Support ip6gre
 * :vytask:`T1597` /usr/sbin/rsyslogd after deleting "system syslog"
@@ -35,29 +40,36 @@ Resolved issues
 * :vytask:`T1708` Update Rolling Release Kernel to 4.19.76
 * :vytask:`T1709` Update WireGuard to 0.0.20190913
 * :vytask:`T1716` Update Intel NIC drivers to recent versions
-* :vytask:`T1726` Update Linux Firmware binaries to a more recent version 2019-03-14 -> 2019-10-07
+* :vytask:`T1726` Update Linux Firmware binaries to a more recen
+  version 2019-03-14 -> 2019-10-07
 * :vytask:`T1728` Update Linux Kernel to 4.19.79
 * :vytask:`T1737` SNMP tab completion missing
 * :vytask:`T1738` Copy SNMP configuration from node to node raises exception
 * :vytask:`T1740` Broken OSPFv2 virtual-link authentication
 * :vytask:`T1742` NHRP unable to commit.
-* :vytask:`T1745` dhcp-server commit fails with "DHCP range stop address x must be greater or equal to the range start address y!" when static mapping has same IP as range stop
+* :vytask:`T1745` dhcp-server commit fails with "DHCP range stop address 
+  must be greater or equal to the range start address y!" when static mapping
+  has same IP as range stop
 * :vytask:`T1749` numeric validator doesn't support multiple ranges
 * :vytask:`T1769` Remove complex SNMPv3 Transport Security Model (TSM)
 * :vytask:`T1772` <regex> constraints in XML are partially broken
 * :vytask:`T1778` Kilobits/Megabits difference in configuration Vyos/FRR
 * :vytask:`T1780` Adding ipsec ike closeaction
-* :vytask:`T1786` disable-dhcp-nameservers is missed in current host_name.py implementation
+* :vytask:`T1786` disable-dhcp-nameservers is missed in current host_name.p
+  implementation
 * :vytask:`T1788` Intel QAT (QuickAssist Technology ) implementation
 * :vytask:`T1792` Update WireGuard to Debian release 0.0.20191012-1
 * :vytask:`T1800` Update Linux Kernel to v4.19.84
 * :vytask:`T1809` Wireless: SSID scan does not work in AP mode
-* :vytask:`T1811` Upgrade from 1.1.8: Config file migration failed: module=l2tp
-* :vytask:`T1812` DHCP: hostnames of clients not resolving after update v1.2.3 -> 1.2-rolling
+* :vytask:`T1811` Upgrade from 1.1.8: Config file migratio
+  failed: module=l2tp
+* :vytask:`T1812` DHCP: hostnames of clients not resolving afte
+  update v1.2.3 -> 1.2-rolling
 * :vytask:`T1819` Reboot kills SNMPv3 configuration
 * :vytask:`T1822` Priority inversion wireless interface dhcpv6
 * :vytask:`T1825` Improve DHCP configuration error message
-* :vytask:`T1836` import-conf-mode-commands in vyos-1x/scripts fails to create an xml
+* :vytask:`T1836` import-conf-mode-commands in vyos-1x/scripts fails
+  to create an xml
 * :vytask:`T1839` LLDP shows "VyOS unknown" instead of "VyOS"
 * :vytask:`T1841` PPP ipv6-up.d direcotry missing
 * :vytask:`T1893` igmp-proxy: Do not allow adding unknown interface
diff --git a/docs/changelog/1.2.5.rst b/docs/changelog/1.2.5.rst
index 231e92f2..6eabc6cf 100644
--- a/docs/changelog/1.2.5.rst
+++ b/docs/changelog/1.2.5.rst
@@ -11,23 +11,32 @@ Resolved issues
 * :vytask:`1301` bgp peer-groups don't work when "no-ipv4-unicast" is enabled.
 * :vytask:`1341` Adding rate-limiter for pppoe server users
 * :vytask:`1376` Incorrect DHCP lease counting
-* :vytask:`1392` Large firewall rulesets cause the system to lose configuration and crash at startup
-* :vytask:`1416` 2 dhcp server run in failover mode can't sync hostname with each other
+* :vytask:`1392` Large firewall rulesets cause the system to lose configuration
+  and crash at startup
+* :vytask:`1416` 2 dhcp server run in failover mode can't sync hostname with
+  each other
 * :vytask:`1452` accel-pppoe - add vendor option to shaper
-* :vytask:`1490` BGP configuration (is lost|not applied) when updating 1.1.8 -> 1.2.1
+* :vytask:`1490` BGP configuration (is lost|not applied) when updating
+  1.1.8 -> 1.2.1
 * :vytask:`1780` Adding ipsec ike closeaction
 * :vytask:`1803` Unbind NTP while it's not requested...
 * :vytask:`1821` "authentication mode radius" has no effect for PPPoE server
 * :vytask:`1827` Increase default gc_thresh
-* :vytask:`1828` Missing completion helper for "set system syslog host 192.0.2.1 facility all protocol"
-* :vytask:`1832` radvd adding feature DNSSL branch.example.com example.com to existing package
+* :vytask:`1828` Missing completion helper for "set system syslog host
+  192.0.2.1 facility all protocol"
+* :vytask:`1832` radvd adding feature DNSSL branch.example.com example.com to
+  existing package
 * :vytask:`1837` PPPoE unrecognized option 'replacedefaultroute'
-* :vytask:`1851` wireguard - changing the pubkey on an existing peer seems to destroy the running config.
+* :vytask:`1851` wireguard - changing the pubkey on an existing peer seems to
+  destroy the running config.
 * :vytask:`1858` l2tp: Delete depricated outside-nexthop and add gateway-address
 * :vytask:`1864` Lower IPSec DPD timeout lower limit from 10s -> 2s
-* :vytask:`1879` Extend Dynamic DNS XML definition value help strings and validators
-* :vytask:`1881` Execute permissions are removed from custom SNMP scripts at commit time
-* :vytask:`1884` Keeping VRRP transition-script native behaviour and adding stop-script
+* :vytask:`1879` Extend Dynamic DNS XML definition value help strings and
+  validators
+* :vytask:`1881` Execute permissions are removed from custom SNMP scripts at
+  commit time
+* :vytask:`1884` Keeping VRRP transition-script native behaviour and adding
+  stop-script
 * :vytask:`1891` Router announcements broken on boot
 * :vytask:`1900` Enable SNMP for VRRP.
 * :vytask:`1902` Add redistribute non main table in bgp
@@ -38,7 +47,8 @@ Resolved issues
 * :vytask:`1934` Change default hostname when deploy from OVA without params.
 * :vytask:`1935` NIC identification and usage problem in Hyper-V environments
 * :vytask:`1936` pppoe-server CLI control features
-* :vytask:`1964` SNMP Script-extensions allows names with spaces, but commit fails
+* :vytask:`1964` SNMP Script-extensions allows names with spaces, but commit
+  fails
 * :vytask:`1967` BGP parameter "enforce-first-as" does not work anymore
 * :vytask:`1970` Correct adding interfaces on boot
 * :vytask:`1971` Missing modules in initrd.img for PXE boot