6 files changed, 88 insertions, 17 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 1b637f78b870f8ecc4971de5baf0a6fda54c40f
+Subproject 466e3b192d15563bc21fc308fa7916eb5aae866
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 071a49f1..980dd16b 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,26 @@
    _ext/releasenotes.py
 
 
+2022-08-14
+==========
+
+* :vytask:`T4579` (bug): bridge: can not delete member interface CLI option when VLAN is enabled
+* :vytask:`T4421` (default): Add support for floating point numbers in the numeric validator
+* :vytask:`T4415` (bug): Include license/copyright files in the image but remove user documentation from /usr/share/doc to reduce its size
+* :vytask:`T4313` (bug): "generate public-key-command" throws unhandled exceptions when it cannot retrieve the key
+* :vytask:`T4082` (bug): Add op mode command to restart ldpd
+* :vytask:`T3714` (bug): Some sysctl custom parameters disappear after reboot
+* :vytask:`T4260` (bug): Extend vyos.configdict.node_changed() to support recursiveness
+* :vytask:`T3785` (default): Add unicode support to configtree backend
+* :vytask:`T3507` (bug): Bond with mode LACP show u/u in show interfaces even if peer is not configured
+
+
+2022-08-11
+==========
+
+* :vytask:`T4476` (default): Next steps after installation is not communicated properly to new users
+
+
 2022-08-02
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index cdad92e2..6e917399 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
    _ext/releasenotes.py
 
 
+2022-08-14
+==========
+
+* :vytask:`T4579` (bug): bridge: can not delete member interface CLI option when VLAN is enabled
+* :vytask:`T4421` (default): Add support for floating point numbers in the numeric validator
+* :vytask:`T3507` (bug): Bond with mode LACP show u/u in show interfaces even if peer is not configured
+
+
+2022-08-12
+==========
+
+* :vytask:`T4603` (feature): Need a config option to specify NAS-IP-Address for vpn l2tp
+
+
+2022-08-10
+==========
+
+* :vytask:`T4408` (feature): Add sshguard to protect against brut-forces
+
+
+2022-08-08
+==========
+
+* :vytask:`T4586` (feature): Add to NAT66: SNAT destination address and DNAT source address.
+
+
 2022-08-04
 ==========
 
diff --git a/docs/configuration/interfaces/ethernet.rst b/docs/configuration/interfaces/ethernet.rst
index dcc9e529..96ccb25f 100644
--- a/docs/configuration/interfaces/ethernet.rst
+++ b/docs/configuration/interfaces/ethernet.rst
@@ -71,8 +71,8 @@ Ethernet options
 Offloading
 ----------
 
-.. cfgcmd:: set interfaces ethernet <interface> offload <gro | gso | sg | tso |
-  ufo | rps>
+.. cfgcmd:: set interfaces ethernet <interface> offload <gro | gso | lro | rps |
+  sg | tso>
 
   Enable different types of hardware offloading on the given NIC.
 
diff --git a/docs/configuration/service/dhcp-server.rst b/docs/configuration/service/dhcp-server.rst
index 63f47a35..3f4b7b89 100644
--- a/docs/configuration/service/dhcp-server.rst
+++ b/docs/configuration/service/dhcp-server.rst
@@ -232,6 +232,27 @@ inside the subnet definition but can be outside of the range statement.
    .. hint:: This is the equivalent of the host block in dhcpd.conf of
       isc-dhcpd.
 
+**Example:**
+
+* IP address ``192.168.1.100`` shall be statically mapped to client named ``client100``
+
+.. code-block:: none
+
+  set service dhcp-server shared-network-name 'NET1' subnet 192.168.1.0/24 static-mapping client1 ip-address 192.168.1.100
+  set service dhcp-server shared-network-name 'NET1' subnet 192.168.1.0/24 static-mapping client1 mac-address aa:bb:11:22:33:00
+
+The configuration will look as follows:
+
+.. code-block:: none
+
+  show service dhcp-server shared-network-name NET1
+   subnet 192.168.1.0/24 {
+       static-mapping client1 {
+           ip-address 192.168.1.100
+           mac-address aa:bb:11:22:33:00
+       }
+   }
+
 Options
 =======
 
@@ -694,21 +715,14 @@ The configuration will look as follows:
 
 .. code-block:: none
 
-  show service dhcp-server shared-network-name NET1
-     shared-network-name NET1 {
-         subnet 2001:db8::/64 {
-            name-server 2001:db8:111::111
-            address-range {
-                start 2001:db8::100 {
-                   stop 2001:db8::199 {
-                }
-            }
-            static-mapping client1 {
-               ipv6-address 2001:db8::101
-               identifier 00:01:00:01:12:34:56:78:aa:bb:cc:dd:ee:ff
-            }
-         }
-      }
+  show service dhcpv6-server shared-network-name NET1
+   subnet 2001:db8::/64 {
+       static-mapping client1 {
+           identifier 00:01:00:01:12:34:56:78:aa:bb:cc:dd:ee:ff
+           ipv6-address 2001:db8::101
+           ipv6-prefix 2001:db8:0:101::/64
+       }
+   }
 
 .. start_vyoslinter
 
diff --git a/docs/configuration/service/webproxy.rst b/docs/configuration/service/webproxy.rst
index e8f6423e..a6c5ff0a 100644
--- a/docs/configuration/service/webproxy.rst
+++ b/docs/configuration/service/webproxy.rst
@@ -137,6 +137,17 @@ Configuration
 
     set service webproxy reply-body-max-size 2048
 
+.. cfgcmd:: set service webproxy safe-ports <port>
+
+  Add new port to Safe-ports acl. Ports included by default in Safe-ports acl:
+  21, 70, 80, 210, 280, 443, 488, 591, 777, 873, 1025-65535
+
+.. cfgcmd:: set service webproxy ssl-safe-ports <port>
+
+  Add new port to SSL-ports acl. Ports included by default in SSL-ports acl:
+  443
+
+
 Authentication
 ==============