Merge branch 'main' into copilot-enterprise-megabranch

.github/workflows/alert-changed-branch-protections.yml

@@ -1,6 +1,7 @@
 name: Alert Changed Branch Protections
 
 on:
+  branch_protection_rule:
   workflow_dispatch:
 
 permissions:
@@ -22,6 +23,8 @@ jobs:
 
       - name: Fetch branch protections
         id: fetch
+        env:
+          GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WORKFLOW }}
         run: |
           # Fetch branch protections and store them in a file
           gh api /repos/GitHub/docs-internal/branches/${{ matrix.branch }}/protection > ${{ matrix.branch }}-actual.json
@@ -35,10 +38,10 @@ jobs:
         id: compare
         run: |
           # Compare the fetched branch protections with the committed ones
-          git diff --no-index .github/branch_protection_settings/${{ matrix.branch }}.json ${{ matrix.branch }}-actual.json > ${{ matrix.branch }}-diff.tmp
+          git diff --no-index .github/branch_protection_settings/${{ matrix.branch }}.json ${{ matrix.branch }}-actual.json
 
       - uses: ./.github/actions/slack-alert
-        if: ${{ steps.compare.outputs.exit-code != 0 && github.event_name != 'workflow_dispatch' }}
+        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
         with:
           slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

content/actions/automating-builds-and-tests/building-and-testing-nodejs.md

@@ -136,7 +136,7 @@ jobs:
       - name: Use Node.js
         uses: {% data reusables.actions.action-setup-node %}
         with:
-          node-version: '20.x'
+          node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test
@@ -161,7 +161,7 @@ steps:
 - name: Use Node.js
   uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
 - name: Install dependencies
   run: npm ci
 ```
@@ -174,7 +174,7 @@ steps:
 - name: Use Node.js
   uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
 - name: Install dependencies
   run: npm install
 ```
@@ -189,7 +189,7 @@ steps:
 - name: Use Node.js
   uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
 - name: Install dependencies
   run: yarn --frozen-lockfile
 ```
@@ -202,7 +202,7 @@ steps:
 - name: Use Node.js
   uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
 - name: Install dependencies
   run: yarn
 ```
@@ -224,7 +224,7 @@ steps:
   uses: {% data reusables.actions.action-setup-node %}
   with:
     always-auth: true
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
     registry-url: https://registry.npmjs.org
     scope: '@octocat'
 - name: Install dependencies
@@ -254,7 +254,7 @@ steps:
 - uses: {% data reusables.actions.action-checkout %}
 - uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20'
+    node-version: {% ifversion actions-node20-support %}'20'{% else %}'14'{% endif %}
     cache: 'npm'
 - run: npm install
 - run: npm test
@@ -267,7 +267,7 @@ steps:
 - uses: {% data reusables.actions.action-checkout %}
 - uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20'
+    node-version: {% ifversion actions-node20-support %}'20'{% else %}'14'{% endif %}
     cache: 'yarn'
 - run: yarn
 - run: yarn test
@@ -287,7 +287,7 @@ steps:
     version: 6.10.0
 - uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20'
+    node-version: {% ifversion actions-node20-support %}'20'{% else %}'14'{% endif %}
     cache: 'pnpm'
 - run: pnpm install
 - run: pnpm test
@@ -307,7 +307,7 @@ steps:
 - name: Use Node.js
   uses: {% data reusables.actions.action-setup-node %}
   with:
-    node-version: '20.x'
+    node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'18.x'{% endif %}
 - run: npm install
 - run: npm run build --if-present
 - run: npm test

content/actions/automating-builds-and-tests/building-and-testing-ruby.md

@@ -187,8 +187,8 @@ To enable caching, set the following.
 ```yaml
 steps:
 - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
-    with:
-      bundler-cache: true
+  with:
+    bundler-cache: true
 ```
 
 {% endraw %}

content/actions/creating-actions/creating-a-javascript-action.md

@@ -16,7 +16,7 @@ topics:
   - Action development
   - JavaScript
 ---
- 
+
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Introduction
@@ -35,7 +35,7 @@ Once you complete this project, you should understand how to build your own Java
 
 Before you begin, you'll need to download Node.js and create a public {% data variables.product.prodname_dotcom %} repository.
 
-1. Download and install Node.js 20.x, which includes npm.
+1. Download and install Node.js {% ifversion actions-node20-support %}20.x{% else %}16.x{% endif %}, which includes npm.
 
    https://nodejs.org/en/download/
 1. Create a new public repository on {% data variables.location.product_location %} and call it "hello-world-javascript-action". For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/creating-a-new-repository)."
@@ -70,7 +70,7 @@ outputs:
   time: # id of output
     description: 'The time we greeted you'
 runs:
-  using: 'node20'
+  using: {% ifversion actions-node20-support %}'node20'{% else %}'node16'{% endif %}
   main: 'index.js'
 ```
 
@@ -184,11 +184,11 @@ git push --follow-tags
 Checking in your `node_modules` directory can cause problems. As an alternative, you can use a tool called [`@vercel/ncc`](https://github.com/vercel/ncc) to compile your code and modules into one file used for distribution.
 
 1. Install `vercel/ncc` by running this command in your terminal.
-  
+
    `npm i -g @vercel/ncc`
 
 1. Compile your `index.js` file.
-  
+
    `ncc build index.js --license licenses.txt`
 
    You'll see a new `dist/index.js` file with your code and the compiled modules. You will also see an accompanying `dist/licenses.txt` file containing all the licenses of the `node_modules` you are using.

content/actions/creating-actions/metadata-syntax-for-github-actions.md

@@ -156,11 +156,11 @@ For more information on how to use context syntax, see "[AUTOTITLE](/actions/lea
 
 **Required** Configures the path to the action's code and the runtime used to execute the code.
 
-### Example: Using Node.js v20
+### Example: Using Node.js {% ifversion actions-node20-support %}v20{% else %}v16{% endif %}
 
 ```yaml
 runs:
-  using: 'node20'
+  using: {% ifversion actions-node20-support %}'node20'{% else %}'node16'{% endif %}
   main: 'main.js'
 ```
 
@@ -168,7 +168,7 @@ runs:
 
 **Required** The runtime used to execute the code specified in [`main`](#runsmain).
 
-- Use `node20` for Node.js v20.
+- Use {% ifversion actions-node20-support %}`node20` for Node.js v20{% else %}`node16` for Node.js v16{% endif %}.
 
 ### `runs.main`
 
@@ -182,7 +182,7 @@ In this example, the `pre:` action runs a script called `setup.js`:
 
 ```yaml
 runs:
-  using: 'node20'
+  using: {% ifversion actions-node20-support %}'node20'{% else %}'node16'{% endif %}
   pre: 'setup.js'
   main: 'index.js'
   post: 'cleanup.js'
@@ -209,7 +209,7 @@ In this example, the `post:` action runs a script called `cleanup.js`:
 
 ```yaml
 runs:
-  using: 'node20'
+  using: {% ifversion actions-node20-support %}'node20'{% else %}'node16'{% endif %}
   main: 'index.js'
   post: 'cleanup.js'
 ```

content/actions/publishing-packages/publishing-nodejs-packages.md

@@ -17,7 +17,7 @@ topics:
   - Node
   - JavaScript
 ---
- 
+
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Introduction
@@ -72,7 +72,7 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: {% data reusables.actions.action-setup-node %}
         with:
-          node-version: '20.x'
+          node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'16.x'{% endif %}
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
       - run: npm publish
@@ -135,7 +135,7 @@ jobs:
       # Setup .npmrc file to publish to GitHub Packages
       - uses: {% data reusables.actions.action-setup-node %}
         with:
-          node-version: '20.x'
+          node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'16.x'{% endif %}
           registry-url: 'https://npm.pkg.github.com'
           # Defaults to the user or organization that owns the workflow file
           scope: '@octocat'
@@ -170,7 +170,7 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: {% data reusables.actions.action-setup-node %}
         with:
-          node-version: '20.x'
+          node-version: {% ifversion actions-node20-support %}'20.x'{% else %}'16.x'{% endif %}
           registry-url: 'https://registry.npmjs.org'
           # Defaults to the user or organization that owns the workflow file
           scope: '@octocat'

content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -26,7 +26,7 @@ You can set up a trial to evaluate the additional features that come with {% dat
 
 You can set up a {% data reusables.copilot.trial-period %}-day trial to evaluate {% data variables.product.prodname_ghe_cloud %}. Your trial includes an enterprise account, which allows you to manage multiple organizations. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts)."
 
-During the trial, you can add up to three new organizations to your enterprise. There are no limitations on the number of existing organizations you can transfer to your enterprise. For existing organizations, billing is paused during the trial and any coupons are removed. To reapply a coupon, contact {% data variables.contact.contact_enterprise_sales %}. Organizations created during the trial cannot be removed from the enterprise account until after you purchase {% data variables.product.prodname_enterprise %}.
+During the trial, you can add up to three new organizations to your enterprise. You can transfer any number of existing organizations to your enterprise as part of the trial, so long as those organizations do not have any free or paid {% data variables.product.prodname_marketplace %} apps. For existing organizations, billing is paused during the trial and any coupons are removed. To reapply a coupon, contact {% data variables.contact.contact_enterprise_sales %}. Organizations created during the trial cannot be removed from the enterprise account until after you purchase {% data variables.product.prodname_enterprise %}.
 
 Your trial also includes 50 seats. If you need more seats to evaluate {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. At the end of the trial, you can choose a different number of seats, up to 1,000.
 
@@ -44,7 +44,7 @@ The following features are not included in the trial of {% data variables.produc
 - {% data variables.product.prodname_github_codespaces %}
 - {% data variables.product.prodname_copilot_for_business %} or {% data variables.product.prodname_copilot_enterprise %}
 - {% data variables.product.prodname_sponsors %}
-- Paid {% data variables.product.prodname_marketplace %} apps (free apps are supported as part of the trial)
+- Paid {% data variables.product.prodname_marketplace %} apps (free apps are supported for new organizations as part of the trial)
 - {% data variables.product.prodname_github_connect %}
 - For {% data variables.product.prodname_actions %}, increased minutes, job concurrency, and {% data variables.actions.hosted_runner %}s
 - If you set up your own trial, access to {% data variables.product.prodname_ghe_server %} is not included. If you would like to use {% data variables.product.prodname_ghe_server %}, contact {% data variables.contact.contact_enterprise_sales %}.

content/code-security/security-advisories/working-with-repository-security-advisories/deleting-a-repository-security-advisory.md

@@ -1,11 +1,12 @@
 ---
-title: Withdrawing a repository security advisory
-intro: You can withdraw a repository security advisory that you've published.
+title: Deleting a repository security advisory
+intro: You can delete a repository security advisory that you've published by contacting Support.
 redirect_from:
   - /github/managing-security-vulnerabilities/withdrawing-a-security-advisory
   - /code-security/security-advisories/withdrawing-a-security-advisory
   - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory
   - /code-security/security-advisories/repository-security-advisories/withdrawing-a-repository-security-advisory
+  - /code-security/security-advisories/working-with-repository-security-advisories/withdrawing-a-repository-security-advisory
 versions:
   fpt: '*'
   ghec: '*'
@@ -13,12 +14,12 @@ type: how_to
 topics:
   - Security advisories
   - Vulnerabilities
-shortTitle: Withdraw repository advisories
+shortTitle: Delete repository advisories
 ---
 
 {% data reusables.security-advisory.repository-level-advisory-note %}
 
-If you publish a security advisory in error, you can withdraw the security advisory by contacting {% data variables.contact.contact_support %}.
+If you publish a security advisory in error, you can delete the security advisory by contacting {% data variables.contact.contact_support %}.
 
 ## Further reading
 

content/code-security/security-advisories/working-with-repository-security-advisories/editing-a-repository-security-advisory.md

@@ -48,4 +48,4 @@ You can also use the REST API to edit repository security advisories. For more i
 
 ## Further reading
 
-- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/withdrawing-a-repository-security-advisory)"
+- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/deleting-a-repository-security-advisory)"

content/code-security/security-advisories/working-with-repository-security-advisories/index.md

@@ -27,7 +27,7 @@ children:
   - /publishing-a-repository-security-advisory
   - /adding-a-collaborator-to-a-repository-security-advisory
   - /removing-a-collaborator-from-a-repository-security-advisory
-  - /withdrawing-a-repository-security-advisory
+  - /deleting-a-repository-security-advisory
 ---
 
 {% data reusables.security-advisory.private-repository-non-ghas-deprecation-note %}

content/code-security/security-advisories/working-with-repository-security-advisories/permission-levels-for-repository-security-advisories.md

@@ -43,4 +43,4 @@ Publish the security advisory (see "[AUTOTITLE](/code-security/security-advisori
 - "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/adding-a-collaborator-to-a-repository-security-advisory)"
 - "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-repository-security-vulnerability)"
 - "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory)"
-- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/withdrawing-a-repository-security-advisory)"
+- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/deleting-a-repository-security-advisory)"

content/code-security/security-advisories/working-with-repository-security-advisories/publishing-a-repository-security-advisory.md

@@ -102,4 +102,4 @@ Publishing a security advisory deletes the temporary private fork for the securi
 
 ## Further reading
 
-- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/withdrawing-a-repository-security-advisory)"
+- "[AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/deleting-a-repository-security-advisory)"

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md

@@ -38,6 +38,18 @@ If you set up an allow list you can also choose to automatically add to your all
 
 You can also configure allowed IP addresses at the enterprise account level, and the entries in the enterprise account's allow list are inherited by all the organizations owned by the enterprise. {% data reusables.identity-and-permissions.org-enterprise-allow-list-interaction %} For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)."
 
+{% warning %}
+
+**Warning:** Losing access to the IP addresses in your IP allow list could result in unintended consequences, such as getting locked out of your enterprise or organization.
+
+{% endwarning %}
+
+As a best practice, to ensure both secure and reliable access to your enterprise and organization resources when creating an IP allow list, consider the following:
+
+- Maintaining more than one owner of the enterprise account or organization that the IP allow list will be enforced for.
+- Using CIDR notation to specify a range of IP addresses that will include dynamically assigned addresses, to minimize the number of allow list entries.
+- Including a static network in your allowed IP addresses, for backup access in case of problems.
+
 ## Adding an allowed IP address
 
 {% data reusables.identity-and-permissions.about-adding-ip-allow-list-entries %}

content/sponsors/receiving-sponsorships-through-github-sponsors/enabling-sponsorships-through-patreon.md

@@ -15,8 +15,20 @@ shortTitle: Enable Patreon sponsorships
 
 - Create a Patreon account. For more information, see [Start my creator page on Patreon](https://support.patreon.com/hc/en-us/articles/115002958403-Start-my-creator-page-on-Patreon) in the Patreon documentation.
 - Set up a paid membership tier on Patreon. For more information, see [How to set up paid tiers and benefits](https://support.patreon.com/hc/en-us/articles/203913559-How-to-set-up-paid-tiers-and-benefits) in the Patreon documentation.
+- Publish your Patreon creator page and tiers.
 - Link your Patreon account to your {% data variables.product.prodname_dotcom %} account. For more information, see "[Linking your Patreon account to your {% data variables.product.prodname_dotcom %} account](#linking-your-patreon-account-to-your-github-account)."
+- Set up {% data variables.product.prodname_sponsors %} for your personal account or for your organization. For more information, see "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-personal-account)" or "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization)."
 
 ## Linking your Patreon account to your {% data variables.product.prodname_dotcom %} account
 
-{% data reusables.sponsors.link-patreon-account %} You can now receive sponsorships through Patreon on {% data variables.product.prodname_dotcom %}.
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.account_settings %}
+{% data reusables.sponsors.accept-payments-through-patreon %}
+1. Click **Allow people to pay you through Patreon**. Then click **Update Patreon preferences**.
+
+## Linking your Patreon account to your organization
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+{% data reusables.sponsors.accept-payments-through-patreon %}
+1. Click **Allow people to pay you through Patreon**. Then click **Update Patreon preferences**.

content/sponsors/receiving-sponsorships-through-github-sponsors/unlinking-your-patreon-account-from-your-github-sponsors-profile.md

@@ -13,8 +13,34 @@ shortTitle: Unlink Patreon
 
 {% note %}
 
-**Note:** Unlinking your Patreon account from your {% data variables.product.prodname_sponsors %} profile will prevent new sponsors from sponsoring you through Patreon, but it **will not** cancel existing sponsorships through Patreon. Instead, your sponsors will have to cancel those sponsorships themselves. For more information, see [How do I cancel?](https://support.patreon.com/hc/en-us/articles/360005502572-How-do-I-cancel-) in the Patreon documentation.
+**Note:** Unlinking your Patreon account from your {% data variables.product.prodname_sponsors %} profile will prevent new sponsors from sponsoring you through Patreon, but it **will not** cancel existing sponsorships through Patreon. Instead, they will appear as cancelled on {% data variables.product.prodname_dotcom_the_website %} and your sponsors will have to cancel those sponsorships themselves on Patreon. For more information, see [How do I cancel?](https://support.patreon.com/hc/en-us/articles/360005502572-How-do-I-cancel-) in the Patreon documentation.
 
 {% endnote %}
 
+## Unlinking your Patreon account from your {% data variables.product.company_short %} account
+
 {% data reusables.sponsors.unlink-patreon-account %}
+
+## Unlinking your Patreon account from your organization
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+1. In the "Unlink Patreon account" section, click **Unlink Patreon account**.
+
+## Using the Patreon feature as a sponsor on your {% data variables.product.company_short %} account
+
+It is possible to stop receiving sponsorships through Patreon without unlinking your Patreon account from your {% data variables.product.prodname_sponsors %} profile. This allows you to use the Patreon feature as a sponsor and continue to get credit for any Patreon sponsorships you are funding.
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.account_settings %}
+1. Under "Unlink Patreon account," uncheck **Allow people to pay you through Patreon**.
+1. Click **Update Patreon preferences**.
+
+## Using the Patreon feature as a sponsor on your organization
+
+It is possible to stop receiving sponsorships through Patreon without unlinking your Patreon account from your organization. This allows you to use the Patreon feature as a sponsor and continue to get credit for any Patreon sponsorships your organization is funding.
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+1. Under "Unlink Patreon account," uncheck **Allow people to pay you through Patreon**.
+1. Click **Update Patreon preferences**.

content/sponsors/sponsoring-open-source-contributors/index.md

@@ -15,6 +15,7 @@ children:
   - /managing-your-sponsorship
   - /attributing-sponsorships-to-your-organization
   - /paying-for-github-sponsors-by-invoice
-  - /unlinking-your-patreon-account-from-your-github-account
+  - /unlinking-your-patreon-account-from-github
 shortTitle: Sponsor contributors
 ---
+

content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor-through-patreon.md

@@ -18,11 +18,19 @@ Rather than paying through {% data variables.product.prodname_dotcom %}, you can
 
 To sponsor through Patreon on {% data variables.product.prodname_dotcom_the_website %}, both you and the selected maintainer must link your Patreon accounts to your {% data variables.product.prodname_dotcom %} accounts. You can then choose to sponsor maintainers through Patreon on {% data variables.product.prodname_dotcom_the_website %}, or you can sponsor the maintainer directly through the Patreon website while receiving recognition on {% data variables.product.prodname_dotcom %}. For more information on sponsoring through the Patreon website, see [Become a patron of a creator](https://support.patreon.com/hc/en-us/articles/203913709-Become-a-patron-of-a-creator) in the Patreon documentation.
 
-Currently, if you sponsor a maintainer through Patreon on {% data variables.product.prodname_dotcom_the_website %}, you can only choose their lowest Patreon tier. However, if you sponsor a maintainer for a higher tier through the Patreon site, you will receive recognition for that sponsorship on {% data variables.product.prodname_dotcom %}.
+{% data variables.product.prodname_dotcom_the_website %} displays all published Patreon sponsorship tiers. Only Patreon sponsorships that respect the maintainer's minimum amount on {% data variables.product.company_short %} will be recognized. If you sponsor a maintainer both on {% data variables.product.company_short %} and Patreon, the higher value sponsorship will be prioritized when describing the relationship between a sponsor and a maintainer.
 
 ## Linking your Patreon account to your {% data variables.product.prodname_dotcom %} account
 
-{% data reusables.sponsors.link-patreon-account %}
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.account_settings %}
+{% data reusables.sponsors.accept-payments-through-patreon %}
+
+## Linking your Patreon account to your organization
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+{% data reusables.sponsors.accept-payments-through-patreon %}
 
 ## Sponsoring through Patreon
 

content/sponsors/sponsoring-open-source-contributors/unlinking-your-patreon-account-from-github.md

@@ -0,0 +1,30 @@
+---
+title: Unlinking your Patreon account from GitHub
+intro: 'You can disconnect your Patreon account from {% data variables.product.prodname_dotcom %} to stop receiving recognition for Patreon sponsorships on {% data variables.product.prodname_dotcom %}.'
+versions:
+  fpt: '*'
+  ghec: '*'
+type: how_to
+topics:
+  - Open Source
+  - Sponsors payments
+shortTitle: Unlink Patreon
+redirect_from:
+  - /sponsors/sponsoring-open-source-contributors/unlinking-your-patreon-account-from-your-github-account
+---
+
+{% note %}
+
+**Note:** Unlinking your Patreon account from {% data variables.product.company_short %} will not cancel any existing sponsorships you have created through Patreon. They will only appear as cancelled on {% data variables.product.prodname_dotcom_the_website %}. To stop sponsoring maintainers through Patreon, see [How do I cancel?](https://support.patreon.com/hc/en-us/articles/360005502572-How-do-I-cancel-) in the Patreon documentation.
+
+{% endnote %}
+
+## Unlinking your Patreon account from your {% data variables.product.company_short %} account
+
+{% data reusables.sponsors.unlink-patreon-account %}
+
+## Unlinking your Patreon account from your organization
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+1. In the "Unlink Patreon account" section, click **Unlink Patreon account**.

content/sponsors/sponsoring-open-source-contributors/unlinking-your-patreon-account-from-your-github-account.md

@@ -1,20 +0,0 @@
----
-title: Unlinking your Patreon account from your GitHub account
-intro: 'You can disconnect your Patreon account from your {% data variables.product.prodname_dotcom %} account to stop receiving recognition for Patreon sponsorships on {% data variables.product.prodname_dotcom %}.'
-versions:
-  fpt: '*'
-  ghec: '*'
-type: how_to
-topics:
-  - Open Source
-  - Sponsors payments
-shortTitle: Unlink Patreon
----
-
-{% note %}
-
-**Note:** Unlinking your Patreon account from your {% data variables.product.prodname_dotcom %} account **will not** cancel any existing sponsorships you have created through Patreon. To stop sponsoring maintainers through Patreon, see [How do I cancel?](https://support.patreon.com/hc/en-us/articles/360005502572-How-do-I-cancel-) in the Patreon documentation.
-
-{% endnote %}
-
-{% data reusables.sponsors.unlink-patreon-account %}

data/features/actions-node20-support.yml

@@ -0,0 +1,6 @@
+# Reference: #13600
+# Versioning for Node20 support for GitHub Actions
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.11'

data/learning-tracks/code-security.yml

@@ -33,7 +33,7 @@ security_advisories:
     - >-
       /code-security/security-advisories/working-with-repository-security-advisories/editing-a-repository-security-advisory
     - >-
-      /code-security/security-advisories/working-with-repository-security-advisories/withdrawing-a-repository-security-advisory
+      /code-security/security-advisories/working-with-repository-security-advisories/deleting-a-repository-security-advisory
     - >-
       /code-security/security-advisories/working-with-repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory
 dependabot_alerts:

data/reusables/code-scanning/codeql-query-tables/java.md

@@ -33,6 +33,8 @@
 | [Disabled Netty HTTP header validation](https://codeql.github.com/codeql-query-help/java/java-netty-http-request-or-response-splitting/) | 93, 113 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | [Disabled Spring CSRF protection](https://codeql.github.com/codeql-query-help/java/java-spring-disabled-csrf-protection/) | 352 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | [Executing a command with a relative path](https://codeql.github.com/codeql-query-help/java/java-relative-path-command/) | 078, 088 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
+| [Exposure of sensitive information to notifications](https://codeql.github.com/codeql-query-help/java/java-android-sensitive-notification/) | 200 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
+| [Exposure of sensitive information to UI text views](https://codeql.github.com/codeql-query-help/java/java-android-sensitive-text/) | 200 | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
 | [Expression language injection (JEXL)](https://codeql.github.com/codeql-query-help/java/java-jexl-expression-injection/) | 094 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | [Expression language injection (MVEL)](https://codeql.github.com/codeql-query-help/java/java-mvel-expression-injection/) | 094 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | [Expression language injection (Spring)](https://codeql.github.com/codeql-query-help/java/java-spel-expression-injection/) | 094 | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |

data/reusables/dependabot/supported-package-managers.md

@@ -45,11 +45,13 @@ Private registry support applies to git registries, and doesn't include cargo re
 
 #### Dev containers
 
-You can use `devcontainers` as a `package-ecosystem` in your `dependabot.yml` file to update Features in your `devcontainer.json` configuration files. Dev containers are used in several tools and services, including {% data variables.product.prodname_codespaces %}. For more information about Features and the supported services, see [Features](https://containers.dev/implementors/features/) and [Supporting tools and services](https://containers.dev/supporting) in the Dev Containers' documentation, respectively.
+You can use `devcontainers` as a `package-ecosystem` in your `dependabot.yml` file to update Features in your `devcontainer.json` configuration files. For more information about this support, and for configuration file examples, see [General Availability of {% data variables.product.prodname_dependabot %} Integration](https://containers.dev/guide/dependabot) in the Development Containers documentation.
+
+Dev containers are used in several tools and services, including {% data variables.product.prodname_codespaces %}. For more information about Features and the supported services, see [Features](https://containers.dev/implementors/features/) and [Supporting tools and services](https://containers.dev/supporting) in the Development Containers documentation, respectively.
 
 This updater ensures Features are pinned to the latest `major` version in the associated `devcontainer.json` file.  If a dev container has a lockfile, that file will also be updated. For more information about lockfile specifications, see [Lockfiles](https://github.com/devcontainers/spec/blob/main/docs/specs/devcontainer-lockfile.md) in the `devcontainers/spec` repository.
 
-Features in any valid dev container location will be updated in a single pull request. For more information about the dev container specification, see [Specification](https://containers.dev/implementors/spec/#devcontainerjson) in the Dev Containers' documentation.
+Features in any valid dev container location will be updated in a single pull request. For more information about the dev container specification, see [Specification](https://containers.dev/implementors/spec/#devcontainerjson) in the Development Containers documentation.
 
 {% endif %}
 

data/reusables/sponsors/accept-payments-through-patreon.md

@@ -1,5 +1,3 @@
-{% data reusables.user-settings.access_settings %}
-{% data reusables.user-settings.account_settings %}
 1. In the "Link Patreon account" section, click **Connect with Patreon**.
 1. Sign into your Patreon account.
 1. To allow {% data variables.product.prodname_dotcom %} to connect with Patreon, in the "{% data variables.product.prodname_dotcom %} would like to..." section, click **Allow**.

src/frame/components/ui/MarkdownContent/stylesheets/table.scss

@@ -86,7 +86,7 @@
       background: none;
     }
 
-    td.has-nested-table {
+    :global(td.has-nested-table) {
       width: 100%;
 
       table {

src/links/lib/excluded-links.js

@@ -71,7 +71,7 @@ export default [
   regex('https://support.patreon.com/'),
   'https://moodle.org',
   'https://azure.microsoft.com',
-  'https://api.octocorp.ghe.com/',
+  'https://api.octocorp.ghe.com',
 ]
 
 // Return a regular expression from a URL string that matches the URL

src/rest/components/RestReferencePage.tsx

@@ -49,7 +49,7 @@ export const RestReferencePage = ({ restOperations }: StructuredContentT) => {
           {title}
         </h1>
         {intro && (
-          <Lead data-testid="lead" data-search="lead" className="markdown-body">
+          <Lead data-testid="lead" data-search="lead">
             {intro}
           </Lead>
         )}