4 files changed, 34 insertions, 19 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 0f6da5dc6a769ad303795942277ae2529e44e7d
+Subproject 3cbe7878bcadc0f3ecbaeab46d745b5510c26b0
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 306a931f..03c7b335 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -1626,7 +1626,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.185 / 5.10.106
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.188 / 5.10.111
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 057e003d..55875e37 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,19 @@
    _ext/releasenotes.py
 
 
+2022-04-15
+==========
+
+* :vytask:`T4327` (default): Ethernet interface configuration fails on Hyper-V due to speed/duplex/autoneg ethtool command error
+* :vytask:`T4364` (feature): salt-minion: Upgrade to 3004 and migrate to get_config_dict()
+
+
+2022-04-13
+==========
+
+* :vytask:`T4333` (feature): Jinja2: add plugin to test if a variable is defined and not none to reduce template complexity
+
+
 2022-04-08
 ==========
 
@@ -1987,7 +2000,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.185 / 5.10.106
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.188 / 5.10.111
 
 
 2021-02-15
diff --git a/docs/configuration/interfaces/pppoe.rst b/docs/configuration/interfaces/pppoe.rst
index 4a31efc5..e1bb3056 100644
--- a/docs/configuration/interfaces/pppoe.rst
+++ b/docs/configuration/interfaces/pppoe.rst
@@ -115,24 +115,26 @@ PPPoE options
    timeout period, after which an idle PPPoE link will be disconnected. A
    non-zero idle timeout will never disconnect the link after it first came up.
 
-.. cfgcmd:: set interfaces pppoe <interface> default-route [auto | force | none]
+.. cfgcmd:: set interfaces pppoe <interface> no-default-route
 
-   Use this command to specify whether to automatically add a default route
-   pointing to the endpoint of the PPPoE when the link comes up. The default
-   route is only added if no other default route already exists in the system.
+   Only request an address from the PPPoE server but do not install any default
+   route.
 
-   **default:** A default route to the remote endpoint is automatically added
-   when the link comes up (i.e. auto).
+   Example:
 
-   * auto: A default route is added if no other default route (From any
-     source) already exists.
-   * force: A default route is added after removing *all* existing default
-     routes.
-   * none: No default route is installed.
+   .. code-block:: none
+
+     set interfaces pppoe pppoe0 no-default-route
+
+.. cfgcmd:: set interfaces pppoe <interface> default-route-distance <distance>
+
+   Set the distance for the default gateway sent by the PPPoE server.
 
-.. note:: In all modes except 'none', all default routes using this interface
-   will be removed when the interface is torn down - even manually installed
-   static routes.
+   Example:
+
+   .. code-block:: none
+
+     set interfaces pppoe pppoe0 default-route-distance 220
 
 .. cfgcmd:: set interfaces pppoe <interface> idle-timeout <time>
 
@@ -190,7 +192,7 @@ PPPoE options
   .. hint:: MSS value = MTU - 20 (IP header) - 20 (TCP header), resulting in
     1452 bytes on a 1492 byte MTU.
 
-  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to 
+  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to
   automatically set the proper value.
 
 .. cfgcmd:: set interfaces pppoe <interface> ip disable-forwarding
@@ -235,8 +237,8 @@ IPv6
 
   .. hint:: MSS value = MTU - 20 (IP header) - 20 (TCP header), resulting in
     1452 bytes on a 1492 byte MTU.
-  
-  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to 
+
+  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to
   automatically set the proper value.
 
 .. cfgcmd:: set interfaces pppoe <interface> ipv6 disable-forwarding