Merge branch 'main' into nic/upgrade-instructions

Author: ADubhlaoich

content/nginx-one/connect-instances/set-up-nginx-proxy-for-nginx-one.md

@@ -74,31 +74,29 @@ To set up your other NGINX instances to use the proxy instance to connect to NGI
    {{%tab name="NGINX Agent 3.x"%}}
 
    ```yaml
-   command:
-   server:
-      # Replace YOUR_PROXY_IP_ADDRESS_HERE with the IP address of the NGINX proxy instance.
-      host: YOUR_PROXY_IP_ADDRESS_HERE
-      port: 5000
-   auth:
-      # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Console data plane key.
-      token: "YOUR_DATA_PLANE_KEY_HERE"
-   tls:
-      skip_verify: False
-      server_name: "agent.connect.nginx.com"
+    command:
+      server:
+        # Replace YOUR_PROXY_IP_ADDRESS_HERE with the IP address of the NGINX proxy instance.
+        host: YOUR_PROXY_IP_ADDRESS_HERE
+        port: 5000
+      auth:
+        # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Console data plane key.
+        token: "YOUR_DATA_PLANE_KEY_HERE"
+      tls:
+        skip_verify: False
    ```
 
    {{%/tab%}}
    {{%tab name="NGINX Agent 2.x"%}}
    ```yaml
-   command:
-   server:
+    server:
+      # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Data Plane Key.
+      token: "YOUR_DATA_PLANE_KEY_HERE"
       # Replace YOUR_PROXY_IP_ADDRESS_HERE with the IP address of the NGINX proxy instance.
       host: YOUR_PROXY_IP_ADDRESS_HERE
-      port: 443
-   auth:
-      # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Console data plane key.
-      token: "YOUR_DATA_PLANE_KEY_HERE"
-   tls:
+      grpcPort: 5000
+    tls:
+      enable: True
       skip_verify: False
    ```
    {{%/tab%}}

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-amazon-web-services.md

@@ -38,7 +38,7 @@ To quickly set up an NGINX Plus environment on AWS:
 	/etc/init.d/nginx status
 	```
 
-See [NGINX Plus on the AWS Cloud Quick Start](https://aws.amazon.com/quickstart/architecture/nginx-plus/) deployment guide for details.
+See [NGINX Plus on the AWS Cloud Quick Start](https://aws.amazon.com/blogs/apn/introducing-a-new-aws-quick-start-nginx-plus-on-the-aws-cloud-in-15-minutes/) deployment guide for details.
 
 ## What If I Need Help?