Merge branch 'main' into fix-reveal-audit-config-table

Author: mjang

.github/workflows/ossf_scorecard.yml

@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

content/agent/technical-specifications.md

@@ -14,10 +14,10 @@ This document provides technical specifications for NGINX Agent. It includes inf
 {{< bootstrap-table "table table-striped table-bordered" >}}
 | NGINX Product                | Agent Version  |
 |------------------------------|----------------|
-| **NGINX One Console**        | 2.x            |
+| **NGINX One Console**        | 3.x            |
 | **NGINX Gateway Fabric**     | 3.x            |
 | **NGINX Plus**               | 2.x, 3.x       |
-| **NGINX Ingress Controller** | 2.x            |
+| **NGINX Ingress Controller** | 2.x, 3.x       |
 | **NGINX Instance Manager**   | 2.x            |
 {{< /bootstrap-table >}}
 

content/nginx-one/getting-started.md

@@ -176,8 +176,6 @@ The `install` script writes an `nginx-agent.conf` file to the `/etc/nginx-agent/
 
 {{< include "/nginx-one/conf/nginx-agent-conf.md" >}}
 
-<span style="display: inline-block; margin-top: 20px;" >
-
 {{<call-out "note" "Note: NGINX Agent poll interval" >}} We recommend keeping `dataplane.status.poll_interval` between `30s` and `60s` in the NGINX Agent config (`/etc/nginx-agent/nginx-agent.conf`). If the interval is set above `60s`, NGINX One Console may report incorrect instance statuses.{{</call-out>}}
 
 <br>

content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md

@@ -335,14 +335,14 @@ To generate a custom NGINX Plus image:
 
     - no files are copied from the Docker host as a container is created: you can add `COPY` definitions to each Dockerfile, or the image you create can be used as the basis for another image
 
-3. Log in to [MyF5 Customer Portal](https://account.f5.com/myf5) and download your *nginx-repo.crt* and *nginx-repo.key* files. For a trial of NGINX Plus, the files are provided with your trial package.
+3. Log in to [MyF5 Customer Portal](https://account.f5.com/myf5). As noted in the [Prerequisites](#prerequisites], download your *nginx-repo.crt*, *nginx-repo.key*, and **JSON Web Token** files. For a trial of NGINX Plus, the files are provided with your trial package.
 
 4. Copy the files to the directory where the Dockerfile is located.
 
 5. Create a Docker image, for example, `nginxplus` (note the final period in the command).
 
     ```shell
-    docker build  --no-cache --secret id=nginx-key,src=nginx-repo.key --secret id=nginx-crt,src=nginx-repo.crt -t nginxplus .
+    docker build --no-cache --secret id=nginx-key,src=nginx-repo.key --secret id=nginx-crt,src=nginx-repo.crt --secret id=nginx-jwt,src=license.jwt -t nginxplus .
     ```
 
     The `--no-cache` option tells Docker to build the image from scratch and ensures the installation of the latest version of NGINX Plus. If the Dockerfile was previously used to build an image without the `--no-cache` option, the new image uses the version of NGINX Plus from the previously built image from the Docker cache.