Merge branch 'main' into patch-1

Author: Sharra-writes

.github/CODEOWNERS

@@ -6,9 +6,5 @@
 # Site Policy
 content/site-policy/ @github/site-policy-admins
 
-# Enterprise
-data/release-notes/**/*.yml @github/docs-content-enterprise
-src/ghes-releases/lib/enterprise-dates.json @github/docs-content-enterprise
-
 # Requires review of #actions-oidc-integration, docs-engineering/issues/1506
 # content/actions/deployment/security-hardening-your-deployments/** @github/oidc

.github/actions/clone-translations/action.yml

@@ -11,56 +11,56 @@ runs:
   using: 'composite'
   steps:
     - name: Clone Spanish
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.es-es
         token: ${{ inputs.token }}
         path: translations/es-es
 
     - name: Clone Japanese
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.ja-jp
         token: ${{ inputs.token }}
         path: translations/ja-jp
 
     - name: Clone Portuguese
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.pt-br
         token: ${{ inputs.token }}
         path: translations/pt-br
 
     - name: Clone Simplified Chinese
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.zh-cn
         token: ${{ inputs.token }}
         path: translations/zh-cn
 
     - name: Clone Russian
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.ru-ru
         token: ${{ inputs.token }}
         path: translations/ru-ru
 
     - name: Clone French
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.fr-fr
         token: ${{ inputs.token }}
         path: translations/fr-fr
 
     - name: Clone Korean
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.ko-kr
         token: ${{ inputs.token }}
         path: translations/ko-kr
 
     - name: Clone German
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-internal.de-de
         token: ${{ inputs.token }}

.github/actions/create-workflow-failure-issue/action.yml

@@ -89,5 +89,6 @@ runs:
         gh issue create \
           --repo "$ISSUE_REPO" \
           --label "workflow-failure" \
+          --label "workflow-generated" \
           --title "[Workflow Failure] $WORKFLOW_NAME" \
           --body "$body"

.github/actions/get-docs-early-access/action.yml

@@ -19,7 +19,7 @@ runs:
       run: npm run what-docs-early-access-branch
 
     - name: Clone
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         repository: github/docs-early-access
         token: ${{ inputs.token }}

.github/actions/slack-alert/action.yml

@@ -2,28 +2,27 @@ name: Send Slack notification if workflow fails
 description: Send Slack notification if workflow fails
 
 inputs:
-  slack_channel_id:
-    description: Slack channel ID
-    required: true
   slack_token:
     description: Slack token
     required: true
+  slack_channel_id:
+    description: Slack channel ID. Defaults to the docs-alerts channel (CG5MJHMB2).
+    default: CG5MJHMB2 # docs-alerts
+    required: false
   message:
     description: The message to send to Slack
     default: The last '${{ github.workflow }}' run failed. See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
     required: false
-  color:
-    description: The color of the Slack message
-    default: failure
-    required: false
 
 runs:
   using: composite
   steps:
     - name: Send Slack notification if workflow fails
-      uses: someimportantcompany/github-actions-slack-message@a975b440de2bcef178d451cc70d4c1161b5a30cd
+      uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
       with:
-        channel: ${{ inputs.slack_channel_id }}
-        bot-token: ${{ inputs.slack_token }}
-        color: ${{ inputs.color }}
-        text: ${{ inputs.message }}
+        method: chat.postMessage
+        token: ${{ inputs.slack_token }}
+        errors: true
+        payload: |
+          channel: ${{ toJSON(inputs.slack_channel_id) }}
+          text: ${{ toJSON(inputs.message) }}

.github/copilot-instructions.md

@@ -31,6 +31,10 @@ updates:
       day: tuesday
     cooldown:
       default-days: 7
+    groups:
+      actions:
+        patterns:
+          - '*'
     ignore:
       - dependency-name: '*'
         update-types:

.github/dependabot.yml

@@ -4,7 +4,7 @@ applyTo: "**"
 
 # Copilot instructions for docs.github.com
 
-This repository contains code to run the GitHub Docs site on docs.github.com, as well as the content that the site displays. We write the code in JavaScript and TypeScript, and we write the content primarily in Markdown.
+This repository powers the GitHub Docs site (docs.github.com). It contains both the Next.js application code (TypeScript) and the documentation content (Markdown).
 
 ## Creating a pull request
 
@@ -29,6 +29,8 @@ When you create a pull request:
 3. Label with "llm-generated". 
 4. If an issue exists, include "fixes owner/repo#issue" or "towards owner/repo#issue" as appropriate. 
 5. Always create PRs in **draft mode** using `--draft` flag.
+6. Do not commit directly to `main`.
+7. Whenever you create or comment on an issue or pull request, indicate you are GitHub Copilot.
 
 ## Accessing docs.github.com content programmatically
 

.github/instructions/all.instructions.md

@@ -4,21 +4,23 @@ applyTo: "src/**,.github/**,config/**,.devcontainer/**,**Dockerfile,package*.jso
 
 # Copilot code instructions for docs.github.com
 
-For code reviews, follow guidelines, tests, and validate instructions. For creating or updating pull requests or branches, follow the steps instructions.
+For code reviews and for creating or updating pull requests, follow the Guidelines, Tests, and Validate sections below.
 
 ## Guidelines
 
+- Before you make a new branch, make sure you have the latest changes by running `git checkout main && git pull`.
 - If available, use ripgrep (`rg`) instead of `grep`.
 - When using gh cli in double-quoted strings, escape backticks to prevent bash command substitution. In single-quoted strings, backticks do not need escaping.
 - All scripts should be listed in `package.json` and use `tsx`.
-- Whenever you create or comment on an issue or pull request, indicate you are GitHub Copilot.
 - Be careful fetching full HTML pages off the internet. Prefer to use MCP or gh cli whenever possible for github.com. Limit the number of tokens when grabbing HTML.
 - Avoid pull requests with over 300 lines of code changed. When significantly larger, offer to split up into smaller pull requests if possible.
 - All new code should be written in TypeScript and not JavaScript.
 - We use absolute imports, relative to the `src` directory, using the `@` symbol. For example, `getRedirect` which lives in `src/redirects/lib/get-redirect.ts` can be imported with `import getRedirect from '@/redirects/lib/get-redirect'`. The same rule applies for TypeScript (`.ts`) imports, e.g. `import type { GeneralSearchHit } from '@/search/types'`
 - For updates to the content linter, read important information in `src/content-linter/README.md`.
-- Do not commit to `main` branch.
 - Do not use git force push, and avoid git rebase.
+- When reading issues and pull requests, read all comments as well.
+- When you are updating an existing pull request, after you commit and push, _concisely_ comment on the pull request that you are GitHub Copilot and what changes you made and why.
+- When running in agentic mode, offer the human the option to wait for and review CI checks and automatic Copilot code review comments.
 
 ## Tests
 
@@ -81,30 +83,6 @@ Run the following commands to validate your changes:
 - `npm run prettier`
 - `npm run lint`: you can include `-- --fix`
 
-## Steps
-
-0. Ask the human if they would like you to follow these steps.
-1. If this is new work, make sure you have the latest changes by running `git checkout main && git pull`. If this is existing work, update the branch you are working on with the head branch -- usually `main`.
-2. If the human provides a GitHub issue, use MCP or gh cli to read the issue and all comments.
-3. Begin by evaluating impact, effort, and estimate non-test lines of code that will change. Ask for more context and examples if needed.
-4. If you are running in agentic mode, _stop_ at this point and request approval from the human.
-5. If you need to add or change tests, work on tests before implementing.
-6. Implement the changes needed. If you are running in agentic mode, _stop_ and ask questions at decision points. Please list the options, pros and cons for each decision needed.
-7. Validate your changes before making any commits. See "Validate".
-8. Validate that any new or changed tests pass. See "Tests".
-9. Validate that these changes meet our guidelines. See "Guidelines".
-10. If you are running in agentic mode, _stop_ at this point and request review before continuing. Suggest how the human should review the changes.
-11. If a branch and pull request already exist, commit and push, then _concisely_ comment on the pull request that you are GitHub Copilot and what changes you made and why.
-12. If this is new work and no pull request exists yet, make a pull request:
-    - label "llm-generated"
-    - draft mode
-    - include "fixes owner/repo#issue" or "towards owner/repo#issue" as appropriate
-13. If you are in agentic mode, offer to wait for CI to run and check that it passes. If the human agrees, verify in CI: `sleep 240 && gh pr checks $number`. Address all failures, don't assume they're flakes.
-14. If you are in agentic mode, offer to do any or all of:
-    - mark the pull request as ready,
-    - assign the issue to the human if it is not already assigned,
-    - _concisely_ comment on the issue explaining the change, indicating you are GitHub Copilot.
-
 ## Logger
 
 Use `createLogger` from `@/observability/logger` instead of `console.log` in server-side code.

.github/instructions/code.instructions.md

@@ -92,3 +92,61 @@ Examples:
 * ❌ Incorrect: "The cat – which sat on a branch – smiled with a broad grin." (en dash with spaces)
 * ❌ Incorrect: "The cat-which sat on a branch-smiled with a broad grin." (hyphen without spaces)
 * ❌ Incorrect: "The cat - which sat on a branch - smiled with a broad grin." (hyphen with spaces)
+
+## Versioning
+
+Avoid `{% ifversion fpt %}`, `{% ifversion ghec %}`, and `{% ifversion fpt or ghec %}` in content files whenever possible. Instead of suggesting or adding version-gating within an article:
+
+* Write content that applies to all versions the article is versioned for
+* If content is truly version-specific, consider whether it is low-harm to show it to all readers (e.g., an enterprise-only row in a reference table)
+* Only use `{% ifversion %}` as a last resort when content would be actively misleading for readers on a different version
+
+**FPT and GHEC content**: When dotcom content applies to both products, version the page for `fpt` and `ghec` in the frontmatter. Do NOT use in-article Liquid versioning. Do NOT suggest adding `{% ifversion fpt or ghec %}` blocks as a fix for content that mentions a dotcom-only feature. Instead, suggest rewriting the content using the alternatives to inline versioning options listed below.
+
+**GHES content**: If versioning is necessary for GitHub Enterprise Server content, use feature-based versioning (FBV). GHES content should rely on feature flags defined in `data/features/` rather than inline `{% ifversion ghes %}` blocks. Feature flags allow centralized control of when content appears for specific GHES releases.
+
+### Alternatives to inline versioning
+
+Before resorting to in-article versioning, first consider whether the content is actually different across versions. Often procedures can be simplified to work at both levels.
+
+Use these strategies instead of `{% ifversion %}`, depending on the level of content:
+
+**At the article level:**
+
+* When the feature is only available in certain products, use the "Who can use this feature?" box to convey that the content of the article applies only to specific products
+* When an article only exists because the functionality is only available in older GHES releases (and not on {% data variables.product.prodname_dotcom_the_website %} or newer GHES releases), just remove that article
+
+**At the heading level:**
+
+* Use prose similar to "Who can use this feature?" to convey that the content of a section applies only to specific products
+
+**At the paragraph or sentence level:**
+
+* If you're briefly introducing a feature and then linking to an article, there's no need to specify versioning. Let readers learn availability when they follow the link, via the "Who can use this feature?" box
+* When necessary, start sentences with "With {% data variables.product.prodname_ghe_cloud %}...", "On {% data variables.product.prodname_dotcom_the_website %}...", etc.
+* End list items with "({% data variables.product.prodname_ghe_cloud %} only)", "({% data variables.product.prodname_dotcom_the_website %} only)", etc.
+* Specify if the feature is not available for GHES with "NAME-OF-FEATURE is not available for {% data variables.product.prodname_ghe_server %}", "... (not available in {% data variables.product.prodname_ghe_server %})", etc.
+
+### Example
+
+When documenting a feature that only applies to dotcom (not GHES):
+
+❌ Don't wrap content in version blocks:
+
+```markdown
+{% ifversion fpt or ghec %}
+
+## Immutable subject claims
+
+Repositories created after July 15, 2026 now use an immutable default subject format.
+
+{% endif %}
+```
+
+✅ Do use prose to indicate availability:
+
+```markdown
+## Immutable subject claims
+
+Repositories created after July 15, 2026 now use an immutable default subject format. This rollout does not include {% data variables.product.prodname_ghe_server %}.
+```