Merge branch 'github:main' into education-add-blackboard-lms

Author: scollovati

.github/workflows/sync-audit-logs.yml

@@ -51,34 +51,38 @@ jobs:
           # Needed for gh
           GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
         run: |
-          # If nothing to commit, exit now. It's fine. No orphans.
-          changes=$(git diff --name-only | wc -l)
-          untracked=$(git status --untracked-files --short | wc -l)
-          filesChanged=$(git diff --name-only)
-          # There will always be at least one file changed:
-          # src/audit-logs/lib/config.json
-          # If the config file is the only file changed, exit.
-          if [[ $changes -eq 1 ]] && [[ $untracked -eq 1 ]] && [[ $filesChanged == *lib/config.json ]]; then
-            echo "There are no changes to commit or untracked files. Exiting..."
+          echo "Creating a new branch if needed..."
+          branchname=audit-logs-schema-update-${{ steps.audit-log-allowlists.outputs.COMMIT_SHA }}
+          remotesha=$(git ls-remote --heads origin $branchname)
+          if [ -n "$remotesha" ]; then
+            # output is not empty, it means the remote branch exists
+            echo "Branch $branchname already exists in 'github/docs-internal'. Exiting..."
             exit 0
           fi
+          git checkout -b $branchname
+          echo "Created a new branch $branchname"
 
+          echo "Preparing commit..."
           git config --global user.name "docs-bot"
           git config --global user.email "77750099+docs-bot@users.noreply.github.com"
+          git add -A .
+          echo "Prepared commit"
 
-          branchname=audit-logs-schema-update-${{ steps.audit-log-allowlists.outputs.COMMIT_SHA }}
-
-          remotesha=$(git ls-remote --heads origin $branchname)
-          if [ -n "$remotesha" ]; then
-            # output is not empty, it means the remote branch exists
-            echo "Branch $branchname already exists in 'github/docs-internal'. Exiting..."
+          echo "Check if there are changes..."
+          if git diff-index --cached --quiet HEAD -- . ':(exclude)src/audit-logs/lib/config.json'
+          then
+            echo "No real changes (only the SHA in config.json moved). Exiting…"
             exit 0
           fi
+          echo "Changes detected, proceeding"
 
-          git checkout -b $branchname
-          git add .
+          echo "Creating commit..."
           git commit -m "Add updated audit log event data"
+          echo "Created commit"
+
+          echo "Pushing commit..."
           git push origin $branchname
+          echo "Pushed commit"
 
           echo "Creating pull request..."
           gh pr create \
@@ -89,16 +93,21 @@ jobs:
             --repo github/docs-internal \
             --label audit-log-pipeline \
             --head=$branchname
+          echo "Created pull request"
 
           # can't approve your own PR, approve with Actions
+          echo "Approving pull request..."
           unset GITHUB_TOKEN
           gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"
           gh pr review --approve
+          echo "Approved pull request"
 
           # Actions can't merge the PR so back to docs-bot to merge the PR
+          echo "Setting pull request to auto merge..."
           unset GITHUB_TOKEN
           gh auth login --with-token <<< "${{ secrets.DOCS_BOT_PAT_BASE }}"
           gh pr merge --auto
+          echo "Set pull request to auto merge"
 
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

.github/workflows/sync-openapi.yml

@@ -49,6 +49,7 @@ jobs:
           repository: github/models-gateway
           path: models-gateway
           ref: main
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}
 
       - uses: ./.github/actions/node-npm-setup
 

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

@@ -44,7 +44,7 @@ If you use Gravatar, and your Gravatar image is associated with the email you us
 ### Resetting your profile picture to the identicon
 
 {% data reusables.user-settings.access_settings %}
-1. Under "Profile Picture", select **{% octicon "pencil" aria-hidden="true" %} Edit**, then click **Remove photo** to revert to your identicon.
+1. Under "Profile Picture", select **{% octicon "pencil" aria-hidden="true" aria-label="pencil" %} Edit**, then click **Remove photo** to revert to your identicon.
 
    If your email address is associated with a [Gravatar](https://en.gravatar.com/), you cannot revert to your identicon. Click **Revert to Gravatar** instead.
 
@@ -149,7 +149,7 @@ If you select the "Busy" option, when people @mention your username, assign you
 
 ![Screenshot of a draft comment. "@octocat" is written in the text field, and "The Octocat (busy)" is suggested.](/assets/images/help/profile/username-with-limited-availability-text.png)
 
-1. In the top right corner of {% data variables.product.prodname_dotcom %}, select your profile photo, then click **{% octicon "smiley" aria-hidden="true" %} Set status** or, if you already have a status set, click your current status.
+1. In the top right corner of {% data variables.product.prodname_dotcom %}, select your profile photo, then click **{% octicon "smiley" aria-hidden="true" aria-label="smiley" %} Set status** or, if you already have a status set, click your current status.
 
    ![Screenshot of the dropdown menu under @octocat's profile picture. A smiley icon and "Set status" are outlined in dark orange.](/assets/images/help/profile/set-status-on-profile-global-nav-update.png)
 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md

@@ -45,7 +45,7 @@ You can send an invitation to collaborate in your repository directly to someone
 1. Ask for the username of the person you're inviting as a collaborator.{% ifversion fpt or ghec %} If they don't have a username yet, they can sign up for {% data variables.product.prodname_dotcom %}. For more information, see [AUTOTITLE](/get-started/start-your-journey/creating-an-account-on-github).{% endif %}
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-1. In the "Access" section of the sidebar, click **{% octicon "people" aria-hidden="true" %} Collaborators**.
+1. In the "Access" section of the sidebar, click **{% octicon "people" aria-hidden="true" aria-label="people" %} Collaborators**.
 1. Click **Add people**.
 1. In the search field, start typing the name of person you want to invite, then click a name in the list of matches.
 1. Click **Add NAME to REPOSITORY**.

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md

@@ -20,6 +20,6 @@ topics:
 shortTitle: Remove yourself
 ---
 {% data reusables.user-settings.access_settings %}
-1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-hidden="true" %} Repositories**.
+1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-hidden="true" aria-label="repo" %} Repositories**.
 1. Next to the repository you want to leave, click **Leave**.
 1. Read the warning carefully, then click **I understand, leave this repository.**

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

@@ -49,7 +49,7 @@ You can also find a list of your recently visited repositories, teams, and proje
 
 The feed is designed to help you discover relevant content from projects you follow, keep up with your friends and community members, and track recent activity in your communities.
 
-You can use the **{% octicon "filter" aria-hidden="true" %} Filter** dropdown in the upper right corner to filter the feed to show only the exact event types you'd like to see. For example, you'll see updates when someone you follow:
+You can use the **{% octicon "filter" aria-hidden="true" aria-label="filter" %} Filter** dropdown in the upper right corner to filter the feed to show only the exact event types you'd like to see. For example, you'll see updates when someone you follow:
 
 * Stars a repository
 * Follows another user

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-your-tab-size-rendering-preference.md

@@ -16,5 +16,5 @@ redirect_from:
 If you feel that tabbed indentation in code rendered on {% data variables.product.github %} takes up too much, or too little space, you can change this in your settings.
 
 {% data reusables.user-settings.access_settings %}
-1. In the left sidebar, click **{% octicon "paintbrush" aria-hidden="true" %} Appearance**.
+1. In the left sidebar, click **{% octicon "paintbrush" aria-hidden="true" aria-label="paintbrush" %} Appearance**.
 1. Scroll down to "Tab size preference" and use the dropdown menu to choose your preference.

content/actions/administering-github-actions/making-retired-namespaces-available-on-ghecom.md

@@ -22,7 +22,7 @@ After using an action from {% data variables.product.prodname_dotcom_the_website
 
 {% data reusables.enterprise-accounts.access-enterprise-emu %}
 {% data reusables.enterprise-accounts.settings-tab %}
-1. Under **{% octicon "gear" aria-hidden="true" %} Settings**, click **Retired namespaces**.
+1. Under **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**, click **Retired namespaces**.
 1. To the right of the namespace that you want use in your enterprise, click **Unretire**.
 1. Go to the relevant organization and create a new repository.
 

content/actions/managing-workflow-runs-and-deployments/managing-deployments/managing-environments-for-deployment.md

@@ -186,7 +186,7 @@ Variables stored in an environment are only available to workflow jobs that refe
 1. Optionally, specify what branches and tags can deploy to this environment. For more information, see [Deployment branches and tags](/actions/deployment/targeting-different-environments/managing-environments-for-deployment#deployment-branches-and-tags).
    1. Select the desired option in the **Deployment branches** dropdown.
    1. If you chose **Selected branches and tags**, to add a new rule, click **Add deployment branch or tag rule**
-   1. In the "Ref type" dropdown menu, depending on what rule you want to apply, click **{% octicon "git-branch" aria-hidden="true" %} Branch** or **{% octicon "tag" aria-hidden="true" %} Tag**.
+   1. In the "Ref type" dropdown menu, depending on what rule you want to apply, click **{% octicon "git-branch" aria-hidden="true" aria-label="git-branch" %} Branch** or **{% octicon "tag" aria-hidden="true" aria-label="tag" %} Tag**.
    1. Enter the name pattern for the branch or tag that you want to allow.
 
       {% data reusables.actions.branch-and-tag-deployment-rules-configuration %}

content/actions/managing-workflow-runs-and-deployments/managing-deployments/viewing-deployment-history.md

@@ -42,9 +42,9 @@ By default, the deployments page shows currently active deployments from select
    * **To view the URL for a deployment**, to the right of the commit message in the deployment history list, click {% octicon "link-external" aria-label="Navigate to deployment URL" %}.
    * **To navigate to the workflow run logs associated with a deployment**, to the right of the commit message in the deployment history list, click {% octicon "kebab-horizontal" aria-label="View logs" %}, then click **View logs**.{% ifversion deployment-dashboard-filter %}
 1. Optionally, to filter the deployment history list, create a filter.
-   1. Click on the **{% octicon "filter" aria-hidden="true" %} Filter** button.
-   1. Click **{% octicon "plus" aria-hidden="true" %} Add a filter**.
+   1. Click on the **{% octicon "filter" aria-hidden="true" aria-label="filter" %} Filter** button.
+   1. Click **{% octicon "plus" aria-hidden="true" aria-label="plus" %} Add a filter**.
    1. Choose a qualifier you would like to filter the deployment history by.
    1. Depending on the qualifier you chose, fill out information in the "Operator" and "Value" columns.
-   1. Optionally, click **{% octicon "plus" aria-hidden="true" %} Add a filter** to add another filter.
+   1. Optionally, click **{% octicon "plus" aria-hidden="true" aria-label="plus" %} Add a filter** to add another filter.
    1. Click **Apply**.{% endif %}

content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md

@@ -28,7 +28,7 @@ Re-running a workflow or jobs in a workflow uses the same `GITHUB_SHA` (commit S
 {% data reusables.repositories.view-run %}
 1. In the upper-right corner of the workflow, re-run jobs.
 
-   * If any jobs failed, select the **{% octicon "sync" aria-hidden="true" %} Re-run jobs** dropdown menu and click **Re-run all jobs**.
+   * If any jobs failed, select the **{% octicon "sync" aria-hidden="true" aria-label="sync" %} Re-run jobs** dropdown menu and click **Re-run all jobs**.
 
    * If no jobs failed, click **Re-run all jobs**.
 
@@ -70,7 +70,7 @@ If any jobs in a workflow run failed, you can re-run just the jobs that failed.
 {% data reusables.repositories.actions-tab %}
 {% data reusables.repositories.navigate-to-workflow %}
 {% data reusables.repositories.view-run %}
-1. In the upper-right corner of the workflow, select the **{% octicon "sync" aria-hidden="true" %} Re-run jobs** dropdown menu, and click **Re-run failed jobs**.
+1. In the upper-right corner of the workflow, select the **{% octicon "sync" aria-hidden="true" aria-label="sync" %} Re-run jobs** dropdown menu, and click **Re-run failed jobs**.
 {% data reusables.actions.enable-debug-logging %}
 
 {% endwebui %}

content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/adding-a-workflow-status-badge.md

@@ -30,7 +30,7 @@ You can create a workflow status badge directly on the UI using the workflow fil
 1. On the right side of the page, next to the "Filter workflow runs" field, click {% octicon "kebab-horizontal" aria-label="Show workflow options" %} to display a dropdown menu and click **Create status badge**.
 1. Optionally, select a branch if you want to display the status badge for a branch different from the default branch.
 1. Optionally, select the event that will trigger the workflow.
-1. Click **{% octicon "copy" aria-hidden="true" %} Copy status badge Markdown**.
+1. Click **{% octicon "copy" aria-hidden="true" aria-label="copy" %} Copy status badge Markdown**.
 1. Copy the Markdown into your `README.md` file.
 
 ## Using the workflow file name

content/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/viewing-job-execution-time.md

@@ -19,7 +19,7 @@ Billable job execution minutes are only shown for jobs run on private repositori
 {% data reusables.repositories.navigate-to-workflow %}
 {% data reusables.repositories.view-run %}
 1. Under the job summary, you can view the job's execution time.
-1. To view details about the billable job execution time, in the left sidebar under "Run details", click **{% octicon "stopwatch" aria-hidden="true" %} Usage**.
+1. To view details about the billable job execution time, in the left sidebar under "Run details", click **{% octicon "stopwatch" aria-hidden="true" aria-label="stopwatch" %} Usage**.
 
    > [!NOTE]
    > The billable time shown does not include any minute multipliers. To view your total {% data variables.product.prodname_actions %} usage, including minute multipliers, see [AUTOTITLE](/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage).

content/actions/monitoring-and-troubleshooting-workflows/troubleshooting-workflows/using-copilot-to-troubleshoot-workflows.md

@@ -11,8 +11,8 @@ If a workflow run fails, you can open a chat with {% data variables.product.prod
 
 To open a chat about a failed workflow run, you can either:
 
-* Next to the failed check in the merge box, click **{% octicon "kebab-horizontal" aria-hidden="true" %}**, then click **{% octicon "copilot" aria-hidden="true" %} Explain error**.
-* In the merge box, click on the failed check. At the top of the workflow run summary page, click **{% octicon "copilot" aria-hidden="true" %} Explain error**.
+* Next to the failed check in the merge box, click **{% octicon "kebab-horizontal" aria-hidden="true" aria-label="kebab-horizontal" %}**, then click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %} Explain error**.
+* In the merge box, click on the failed check. At the top of the workflow run summary page, click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %} Explain error**.
 
 This opens a chat window with {% data variables.product.prodname_copilot %}, where it will provide instructions to resolve the issue.
 

content/actions/writing-workflows/quickstart.md

@@ -41,7 +41,7 @@ This guide assumes that:
 * You have a repository on {% data variables.product.github %} where you can add files.
 * You have access to {% data variables.product.prodname_actions %}.
 
-  > [!NOTE] If the **{% octicon "play" aria-hidden="true" %} Actions** tab is not displayed under the name of your repository on {% data variables.product.prodname_dotcom %}, it may be because Actions is disabled for the repository. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository).
+  > [!NOTE] If the **{% octicon "play" aria-hidden="true" aria-label="play" %} Actions** tab is not displayed under the name of your repository on {% data variables.product.prodname_dotcom %}, it may be because Actions is disabled for the repository. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository).
 
 ## Creating your first workflow
 

content/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-the-referrer-policy-for-your-enterprise.md

@@ -32,6 +32,6 @@ You can enable the `same-origin` referrer policy to instruct modern browsers to
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
-1. Under **{% octicon "gear" aria-hidden="true" %} Settings**, click **Authentication security**.
+1. Under **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**, click **Authentication security**.
 1. Under "User Agent Referrer Policy", select **Enable same origin referrer policy for all organizations**.
 1. Click **Save**.

content/admin/configuring-settings/hardening-security-for-your-enterprise/restricting-access-to-githubcom-using-a-corporate-proxy.md

@@ -41,7 +41,7 @@ An enterprise owner can identify the correct enterprise ID to use in the header
 
 {% data reusables.enterprise-accounts.access-enterprise-emu %}
 {% data reusables.enterprise-accounts.settings-tab %}
-1. Under {% octicon "gear" aria-hidden="true" %} **Settings**, click **Authentication security**.
+1. Under {% octicon "gear" aria-hidden="true" aria-label="gear" %} **Settings**, click **Authentication security**.
 1. In the "Enterprise access restrictions" section, find the header for your enterprise. This section is only visible for enterprises with the feature enabled.
 
 ## Using the header

content/admin/data-residency/about-github-enterprise-cloud-with-data-residency.md

@@ -16,7 +16,7 @@ By default, {% data variables.product.company_short %} stores data for {% data v
 
 You can **get started with data residency** by setting up a trial of {% data variables.product.prodname_ghe_cloud %}.
 
-<a href="https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=about+ghec+with+data+residency&ref_page=docs" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Set up a trial of {% data variables.product.prodname_ghe_cloud %}</span> {% octicon "link-external" height:16 %}</a>
+<a href="https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=about+ghec+with+data+residency&ref_page=docs" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Set up a trial of {% data variables.product.prodname_ghe_cloud %}</span> {% octicon "link-external" height:16 aria-label="link-external" %}</a>
 
 ## What is {% data variables.product.prodname_ghe_cloud %}?
 

content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md

@@ -41,7 +41,7 @@ To get started with {% data variables.enterprise.data_residency_short %}, you wi
 * Includes access to most {% data variables.product.prodname_enterprise %} features, though not the features listed in [Features not included in the trial](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud#features-not-included-in-the-trial)
 * Allows you to create up to **three new organizations**
 
-<a href="https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=get+started+with+data+residency&ref_page=docs" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Set up a trial of {% data variables.product.prodname_ghe_cloud %}</span> {% octicon "link-external" height:16 %}</a>
+<a href="https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=get+started+with+data+residency&ref_page=docs" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Set up a trial of {% data variables.product.prodname_ghe_cloud %}</span> {% octicon "link-external" height:16 aria-label="link-external" %}</a>
 
 1. Visit the trial page by clicking the link above.
 1. Select **Get started with managed users**.