Merge pull request #2 from vyos/master

import 2024-03

3 files changed, 18 insertions, 8 deletions

diff --git a/docs/installation/cloud/aws.rst b/docs/installation/cloud/aws.rst
index da0c46d3..992e2609 100644
--- a/docs/installation/cloud/aws.rst
+++ b/docs/installation/cloud/aws.rst
@@ -25,7 +25,7 @@ Deploy VyOS on Amazon :abbr:`AWS (Amazon Web Services)`
 .. figure:: /_static/images/cloud-aws-04.png
 
 5. Additional storage. You can remove additional storage ``/dev/sdb``. First
-   root device will be ``/dev/xvda``. You can skeep this step.
+   root device will be ``/dev/xvda``. You can skip this step.
 
 .. figure:: /_static/images/cloud-aws-05.png
 
@@ -66,7 +66,7 @@ To use Amazon CloudWatch Agent, configure it within the Amazon SSM Parameter Sto
 
   .. note:: The amazon-cloudwatch-agent package is normally included in VyOS 1.3.3+ and 1.4+
 
-3. Retreive an existing CloudWatch Agent configuration from the :abbr:`SSM (Systems Manager)` Parameter Store.
+3. Retrieve an existing CloudWatch Agent configuration from the :abbr:`SSM (Systems Manager)` Parameter Store.
 
   .. code-block:: none
 
@@ -85,7 +85,7 @@ Creating the Amazon Cloudwatch Agent Configuration in Amazon :abbr:`SSM (Systems
 
 1. Create an :abbr:`IAM (Identity and Access Management)` role for your :abbr:`EC2 (Elastic Compute Cloud)` instance to access the CloudWatch service. Name it CloudWatchAgentAdminRole. The role should contain at two default policies: CloudWatchAgentAdminPolicy and AmazonSSMManagedInstanceCore.  
 
-  .. note:: CloudWatchAgentServerRole is too permisive and should be used for single configuration creation and deployment. That's why after completion of step #3 higly recommended to replace instance CloudWatchAgentAdminRole role with CloudWatchAgentServerRole.
+  .. note:: CloudWatchAgentServerRole is too permissive and should be used for single configuration creation and deployment. That's why after completion of step #3 highly recommended to replace instance CloudWatchAgentAdminRole role with CloudWatchAgentServerRole.
 
 2. Run Cloudwatch configuration wizard.
 
@@ -99,4 +99,4 @@ References
 ----------
 - https://console.aws.amazon.com/
 - https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/create-iam-roles-for-cloudwatch-agent.html
-- https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/install-CloudWatch-Agent-on-EC2-Instance-fleet.html
\ No newline at end of file
+- https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/install-CloudWatch-Agent-on-EC2-Instance-fleet.html
diff --git a/docs/installation/install.rst b/docs/installation/install.rst
index 2bbce8ee..17bccfbd 100644
--- a/docs/installation/install.rst
+++ b/docs/installation/install.rst
@@ -458,13 +458,16 @@ In this example we configured an existent VyOS as the DHCP server:
   vyos@vyos# show service dhcp-server
    shared-network-name mydhcp {
        subnet 192.168.1.0/24 {
-           bootfile-name pxelinux.0
-           bootfile-server 192.168.1.50
-           default-router 192.168.1.50
+           option {
+               bootfile-name pxelinux.0
+               bootfile-server 192.168.1.50
+               default-router 192.168.1.50
+           }
            range 0 {
                start 192.168.1.70
                stop 192.168.1.100
            }
+           subnet-id 1
        }
    }
 
diff --git a/docs/installation/update.rst b/docs/installation/update.rst
index 5f75f9db..b0b43836 100644
--- a/docs/installation/update.rst
+++ b/docs/installation/update.rst
@@ -10,7 +10,7 @@ for the new image to boot using the current configuration.
 
 .. note:: Only LTS releases are PGP-signed.
 
-.. opcmd:: add system image <url | path> [vrf name]
+.. opcmd:: add system image <url | path> | [latest] [vrf name]
    [username user [password pass]]
 
    Use this command to install a new system image. You can reach the
@@ -72,6 +72,13 @@ Example
 
      OK.  This image will be named: vyos-1.3-rolling-201912201452
 
+You can use ``latest`` option. It loads the latest available Rolling release.
+
+.. code-block:: none
+
+     vyos@vyos:~$ add system image latest
+
+.. note:: To use the `latest` option the "system update-check url" must be configured.
 
 .. hint:: The most up-do-date Rolling Release for AMD64 can be accessed using
    the following URL: