Merge branch 'main' into nap5-prerequisites

Author: Alan Dooley

.github/labeler.yml

@@ -23,6 +23,12 @@ product/amplify:
   - changed-files:
       - any-glob-to-any-file: 'content/amplify/**'
 
+product/dos:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nap-dos/**'
+          - 'content/includes/nap-dos/**'
+
 product/controller:
   - changed-files:
       - any-glob-to-any-file:
@@ -37,18 +43,6 @@ product/modsec-waf:
   - changed-files:
       - any-glob-to-any-file: 'content/modsec-waf/**'
 
-product/nap-dos:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'content/nap-dos/**'
-          - 'content/includes/nap-dos/**'
-
-product/nap-waf:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'content/nap-waf/**'
-          - 'content/includes/nap-waf/**'
-
 product/ngf:
   - changed-files:
       - any-glob-to-any-file:
@@ -97,12 +91,19 @@ product/unit:
           - 'content/unit/**'
           - 'content/includes/unit/**'
 
+product/waf:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/waf/**'
+          - 'content/includes/waf/**'
+
 # Other labels
 
 process documentation:
   - changed-files:
       - any-glob-to-any-file:
           - 'templates/**'
+          - 'documentation/**'
           - '*.md'
           - 'LICENSE'
 
@@ -122,6 +123,8 @@ tooling:
           - '*.sh'
           - '*.js'
           - 'Makefile'
-          - '.vale.ini'
-          - '.gitignore'
           - '.gitattributes'
+          - '.gitignore'
+          - '.gitlint'
+          - '.markdownlint.yaml'
+          - '.vale.ini'

.github/workflows/coveo.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Upload token for ${{matrix.env_name}}
         if: ${{ steps.generate-token.outcome == 'success' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{matrix.env_name}}
           path: "./"
@@ -101,7 +101,7 @@ jobs:
     needs: generate-coveo-search-token
     steps:
       - name: Download Coveo search token
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
 
       - name: View files
         run: ls -R

.github/workflows/linkchecker.yml

@@ -56,7 +56,6 @@ jobs:
           - waf
           - nginx-ingress-controller
           - nginxaas/azure
-          - nginx-service-mesh
           - nginx-amplify
           - nginx-controller
           - nginx-waf

.github/workflows/ossf_scorecard.yml

@@ -48,14 +48,14 @@ jobs:
 
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF format to the repository Actions tab.
       - name: Upload artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/playwright.yml

@@ -18,13 +18,13 @@ jobs:
       run: npx playwright install --with-deps
     - name: Run Playwright tests
       run: npx playwright test --retries=2
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       if: ${{ !cancelled() }}
       with:
         name: playwright-report
         path: tests/playwright-report/
         retention-days: 30
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       if: ${{ !cancelled() }}
       with:
         name: test-results

.markdownlint.yaml

@@ -36,5 +36,5 @@ MD039: true
 # All images should have alt text
 MD045: true
 
-# Tables shou ld be surrounded by blank lines
+# Tables should be surrounded by blank lines
 MD058: true

config/_default/config.toml

@@ -36,6 +36,11 @@ enableGitInfo = true
       unsafe = true
     [markup.highlight]
       guessSyntax = true
+    [markup.goldmark.extensions.typographer]
+      rightDoubleQuote = '"'
+      leftDoubleQuote = '"'
+      rightSingleQuote = '''
+      leftSingleQuote = '''
 
 [params]
   useSectionPageLists = "false"
@@ -143,8 +148,6 @@ enableGitInfo = true
     "3.22.8"
   ]
   github_repo = "https://github.com/nginx/documentation/"
-  [params.featureFlags]
-    disable_qualtrics = true
 
 sectionPagesMenu = "docs"