[pull] main from github:main

.github/workflows/auto-add-ready-for-doc-review.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Check team membership
         id: membership_check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/auto-close-dependencies.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Because we get far too much spam ;_;
       - name: Lock conversations
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         with:

.github/workflows/changelog-prompt.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Check if PR author is in docs-content team
         id: check_team
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |
@@ -41,7 +41,7 @@ jobs:
 
         if: env.CONTINUE_WORKFLOW == 'true'
 
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/check-for-spammy-issues.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/close-bad-repo-sync-prs.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Close pull request if unwanted
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/confirm-internal-staff-work-in-docs.yml

@@ -24,7 +24,7 @@ jobs:
     if: github.repository == 'github/docs' && github.actor != 'docs-bot'
     steps:
       - id: membership_check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         env:
           TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}
         with:

.github/workflows/copy-api-issue-to-internal.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event.label.name == 'fix-internally' && github.repository == 'github/docs'
     steps:
       - name: Check if this run was triggered by a member of the docs team
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         id: triggered-by-member
         with:
           github-token: ${{secrets.DOCS_BOT_PAT_BASE}}

.github/workflows/create-changelog-pr.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Check that the user belongs to the github org
         id: hubber_check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |
@@ -105,7 +105,7 @@ jobs:
 
       - name: Create a pull request
         if: env.CONTINUE_WORKFLOW == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         id: create_pull_request
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
@@ -124,7 +124,7 @@ jobs:
 
       - name: Add 'ready-for-doc-review' and 'skip FR board' labels to PR
         if: env.CONTINUE_WORKFLOW == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         env:
           # Get the number of the PR that was just created:
           PULL_REQUEST_NUMBER: ${{ steps.create_pull_request.outputs.pull-request-number }}
@@ -140,7 +140,7 @@ jobs:
 
       - name: Assign PR to commenter
         if: env.CONTINUE_WORKFLOW == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         env:
           # Reuse the PR number captured earlier
           PULL_REQUEST_NUMBER: ${{ steps.create_pull_request.outputs.pull-request-number }}

.github/workflows/delete-orphan-translation-files.yml

@@ -133,7 +133,28 @@ jobs:
             --label "workflow-generated" \
             --head=$branch_name
           echo "Merge created PR..."
-          retry_command gh pr merge --merge --auto --delete-branch "$branch_name"
+          # Prefer enabling auto-merge so the PR waits for any required
+          # checks before merging. If auto-merge can't be enabled — usually
+          # because all required checks completed before this step ran and
+          # the PR is already immediately mergeable — fall back to a direct
+          # merge. GitHub returns one of these misleading errors in that
+          # case: "Branch does not have required protected branch rules",
+          # "Pull request is in unstable status", or "Pull request is not
+          # in a mergeable state".
+          auto_merge_err=$(mktemp)
+          trap 'rm -f "$auto_merge_err"' EXIT
+          if retry_command gh pr merge --merge --auto --delete-branch "$branch_name" 2>"$auto_merge_err"; then
+            :
+          else
+            cat "$auto_merge_err"
+            if grep -qE "does not have required protected branch rules|unstable status|Pull request is not in a mergeable state" "$auto_merge_err"; then
+              echo "Auto-merge unavailable; PR appears immediately mergeable. Falling back to direct merge."
+              retry_command gh pr merge --merge --delete-branch "$branch_name"
+            else
+              echo "Auto-merge failed with an unexpected error."
+              exit 1
+            fi
+          fi
 
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

.github/workflows/feedback-prompt.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Check if PR author is in docs-content team
         id: check_team
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |
@@ -41,7 +41,7 @@ jobs:
 
         if: env.NON_DOCS_HUBBER == 'true'
 
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/hubber-contribution-help.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - id: membership_check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |

.github/workflows/index-general-search.yml

@@ -49,7 +49,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.result }}
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         id: set-matrix
         with:
           script: |

.github/workflows/merged-notification.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'github/docs' && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch && github.event.pull_request.user.login != 'docs-bot'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           script: |
             github.rest.issues.createComment({

.github/workflows/move-existing-issues-to-the-correct-repo.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'github/docs-internal'
     steps:
       - id: move_to_correct_repo
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         env:
           TEAM_ENGINEERING_REPO: ${{ secrets.TEAM_ENGINEERING_REPO }}
           TEAM_CONTENT_REPO: ${{ secrets.TEAM_CONTENT_REPO }}

.github/workflows/move-reopened-issues-to-triage.yaml

@@ -18,7 +18,7 @@ jobs:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           script: |
             const issueNumber = context.issue.number;

.github/workflows/notify-when-maintainers-cannot-edit.yaml

@@ -19,7 +19,7 @@ jobs:
     if: github.repository == 'github/docs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           script: |
             const query = `

.github/workflows/os-ready-for-review.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Check if this run was triggered by a member of the docs team
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         id: triggered-by-member
         with:
           github-token: ${{secrets.DOCS_BOT_PAT_BASE}}

.github/workflows/repo-sync.yml

@@ -36,7 +36,7 @@ jobs:
           github_token: ${{ secrets.DOCS_BOT_PAT_REPO_SYNC }}
 
       - name: Ship pull request
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_REPO_SYNC }}
           result-encoding: string

.github/workflows/sme-review-tracking-issue.yml

@@ -24,7 +24,7 @@ jobs:
       - id: create-issue
         env:
           URL: ${{ github.event.pull_request.html_url || github.event.issue.html_url }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         with:
           github-token: ${{ secrets.DOCS_BOT_PAT_BASE }}
           script: |-

.github/workflows/triage-issue-comments.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Check if the event originated from a team member
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
         id: is-internal-contributor
         with:
           result-encoding: string

content/contributing/style-guide-and-content-model/reference-content-type.md

@@ -1,6 +1,8 @@
 ---
 title: Reference content type
 intro: Reference content provides detailed information that people need while they are actively using a feature.
+redirect_from:
+  - /contributing/style-guide-and-content-model/referential-content-type
 versions:
   fpt: '*'
   ghec: '*'

content/copilot/reference/copilot-allowlist-reference.md

@@ -24,18 +24,20 @@ If your company employs security measures like a firewall or proxy server, you s
 | `https://github.com/enterprises/YOUR-ENTERPRISE/*`          | Authentication for {% data variables.enterprise.prodname_managed_users %}, only required with {% data variables.product.prodname_emus %} |
 | `https://api.github.com/user`                               | User Management |
 | `https://api.github.com/copilot_internal/*`                 | User Management |
-| `https://copilot-telemetry.githubusercontent.com/telemetry` | Telemetry |
 | `https://collector.github.com/*`                            | Analytics telemetry |
-| `https://default.exp-tas.com`                               | Telemetry |
+| `https://copilot-telemetry.githubusercontent.com/telemetry` | {% data variables.product.prodname_copilot_short %} client telemetry |
+| `https://default.exp-tas.com`                               | {% data variables.product.prodname_copilot_short %} client experimentation |
 | `https://copilot-proxy.githubusercontent.com`               | API service for {% data variables.product.prodname_copilot_short %} suggestions |
 | `https://origin-tracker.githubusercontent.com`              | API service for {% data variables.product.prodname_copilot_short %} suggestions |
 | `https://*.githubcopilot.com/*`[^1]                         | API service for {% data variables.product.prodname_copilot_short %} suggestions |
 | `https://*.individual.githubcopilot.com`[^2]                | API service for {% data variables.product.prodname_copilot_short %} suggestions |
 | `https://*.business.githubcopilot.com`[^3]                  | API service for {% data variables.product.prodname_copilot_short %} suggestions |
 | `https://*.enterprise.githubcopilot.com`[^4]                | API service for {% data variables.product.prodname_copilot_short %} suggestions |
-| `https://*.SUBDOMAIN.ghe.com`                                      | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
-| `https://SUBDOMAIN.ghe.com`                                        | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
-| `https://copilot-reports-*.b01.azurefd.net`                        | {% data variables.product.prodname_copilot_short %} usage metrics report downloads |
+| `https://*.SUBDOMAIN.ghe.com`                               | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
+| `https://SUBDOMAIN.ghe.com`                                 | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
+| `https://copilot-reports.github.com`                        | {% data variables.product.prodname_copilot_short %} usage metrics report downloads |
+| `https://copilot-reports-*.b01.azurefd.net`[^5]             | {% data variables.product.prodname_copilot_short %} usage metrics report downloads (fallback) |
+| `https://usagereports*.blob.core.windows.net`[^6]           | {% data variables.product.prodname_copilot_short %} usage metrics report downloads (fallback) |
 
 Depending on the security policies and editors your organization uses, you may need to allowlist additional domains and URLs. For more information on specific editors, see [Further reading](#further-reading).
 
@@ -397,3 +399,5 @@ The allowlist allows access to the following hosts:
 [^2]: Allows access to authorized users via a {% data variables.copilot.copilot_individuals_short %} plan. Do not add this URL to your allowlist if you are using subscription-based network routing.
 [^3]: Allows access to authorized users via a {% data variables.copilot.copilot_business_short %} plan. Do not add this URL to your allowlist if you want to use subscription-based network routing to block users from using {% data variables.copilot.copilot_business_short %} on your network.
 [^4]: Allows access to authorized users via a {% data variables.copilot.copilot_enterprise_short %} plan. Do not add this URL to your allowlist if you want to use subscription-based network routing to block users from using {% data variables.copilot.copilot_enterprise_short %} on your network.
+[^5]: Required for fallback scenarios where {% data variables.product.prodname_copilot_short %} usage metrics report downloads bypass the custom domain and are served from an Azure Front Door CDN.
+[^6]: Required for fallback scenarios where {% data variables.product.prodname_copilot_short %} usage metrics report downloads bypass the Azure Front Door CDN and are served directly from Azure Blob Storage.

eslint.config.ts

@@ -100,8 +100,8 @@ export default [
       // Disabled rules to review
       'no-console': 'off', // 800+
 
-      // Custom rules (disabled by default for now)
-      'custom-rules/use-custom-logger': 'off',
+      // Custom rules
+      'custom-rules/use-custom-logger': 'error',
 
       // Prevent direct res.redirect() usage — use res.safeRedirect() instead
       // to avoid open redirect vulnerabilities via protocol-relative URLs.
@@ -169,6 +169,36 @@ export default [
     },
   },
 
+  // Directories not yet migrated to structured logger (see github/docs-engineering#5639)
+  // Remove directories from this list as they are migrated
+  {
+    files: [
+      'src/ai-tools/**/*.{ts,js}',
+      'src/article-api/**/*.{ts,js}',
+      'src/audit-logs/**/*.{ts,js}',
+      'src/changelogs/**/*.{ts,js}',
+      'src/color-schemes/**/*.{ts,js}',
+      'src/content-render/**/*.{ts,js}',
+      'src/data-directory/**/*.{ts,js}',
+      'src/dev-toc/**/*.{ts,js}',
+      'src/events/**/*.{ts,js}',
+      'src/fixtures/**/*.{ts,js}',
+      'src/frame/**/*.{ts,js}',
+      'src/github-apps/**/*.{ts,js}',
+      'src/journeys/**/*.{ts,js}',
+      'src/languages/**/*.{ts,js}',
+      'src/links/**/*.{ts,js}',
+      'src/metrics/**/*.{ts,js}',
+      'src/observability/**/*.{ts,js}',
+      'src/rest/**/*.{ts,js}',
+      'src/search/**/*.{ts,js}',
+      'src/shielding/**/*.{ts,js}',
+    ],
+    rules: {
+      'custom-rules/use-custom-logger': 'off',
+    },
+  },
+
   // Override for scripts, tests, workflows, content-linter, and React files (disable custom logger rule)
   {
     files: [