Merge branch 'master' into automation-doc-scripts

8 files changed, 107 insertions, 7 deletions

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 78099bccc510c90ad7cfa5f56475ba024d5d53a
+Subproject 0de84e53c36604af2bac3b5d8eb00480f9623aa
diff --git a/docs/automation/command-scripting.rst b/docs/automation/command-scripting.rst
index 56c0817e..b8cf0d9e 100644
--- a/docs/automation/command-scripting.rst
+++ b/docs/automation/command-scripting.rst
@@ -160,6 +160,7 @@ The default file looks like this:
   # Any modifications required to work around unfixed bugs or use
   # services not available through the VyOS CLI system can be placed here. 
 
+
 Postconfig on boot
 ------------------
 
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index afc77f4a..99d2dead 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,33 @@
    _ext/releasenotes.py
 
 
+2021-06-19
+==========
+
+* :vytask:`T3633` (feature): Add LRO offload for interface ethernet
+* :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
+==========
+
+* :vytask:`T3631` (feature): route-map: migrate "set extcommunity-rt" and "set extcommunity-soo" to "set extcommunity rt|soo" to match FRR syntax
+
+
+2021-06-16
+==========
+
+* :vytask:`T3623` (default): Fix for dummy interface option in the operational command "clear interfaces dummy"
+* :vytask:`T2425` (feature): Rewrite all policy zebra filters to XML/Python style
+* :vytask:`T3630` (feature): op-mode: add "show version kernel" command
+
+
 2021-06-13
 ==========
 
@@ -528,7 +555,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.125 / 5.10.43
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.127 / 5.10.45
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 8d4d8125..4d5cfe7b 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,47 @@
    _ext/releasenotes.py
 
 
+2021-06-21
+==========
+
+* :vytask:`T3628` (bug): commit-archive source-address Interface Broken
+* :vytask:`T3563` (default): commit-archive breaks with IPv6 source addresses
+
+
+2021-06-20
+==========
+
+* :vytask:`T3637` (bug): vrf: bind-to-all didn't work properly
+* :vytask:`T3639` (default): GCC preprocessor clobbers C comments
+
+
+2021-06-19
+==========
+
+* :vytask:`T3633` (feature): Add LRO offload for interface ethernet
+* :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
+* :vytask:`T3599` (default): Migrate NHRP to XML/Python
+
+
+2021-06-17
+==========
+
+* :vytask:`T3624` (feature): BGP: add support for extended community bandwidth definition
+
+
+2021-06-16
+==========
+
+* :vytask:`T3623` (default): Fix for dummy interface option in the operational command "clear interfaces dummy"
+* :vytask:`T3630` (feature): op-mode: add "show version kernel" command
+
+
 2021-06-13
 ==========
 
@@ -621,7 +662,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.125 / 5.10.43
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.127 / 5.10.45
 
 
 2021-02-15
diff --git a/docs/configuration/service/ssh.rst b/docs/configuration/service/ssh.rst
index 6b09d40d..40ec62f5 100644
--- a/docs/configuration/service/ssh.rst
+++ b/docs/configuration/service/ssh.rst
@@ -156,3 +156,33 @@ Operation
   Two new files ``/config/auth/id_rsa_rpki`` and
   ``/config/auth/id_rsa_rpki.pub``
   will be created.
+
+.. opcmd:: generate public-key-commands name <username> path <location>
+
+   Generate the configuration mode commands to add a public key for
+   :ref:`ssh_key_based_authentication`.
+   ``<location>`` can be a local path or a URL pointing at a remote file.
+
+   Supported remote protocols are FTP, HTTP, HTTPS, SCP/SFTP and TFTP.
+
+  Example:
+
+  .. code-block:: none
+
+    alyssa@vyos:~$ generate public-key-commands name alyssa path sftp://example.net/home/alyssa/.ssh/id_rsa.pub
+    # To add this key as an embedded key, run the following commands:
+    configure
+    set system login user alyssa authentication public-keys alyssa@example.net key AAA...
+    set system login user alyssa authentication public-keys alyssa@example.net type ssh-rsa
+    commit
+    save
+    exit
+
+    ben@vyos:~$ generate public-key-command user ben path ~/.ssh/id_rsa.pub
+    # To add this key as an embedded key, run the following commands:
+    configure
+    set system login user ben authentication public-keys ben@vyos key AAA...
+    set system login user ben authentication public-keys ben@vyos type ssh-dss
+    commit
+    save
+    exit
diff --git a/docs/configuration/system/login.rst b/docs/configuration/system/login.rst
index 0492f4d1..09b6e68b 100644
--- a/docs/configuration/system/login.rst
+++ b/docs/configuration/system/login.rst
@@ -76,6 +76,10 @@ The third part is simply an identifier, and is for your own reference.
 
 .. cfgcmd:: loadkey <username> <location>
 
+   **Deprecation notice:** ``loadkey`` has been deprecated in favour of
+   :opcmd:`generate public-key-commands` and will be removed in a future
+   version. See :ref:`ssh`.
+
    SSH keys can not only be specified on the command-line but also loaded for
    a given user with `<username>` from a file pointed to by `<location>.` Keys
    can be either loaded from local filesystem or any given remote location
diff --git a/docs/documentation.rst b/docs/documentation.rst
index e0d73155..5d8b67c3 100644
--- a/docs/documentation.rst
+++ b/docs/documentation.rst
@@ -161,7 +161,7 @@ The plugin will warn on build if a headline has a duplicate name in the
 same document. To prevent this warning you have to put a custom link on
 top of the headline.
 
-.. code-block::
+.. code-block:: none
 
    Section A
    ==========
@@ -186,10 +186,6 @@ top of the headline.
    Lorem ipsum dolor sit amet, consetetur sadipscing elitr
 
 
-
-
-
-
 Address space
 ^^^^^^^^^^^^^
 
diff --git a/docs/troubleshooting/index.rst b/docs/troubleshooting/index.rst
index 1013dba6..902acf3a 100644
--- a/docs/troubleshooting/index.rst
+++ b/docs/troubleshooting/index.rst
@@ -36,6 +36,7 @@ section and are omitted from the output here):
        bypass-route
        count
        deadline
+       do-not-fragment
        flood
        interface
        interval