5 files changed, 45 insertions, 23 deletions
diff --git a/docs/configuration/interfaces/bridge.rst b/docs/configuration/interfaces/bridge.rst
index ebb2232a..ddc293cc 100644
--- a/docs/configuration/interfaces/bridge.rst
+++ b/docs/configuration/interfaces/bridge.rst
@@ -78,7 +78,11 @@ Bridge Options
 
 .. cfgcmd:: set interfaces bridge <interface> igmp querier
 
-   Enable IGMP querier
+   Enable IGMP and MLD querier.
+
+.. cfgcmd:: set interfaces bridge <interface> igmp snooping
+
+   Enable IGMP and MLD snooping.
 
 .. _stp:
 
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/interfaces/macsec.rst b/docs/configuration/interfaces/macsec.rst
index 544bd4fc..338ad3ae 100644
--- a/docs/configuration/interfaces/macsec.rst
+++ b/docs/configuration/interfaces/macsec.rst
@@ -53,11 +53,12 @@ individual peers.
 .. cfgcmd:: set interfaces macsec <interface> security mka cak <key>
 
   IEEE 802.1X/MACsec pre-shared key mode. This allows configuring MACsec with
-  a pre-shared key using a (CAK,CKN) pair.
+  a pre-shared key using a :abbr:`CAK (MACsec connectivity association key)` and
+  :abbr:`CKN (MACsec connectivity association name)` pair.
 
 .. cfgcmd:: set interfaces macsec <interface> security mka ckn <key>
 
-  CAK Name
+  :abbr:`CKN (MACsec connectivity association name)` key
 
 .. cfgcmd:: set interfaces macsec <interface> security mka priority <priority>
 
@@ -80,28 +81,27 @@ Replay protection
 Operation
 *********
 
-.. opcmd:: run generate macsec mka-cak
+.. opcmd:: run generate macsec mka cak <gcm-aes-128|gcm-aes-256>
 
-  Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key
+  Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key 128 or 256 bits.
 
   .. code-block:: none
 
-    vyos@vyos:~$ generate macsec mka-cak
+    vyos@vyos:~$ generate macsec mka cak gcm-aes-128
     20693b6e08bfa482703a563898c9e3ad
 
+.. opcmd:: run generate macsec mka ckn
 
-.. opcmd:: run generate macsec mka-ckn
-
-  Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key
+  Generate :abbr:`MKA (MACsec Key Agreement protocol)` CAK key.
 
   .. code-block:: none
 
-    vyos@vyos:~$ generate macsec mka-ckn
+    vyos@vyos:~$ generate macsec mka ckn
     88737efef314ee319b2cbf30210a5f164957d884672c143aefdc0f5f6bc49eb2
 
 .. opcmd:: show interfaces macsec
 
-  List all MACsec interfaces
+  List all MACsec interfaces.
 
   .. code-block:: none
 
diff --git a/docs/configuration/interfaces/pppoe.rst b/docs/configuration/interfaces/pppoe.rst
index e1bb3056..dbf92caf 100644
--- a/docs/configuration/interfaces/pppoe.rst
+++ b/docs/configuration/interfaces/pppoe.rst
@@ -1,4 +1,4 @@
-:lastproofread: 2021-07-09
+:lastproofread: 2022-07-27
 
 .. _pppoe-interface:
 
@@ -126,6 +126,9 @@ PPPoE options
 
      set interfaces pppoe pppoe0 no-default-route
 
+   .. note:: This command got added in VyOS 1.4 and inverts the logic from the old
+     ``default-route`` CLI option.
+
 .. cfgcmd:: set interfaces pppoe <interface> default-route-distance <distance>
 
    Set the distance for the default gateway sent by the PPPoE server.
@@ -310,11 +313,6 @@ Requirements:
   If you are switching from a DHCP based ISP like cable then be aware that
   things like VPN links may need to have their MTU sizes adjusted to work
   within this limit.
-* With the ``default-route`` option set to ``auto``, VyOS will only add the
-  default gateway you receive from your DSL ISP to the routing table if you
-  have no other WAN connections. If you wish to use a dual WAN connection,
-  change the ``default-route`` option to ``force``.  You could also install
-  a static route and set the ``default-route`` option to ``none``.
 * With the ``name-server`` option set to ``none``, VyOS will ignore the
   nameservers your ISP sends you and thus you can fully rely on the ones you
   have configured statically.
@@ -322,10 +320,11 @@ Requirements:
 .. note:: Syntax has changed from VyOS 1.2 (crux) and it will be automatically
    migrated during an upgrade.
 
+.. note:: A default route is automatically installed once the interface is up.
+  To change this behavior use the ``no-default-route`` CLI option.
+
 .. code-block:: none
 
-  set interfaces pppoe pppoe0 default-route 'auto'
-  set interfaces pppoe pppoe0 mtu 1492
   set interfaces pppoe pppoe0 authentication user 'userid'
   set interfaces pppoe pppoe0 authentication password 'secret'
   set interfaces pppoe pppoe0 source-interface 'eth0'
@@ -351,8 +350,6 @@ which is the default VLAN for Deutsche Telekom:
 
 .. code-block:: none
 
-  set interfaces pppoe pppoe0 default-route 'auto'
-  set interfaces pppoe pppoe0 mtu 1492
   set interfaces pppoe pppoe0 authentication user 'userid'
   set interfaces pppoe pppoe0 authentication password 'secret'
   set interfaces pppoe pppoe0 source-interface 'eth0.7'
diff --git a/docs/configuration/interfaces/wireless.rst b/docs/configuration/interfaces/wireless.rst
index b775011f..231652a0 100644
--- a/docs/configuration/interfaces/wireless.rst
+++ b/docs/configuration/interfaces/wireless.rst
@@ -590,3 +590,24 @@ To get it to work as an access point with this configuration you will need
 to set up a DHCP server to work with that network. You can - of course - also
 bridge the Wireless interface with any configured bridge
 (:ref:`bridge-interface`) on the system.
+
+.. _wireless-interface-intel-ax200:
+
+Intel AX200
+===========
+
+The Intel AX200 card does not work out of the box in AP mode, see
+https://unix.stackexchange.com/questions/598275/intel-ax200-ap-mode. You can
+still put this card into AP mode using the following configuration:
+
+.. stop_vyoslinter
+.. code-block:: none
+
+  set interfaces wireless wlan0 channel '1'
+  set interfaces wireless wlan0 country-code 'us'
+  set interfaces wireless wlan0 mode 'n'
+  set interfaces wireless wlan0 physical-device 'phy0'
+  set interfaces wireless wlan0 ssid 'VyOS'
+  set interfaces wireless wlan0 type 'access-point'
+
+.. start_vyoslinter