Merge branch 'main' into main

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

@@ -8,6 +8,14 @@ inputs:
   slack_token:
     description: Slack token
     required: true
+  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
@@ -17,5 +25,5 @@ runs:
       with:
         channel: ${{ inputs.slack_channel_id }}
         bot-token: ${{ inputs.slack_token }}
-        color: failure
-        text: The last '${{ github.workflow }}' run failed. See ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        color: ${{ inputs.color }}
+        text: ${{ inputs.message }}

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

@@ -38,10 +38,19 @@ 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
+          git diff --no-index .github/branch_protection_settings/${{ matrix.branch }}.json ${{ matrix.branch }}-actual.json || echo "diff_failed=true" >> $GITHUB_ENV
+
+      - name: Set failure message
+        if: env.diff_failed == 'true'
+        run: |
+          message="Alert due to changes in branch protections for ${{ matrix.branch }}. Please review the changes and ensure they are intentional. If valid, update the branch protection settings in .github/branch_protection_settings/${{ matrix.branch }}.json to match the diff in this workflow."
+          echo "failure_message=$message" >> $GITHUB_ENV
+          echo "$message"
 
       - uses: ./.github/actions/slack-alert
-        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
+        if: ${{ env.diff_failed == 'true' && github.event_name != 'workflow_dispatch' }}
         with:
           slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
+          message: ${{ env.failure_message }}
+          color: purple

.github/workflows/enterprise-dates.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Create pull request
         id: create-pull-request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # pin @v6.1.0
+        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # pin @v7.0.3
         env:
           # Disable pre-commit hooks; they don't play nicely here
           HUSKY: '0'

.github/workflows/orphaned-assets-check.yml → .github/workflows/orphaned-files-check.yml

@@ -1,6 +1,6 @@
-name: 'Orphaned assets check'
+name: 'Orphaned files check'
 
-# **What it does**: Checks that there are no files in ./assets/ that aren't mentioned in any source file.
+# **What it does**: Checks that there are no files in ./assets/ and ./data/reusables that aren't mentioned in any source file.
 # **Why we have it**: To avoid orphans into the repo.
 # **Who does it impact**: Docs content.
 
@@ -14,6 +14,7 @@ on:
       # In case any of the dependencies affect the script
       - 'package*.json'
       - src/assets/scripts/find-orphaned-assets.js
+      - src/content-render/scripts/reusables-cli/find/unused.ts
       - src/workflows/walk-files.js
       - src/languages/lib/languages.js
       - .github/actions/clone-translations/action.yml
@@ -44,7 +45,7 @@ jobs:
 
       - uses: ./.github/actions/node-npm-setup
 
-      - name: Check for orphaned assets
+      - name: Check for orphaned assets and reusables
         env:
           # Needed for gh
           GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
@@ -54,10 +55,16 @@ jobs:
 
           # The `-s` is to make npm run silent and not print verbose
           # information about the npm script alias.
-          filesToRemove=`npm run -s find-orphaned-assets`
-          [ -z "$filesToRemove" ] && exit 0
+          assetFilesToRemove=$(npm run -s find-orphaned-assets)
+          reusableFilesToRemove=$(npm run -s reusables -- find unused | grep '^data/reusables')
+          [ -z "$assetFilesToRemove" ] && [ -z "$reusableFilesToRemove" ] && exit 0
 
-          echo $filesToRemove | xargs git rm
+          if [ -n "$assetFilesToRemove" ]; then
+            echo $assetFilesToRemove | xargs git rm
+          fi
+          if [ -n "$reusableFilesToRemove" ]; then
+            echo $reusableFilesToRemove | xargs git rm
+          fi
 
           git status
 
@@ -76,25 +83,26 @@ jobs:
           git config --global user.email "77750099+docs-bot@users.noreply.github.com"
 
           date=$(date '+%Y-%m-%d-%H-%M')
-          branchname=orphaned-assets-$date-$GITHUB_RUN_ID
+          branchname=orphaned-files-$date-$GITHUB_RUN_ID
 
           git checkout -b $branchname
-          git commit -m "Delete orphaned assets $date"
+          git commit -m "Delete orphaned files $date"
           git push origin $branchname
 
           body=$(cat <<-EOM
             Found with the npm run find-orphaned-assets script.
-            The orphaned assets workflow file .github/workflows/orphaned-assets-check.yml
+            The orphaned files workflow file .github/workflows/orphaned-files-check.yml
             runs every Monday at 16:20 UTC / 8:20 PST.
             The first responder should just spot-check some of the unused assets
             to make sure they aren't referenced anywhere
             and then approve and merge the pull request.
-            For more information, see [Doc: Orphaned Assets](https://github.com/github/docs-engineering/blob/main/docs/orphaned-assets.md).
+            For more information, see [Doc: Orphaned Assets](https://github.com/github/docs-engineering/blob/main/docs/orphaned-assets.md) 
+            and [Doc: Reusables CLI](https://github.com/github/docs-internal/tree/main/src/content-render/scripts/reusables-cli).
           EOM
           )
 
           gh pr create \
-            --title "Delete orphaned assets ($date)" \
+            --title "Delete orphaned files ($date)" \
             --body "$body" \
             --repo github/docs-internal \
             --label docs-content-fr

.github/workflows/sync-graphql.yml

@@ -29,7 +29,7 @@ jobs:
           src/graphql/scripts/sync.js
       - name: Create pull request
         id: create-pull-request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # pin @v6.1.0
+        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # pin @v7.0.3
         env:
           # Disable pre-commit hooks; they don't play nicely here
           HUSKY: '0'

.github/workflows/test.yml

@@ -66,6 +66,7 @@ jobs:
           - observability
           # - open-source
           - pageinfo
+          - pagelist
           # - pages
           - products
           - redirects

content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/managing-notifications-from-your-inbox.md

@@ -19,7 +19,7 @@ shortTitle: Manage from your inbox
 
 {% data reusables.notifications-v2.notifications-inbox-required-setting %} For more information, see "[AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#choosing-your-notification-settings)."
 
-To access your notifications inbox, in the upper-right corner of any page, click {% octicon "bell" aria-label="The notifications bell" %}.
+To access your notifications inbox, in the upper-right corner of any page, click {% octicon "inbox" aria-label="The notifications inbox" %}.
 
 Your inbox shows all of the notifications that you haven't unsubscribed to or marked as **Done.** You can customize your inbox to best suit your workflow using filters, viewing all or just unread notifications, and grouping your notifications to get a quick overview.
 

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md

@@ -212,7 +212,7 @@ To stop private contributions from counting toward your Achievements, or to turn
 
 {% note %}
 
-**Note:** This feature is currently in beta and subject to change.
+**Note:** This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address.md

@@ -1,6 +1,6 @@
 ---
 title: Setting your commit email address
-intro: 'You can set the email address that is used to author commits on {% data variables.location.product_location %} and on your computer.'
+intro: 'You can set the email address that is used to author commits on {% data variables.product.github %} and on your computer.'
 redirect_from:
   - /articles/keeping-your-email-address-private
   - /articles/setting-your-commit-email-address-on-github
@@ -24,9 +24,9 @@ shortTitle: Set commit email address
 ---
 ## About commit email addresses
 
-{% data variables.product.prodname_dotcom %} uses your commit email address to associate commits with your account on {% data variables.location.product_location %}. You can choose the email address that will be associated with the commits you push from the command line as well as web-based Git operations you make.
+{% data variables.product.github %} uses your commit email address to associate commits with your account on {% data variables.product.github %}. You can choose the email address that will be associated with the commits you push from the command line as well as web-based Git operations you make.
 
-For web-based Git operations, you can set your commit email address on {% data variables.location.product_location %}. For commits you push from the command line, you can set your commit email address in Git.
+For web-based Git operations, you can set your commit email address on {% data variables.product.github %}. For commits you push from the command line, you can set your commit email address in Git.
 
 {% ifversion fpt or ghec %}Any commits you made prior to changing your commit email address are still associated with your previous email address.{% else %}After changing your commit email address on {% data variables.product.product_name %}, the new email address will be visible in all of your future web-based Git operations by default. Any commits you made prior to changing your commit email address are still associated with your previous email address.{% endif %}
 
@@ -44,19 +44,19 @@ For web-based Git operations, you can set your commit email address on {% data v
 
 You can also choose to block commits you push from the command line that expose your personal email address. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/blocking-command-line-pushes-that-expose-your-personal-email-address)."{% endif %}
 
-To ensure that commits are attributed to you and appear in your contributions graph, use an email address that is connected to your account on {% data variables.location.product_location %}{% ifversion fpt or ghec %}, or the `noreply` email address provided to you in your email settings{% endif %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
+To ensure that commits are attributed to you and appear in your contributions graph, use an email address that is connected to your account on {% data variables.product.github %}{% ifversion fpt or ghec %}, or the `noreply` email address provided to you in your email settings{% endif %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
 
 {% ifversion fpt or ghec %}
 
 {% note %}
 
-**Note:** If you created your account on {% data variables.location.product_location %} _after_ July 18, 2017, your `noreply` email address for {% data variables.product.product_name %} is an ID number and your username in the form of <code>ID+USERNAME@users.noreply.github.com</code>. If you created your account on {% data variables.location.product_location %} _prior to_ July 18, 2017, and enabled **Keep my email address private** prior to that date, your `noreply` email address from {% data variables.product.product_name %} is <code>USERNAME@users.noreply.github.com</code>. You can get an ID-based `noreply` email address for {% data variables.product.product_name %} by selecting (or deselecting and reselecting) **Keep my email address private** in your email settings.
+**Note:** If you created your account _after_ July 18, 2017, your `noreply` email address for is an ID number and your username in the form of <code>ID+USERNAME@users.noreply.github.com</code>. If you created your account _prior to_ July 18, 2017, and enabled **Keep my email address private** prior to that date, your `noreply` email address is <code>USERNAME@users.noreply.github.com</code>. You can get an ID-based `noreply` email address by selecting (or deselecting and reselecting) **Keep my email address private** in your email settings.
 
 {% endnote %}
 
-If you use your `noreply` email address for {% data variables.product.product_name %} to make commits and then [change your username](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username), those commits will not be associated with your account on {% data variables.location.product_location %}. This does not apply if you're using the ID-based `noreply` address from {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username)."{% endif %}
+If you use your `noreply` email address for {% data variables.product.github %} to make commits and then change your username, those commits will not be associated with your account. This does not apply if you're using the ID-based `noreply` address from {% data variables.product.github %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username)."{% endif %}
 
-## Setting your commit email address on {% data variables.product.prodname_dotcom %}
+## Setting your commit email address on {% data variables.product.github %}
 
 {% data reusables.files.commit-author-email-options %}
 
@@ -68,7 +68,7 @@ If you use your `noreply` email address for {% data variables.product.product_na
 
 ## Setting your commit email address in Git
 
-You can use the `git config` command to change the email address you associate with your Git commits. The new email address you set will be visible in any future commits you push to {% data variables.location.product_location %} from the command line. Any commits you made prior to changing your commit email address are still associated with your previous email address.
+You can use the `git config` command to change the email address you associate with your Git commits. The new email address you set will be visible in any future commits you push to {% data variables.product.github %} from the command line. Any commits you made prior to changing your commit email address are still associated with your previous email address.
 
 ### Setting your email address for every repository on your computer
 
@@ -91,7 +91,7 @@ You can use the `git config` command to change the email address you associate w
 
 ### Setting your email address for a single repository
 
-{% data variables.product.product_name %} uses the email address set in your local Git configuration to associate commits pushed from the command line with your account on {% data variables.location.product_location %}.
+{% data variables.product.github %} uses the email address set in your local Git configuration to associate commits pushed from the command line with your account on {% data variables.product.github %}.
 
 You can change the email address associated with commits you make in a single repository. This will override your global Git configuration settings in this one repository, but will not affect any other repositories.
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address.md

@@ -72,11 +72,11 @@ Having an unverified email address does not affect most actions you can take on
 
 The verification link expires after 24 hours. If you don't verify your email within 24 hours, you can request another email verification link. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address#verifying-your-email-address)."
 
-If you click on the link in the confirmation email within 24 hours and you are directed to an error page, you should ensure that you're signed into the correct account on {% data variables.location.product_location %}.
+If you click on the link in the confirmation email within 24 hours and you are directed to an error page, you should ensure that you're signed into the correct account on {% data variables.product.github %}.
 
-1. Sign out of your personal account on {% data variables.location.product_location %}.
+1. Sign out of your account.
 1. Quit and restart your browser.
-1. Sign in to your personal account on {% data variables.location.product_location %}.
+1. Sign in to your account.
 1. Click on the verification link in the email we sent you.
 
 {% ifversion ghec %}

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md

@@ -51,7 +51,7 @@ You can also find a list of your recently visited repositories, teams, and proje
 
 {% note %}
 
-**Note:** The new feed is currently in public beta and subject to change.
+**Note:** The new feed is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
@@ -91,7 +91,7 @@ For more information about following people and starring repositories, see "[AUT
 
 {% note %}
 
-**Note:** This new tab is currently in public beta and subject to change.
+**Note:** This new tab is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/changing-your-github-username.md

@@ -76,7 +76,7 @@ If the new owner of your old username creates a repository with the same name as
 
 ## Links to your previous profile page
 
-After changing your username, links to your previous profile page, such as `https://{% data variables.product.product_url %}/previoususername`, will return a 404 error. We recommend updating any links to your account on {% data variables.location.product_location %} from elsewhere{% ifversion fpt or ghec %}, such as your LinkedIn or Twitter profile{% endif %}.
+After changing your username, links to your previous profile page, such as `https://{% data variables.product.product_url %}/previoususername`, will return a 404 error. We recommend updating any links to your profile from elsewhere{% ifversion fpt or ghec %}, such as your LinkedIn or Twitter profile{% endif %}.
 
 ## Accounts logged in on GitHub Mobile
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-access-to-your-personal-accounts-project-boards.md

@@ -10,9 +10,7 @@ redirect_from:
   - /account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-access-to-your-user-accounts-project-boards
   - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-access-to-your-personal-accounts-project-boards
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghec: '*'
+  feature: projects-v1
 topics:
   - Accounts
 shortTitle: 'Manage {% data variables.projects.projects_v1_boards %} access'