Merge branch 'master' of github.com:vyos/vyos-documentation

7 files changed, 43 insertions, 17 deletions

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 56febd155792b579d88281940acc97f95a10a71
+Subproject f2ebdfa4b856c2801dbdd177095220a27e408e1
diff --git a/docs/automation/command-scripting.rst b/docs/automation/command-scripting.rst
index 4486b0c9..7cf31232 100644
--- a/docs/automation/command-scripting.rst
+++ b/docs/automation/command-scripting.rst
@@ -62,15 +62,16 @@ a remote VyOS system.
 
 Will return:
 
-```
-Welcome to VyOS
-Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down
-Interface        IP Address                        S/L  Description
----------        ----------                        ---  -----------
-eth0             192.0.2.1/24                      u/u
-lo               127.0.0.1/8                       u/u
-                 ::1/128
-```
+.. code-block:: none
+
+  Welcome to VyOS
+  Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down
+  Interface        IP Address                        S/L  Description
+  ---------        ----------                        ---  -----------
+  eth0             192.0.2.1/24                      u/u
+  lo               127.0.0.1/8                       u/u
+                  ::1/128
+
 
 Other script languages
 ----------------------
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index a24b701a..9f6c341b 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -1580,7 +1580,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.184 / 5.10.105
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.185 / 5.10.106
 
 
 2021-02-14
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 9dda4e9f..23091ca7 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,31 @@
    _ext/releasenotes.py
 
 
+2022-03-20
+==========
+
+* :vytask:`T4298` (default): vyos-vm-images: fix ansible group name and remove obsolete empty command
+
+
+2022-03-18
+==========
+
+* :vytask:`T4286` (bug): Fix for firewall ipv6 name address validator
+
+
+2022-03-15
+==========
+
+* :vytask:`T4302` (feature): FRRouting upgrade to release 8.2.2
+* :vytask:`T4293` (default): Add "set ip-next-hop unchanged" in route-map
+
+
+2022-03-14
+==========
+
+* :vytask:`T4275` (default): Incorrect val_help for local/remote prefix in ipsec vpn
+
+
 2022-03-12
 ==========
 
@@ -1264,7 +1289,6 @@
 ==========
 
 * :vytask:`T3647` (feature): Bullseye: gcc defaults to passing --as-needed to linker
-* :vytask:`T3644` (default): Replace GCC with a simpler preprocessor for including nested XML snippets in XML documents
 
 
 2021-06-22
@@ -1878,7 +1902,7 @@
 ==========
 
 * :vytask:`T3313` (bug): ospfv3 interface missing options
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.184 / 5.10.105
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.185 / 5.10.106
 
 
 2021-02-15
diff --git a/docs/installation/virtual/proxmox.rst b/docs/installation/virtual/proxmox.rst
index d3d77dc6..0ae2d046 100644
--- a/docs/installation/virtual/proxmox.rst
+++ b/docs/installation/virtual/proxmox.rst
@@ -41,6 +41,7 @@ Deploy VyOS from CLI with rolling release ISO
 .. code-block:: none
 
   qm create 200 --name vyos --memory 2048 --net0 virtio,bridge=vmbr0 --ide2 media=cdrom,file=local:iso/live-image-amd64.hybrid.iso --virtio0 local-lvm:15
+
 3. Start the VM using the command ``qm start 200`` or using the start button located in the proxmox GUI.
 4. Using the proxmox webGUI, open the virtual console for your newly created vm. Login username/password is ``vyos/vyos``.
 5. Once booted into the live system, type ``install image`` into the command line and follow the prompts to install VyOS to the virtual drive. 
diff --git a/docs/operation/raid.rst b/docs/operation/raid.rst
index 49463a72..30407718 100644
--- a/docs/operation/raid.rst
+++ b/docs/operation/raid.rst
@@ -154,7 +154,7 @@ To replace a bad disk within a RAID 1 set, perform the following steps:
 1 - Remove the failed disk from the RAID 1 set by issuing the following 
 command:
 
-.. opcmd:: delete raid RAID‐1‐device member disk‐partition
+.. opcmd:: delete raid <RAID‐1‐device> member <disk‐partition>
 
    where RAID-1-device is the name of the RAID 1 device (for example, md0) and 
    disk-partition is the name of the failed disk partition (for example, sdb2).
@@ -166,7 +166,7 @@ hot-swappable, then you must shut down the system before removing the disk.
 
 4 - Format the new disk for RAID 1 by issuing the following command:
 
-.. opcmd:: format <disk‐device1> like <disk‐device2>
+.. opcmd:: format disk <disk‐device1> like <disk‐device2>
 
    where disk-device1 is the replacement disk (for example, sdb) and 
    disk-device2 is the existing healthy disk (for example, sda).
@@ -191,7 +191,7 @@ mirror synchronization, check and display information.
    disk partition to a RAID 1 set initiates mirror synchronization, where all 
    data on the existing member partition is copied to the new partition.
 
-.. opcmd:: format <disk‐device1> like <disk‐device2>
+.. opcmd:: format disk <disk‐device1> like <disk‐device2>
 
    This command is typically used to prepare a disk to be added to a preexisting
    RAID 1 set (of which disk-device2 is already a member).
diff --git a/docs/quick-start.rst b/docs/quick-start.rst
index 55c3943c..90bdfcb4 100644
--- a/docs/quick-start.rst
+++ b/docs/quick-start.rst
@@ -77,7 +77,7 @@ on specific addresses only.
 DHCP/DNS quick-start
 ####################
 
-The following settings will configure DHCP and DNS services on 
+The following settings will configure DHCP and DNS services on
 your internal/LAN network, where VyOS will act as the default gateway and
 DNS server.
 
@@ -156,7 +156,7 @@ blocks brute-forcing attempts:
   set firewall name OUTSIDE-LOCAL rule 30 destination port '22'
   set firewall name OUTSIDE-LOCAL rule 30 protocol 'tcp'
   set firewall name OUTSIDE-LOCAL rule 30 recent count '4'
-  set firewall name OUTSIDE-LOCAL rule 30 recent time '60'
+  set firewall name OUTSIDE-LOCAL rule 30 recent time 'minute'
   set firewall name OUTSIDE-LOCAL rule 30 state new 'enable'
 
   set firewall name OUTSIDE-LOCAL rule 31 action 'accept'