Merge branch 'main' into update-pr-template

ADubhlaoich · web-flow · commit 5199a30cbb78 · 2025-01-22T11:32:51.000Z
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -76,7 +76,7 @@ jobs:
     needs: call-docs-build-push
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
       - uses: actions/setup-node@v4
diff --git a/.github/workflows/check-broken-links.yml b/.github/workflows/check-broken-links.yml
@@ -11,7 +11,7 @@ jobs:
   check-broken-links:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: BoundfoxStudios/action-hugo-link-check@v2.0.3
diff --git a/.github/workflows/daily-deploy.yml b/.github/workflows/daily-deploy.yml
@@ -8,7 +8,7 @@ on:
         - cron: '0 1 * * *'
 jobs:
     trigger:
-        uses: nginxinc/docs/.github/workflows/build-push.yml@main
+        uses: nginx/documentation/.github/workflows/build-push.yml@main
         with:
             environment: "prod"
         secrets:
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -22,7 +22,7 @@ jobs:
     if: ${{ github.event.repository.fork == false }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
 
       - name: Scan
         uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
         with:
           ref: ${{ inputs.branch && inputs.branch || github.ref }}
 
diff --git a/.github/workflows/ossf_scorecard.yml b/.github/workflows/ossf_scorecard.yml
@@ -29,7 +29,7 @@ jobs:
       checks: read # To detect SAST tools
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.0
         with:
           persist-credentials: false
 
@@ -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@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           sarif_file: results.sarif
diff --git a/cloudcannon.config.yml b/cloudcannon.config.yml
@@ -11,12 +11,11 @@ collections_config:
     filter:
       base: strict
       include:
-        - feedback.md
         - ossc.md
         - search.md
         - success.md
     name: Standalone Website Pages
-    description: This collection contains standalone website pages like the search landing page and feedback form.
+    description: This collection contains standalone website pages like the search landing page.
     icon: notes
     sort_options:
       - key: weight
diff --git a/content/feedback.md b/content/feedback.md
diff --git a/content/includes/nap-waf/config/v5/host-based-nginx-instructions/common-steps-with-debian.md b/content/includes/nap-waf/config/v5/host-based-nginx-instructions/common-steps-with-debian.md
@@ -42,9 +42,9 @@
     The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:
 
     ```none
-    pub   rsa2048 2011-08-19 [SC] [expires: 2024-06-14]
+    pub   rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
           573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
     uid                      nginx signing key <signing-key@nginx.com>
     ```
 
-    If the fingerprint is different, remove the file.
+    If the fingerprint is different, remove the file.
diff --git a/content/includes/nap-waf/config/v5/host-based-nginx-instructions/common-steps-with-ubuntu.md b/content/includes/nap-waf/config/v5/host-based-nginx-instructions/common-steps-with-ubuntu.md
@@ -42,9 +42,9 @@
     The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:
 
     ```none
-    pub   rsa2048 2011-08-19 [SC] [expires: 2024-06-14]
+    pub   rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
           573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
     uid                      nginx signing key <signing-key@nginx.com>
     ```
 
-    If the fingerprint is different, remove the file.
+    If the fingerprint is different, remove the file.
diff --git a/content/mesh/tutorials/kic/deploy-with-kic.md b/content/mesh/tutorials/kic/deploy-with-kic.md
@@ -69,7 +69,7 @@ All communication between NGINX Ingress Controller and the upstream Services occ
 Therefore, NGINX Ingress Controller can only route traffic to Services in the mesh that have an `mtls-mode` of `permissive` or `strict`.
 In cases where you need to route traffic to both mTLS and non-mTLS Services, you may need another Ingress Controller that does not participate in the mTLS fabric.
 
-Refer to the NGINX Ingress Controller's [Running Multiple Ingress Controllers](https://docs.nginx.com/nginx-ingress-controller/installation/running-multiple-ingress-controllers/) guide for instructions on how to configure multiple Ingress Controllers.
+Refer to the NGINX Ingress Controller's [Running Multiple Ingress Controllers](https://docs.nginx.com/nginx-ingress-controller/installation/run-multiple-ingress-controllers/) guide for instructions on how to configure multiple Ingress Controllers.
 {{< /note >}}
 
 
@@ -89,7 +89,7 @@ Before continuing, check the NGINX Ingress Controller [supported versions](#supp
 
 1. Build or Pull the NGINX OSS Ingress Controller image:
     - [Create and push your NGINX Docker image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/).
-    - For NGINX OSS Ingress you can also [pull the NGINX Docker image](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/).
+    - For NGINX OSS Ingress you can also [pull the NGINX Docker image](https://docs.nginx.com/nginx-ingress-controller/installation/nic-images/).
 1. Set up Kubernetes Resources for [NGINX Ingress Controller](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/) using Kubernetes manifests:
     - [Configure role-based access control (RBAC)](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/#1-configure-rbac)
     - [Create Common Resources](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/#2-create-common-resources)
diff --git a/content/nap-waf/v5/configuration-guide/configuration.md b/content/nap-waf/v5/configuration-guide/configuration.md
@@ -951,7 +951,7 @@ The input policy can also be converted using convert-policy as a CLI tool from w
 docker run -it --rm \
   -v $(pwd):/policies \
   --entrypoint="/opt/app_protect/bin/convert-policy" \
-  artifactory.f5net.com/f5-waf-docker/nap-x-compiler-image:latest -i test.json -o test.xml
+  waf-compiler-<version-tag>:custom -i test.json -o test.xml
   -i /policies/input_policy.plc \
   -o /policies/output_policy \
   --full-export
diff --git a/layouts/index.html b/layouts/index.html
@@ -189,13 +189,6 @@ <h3 class="saas-title">NGINX Unit</h3>
              </div>
           </div>
        </div>
-       <div class="container-fluid col-xl-12" id="community-alert">
-         <div class="row justify-content-center">
-             <div class="alert alert-light" role="alert">
-                 <p class="card-title" style="font-weight: 400;">Join the <a href="https://community.nginx.org/joinslack" alt="NGINX Community Slack">NGINX Community Slack</a> to ask and answer questions, discuss NGINX, and share useful advice and resources.</p>
-             </div>
-         </div>
-     </div>
     </section>
  </div>
 
diff --git a/static/nginx-one/api/one.json b/static/nginx-one/api/one.json
diff --git a/static/robots.txt b/static/robots.txt
