Merge branch 'main' into blocking-action

Author: ADubhlaoich

CONTRIBUTING.md

@@ -41,6 +41,7 @@ To understand how we use Git in this repository, read our [Git conventions](/doc
 The broad workflow is as follows:
 
 - Fork the NGINX repository
+  - If you're an F5/NGINX user, you can work from a clone
 - Create a branch
 - Implement your changes in your branch
 - Submit a pull request (PR) when your changes are ready for review

content/includes/nim/tech-specs/supported-distros.md

@@ -8,14 +8,12 @@ The following table lists the Linux distributions supported by NGINX Instance Ma
 
 {{<bootstrap-table "table table-striped table-bordered">}}
 
-| Distribution    | Version                                | Architecture     | NGINX Instance Manager Support                    | NGINX App Protect Support                          |
-|-----------------|----------------------------------------|------------------|---------------------------------------------------|----------------------------------------------------|
-| Amazon Linux    | 2 LTS                                  | x86_64           | Supported                                         | **Support discontinued as of 2.18.0**              |
-| CentOS          | 7.4 and later in the 7.x family        | x86_64           | **Support discontinued as of 2.17.0**             | **Support discontinued as of 2.17.0**              |
-| Debian          | 11<hr>12                               | x86_64<hr>x86_64 | Supported<hr>Supported on 2.13.0+                 | Supported<hr>Supported                             |
-| Oracle Linux    | 7.4 and later in the 7.x family<hr>8.0 and later in the 8.x family | x86_64<hr>x86_64 | **Support discontinued as of 2.17.0**<hr>Supported on 2.6.0+                 | **Support discontinued as of 2.17.0**<hr>Supported                             |
-| RHEL            | 7.4 and later in the 7.x family<hr>8.x and later in the 8.x family<hr>9.x and later in the 9.x family | x86_64<hr>x86_64<hr>x86_64 | **Support discontinued as of 2.17.0**<hr>Supported<hr>Supported on 2.6.0+ | **Support discontinued as of 2.17.0**<hr>Supported<hr>Supported |
-| Ubuntu          | 20.04<hr>22.04<hr>24.04                | x86_64<hr>x86_64<hr>x86_64 | Supported<hr>Supported on 2.3.0+<hr>Supported on 2.18.0+                 | **Support discontinued as of NAP 4.15.0/5.7.0**<hr>Supported<hr>Supported                             |
+| Distribution    | Version                                | Architecture     | NGINX Instance Manager Support                      | NGINX App Protect Support                          |
+|-----------------|----------------------------------------|------------------|-----------------------------------------------------|----------------------------------------------------|
+| Debian          | 11<hr>12                               | x86_64<hr>x86_64 | Supported<hr>Supported                              | Supported<hr>Supported                             |
+| Oracle Linux    | 8.0 and later in the 8.x family        | x86_64           | Supported                                           | Supported                                          |
+| RHEL            | 8.0 and later in the 8.x family<hr>9.0 and later in the 9.x family  | x86_64<hr>x86_64 | Supported<hr>Supported | Supported<hr>Supported                             |
+| Ubuntu          | 22.04<hr>24.04                         | x86_64<hr>x86_64 | Supported<hr>Supported on 2.18.0+                   | Supported<hr>Supported                             |
 
 {{</bootstrap-table>}}
 

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

@@ -69,18 +69,40 @@ To set up your other NGINX instances to use the proxy instance to connect to NGI
 2. Open the NGINX Agent configuration file (**/etc/nginx-agent/nginx-agent.conf**) with a text editor.
 3. Add the following configuration. Replace `YOUR_DATA_PLANE_KEY_HERE` with your actual data plane key and `YOUR_PROXY_IP_ADDRESS_HERE` with the IP address of the NGINX proxy instance.
 
-    ```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: 443
-      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
-    ```
+   {{< tabs name="Configure NGINX Agent to use the proxy" >}}
+
+   {{%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"
+   ```
+
+   {{%/tab%}}
+   {{%tab name="NGINX Agent 2.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: 443
+   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%}}
+   {{%/tabs%}}
 
 4. Restart NGINX Agent:
 

content/nim/nginx-app-protect/security-monitoring/set-up-app-protect-instances.md

@@ -211,7 +211,6 @@ Take the steps below to update your NGINX App Protect WAF configurations by usin
 1. Next, edit the desired configuration file. You will add directives that reference the security policies bundle and enable the NGINX App Protect WAF logs required by the Security Monitoring dashboards. An example configuration is provided below.
 
    ```nginx
-      app_protect_enable on;
       app_protect_enable on;
       app_protect_policy_file "/etc/nms/NginxDefaultPolicy.tgz";
       app_protect_security_log_enable on;