Merge branch 'main' into repo-sync

Author: Octomerger

content/actions/index.md

@@ -64,7 +64,7 @@ versions:
 
   <button class="js-filter-card-show-more btn btn-outline float-right" data-js-filter-card-max="6">Show more {% octicon "arrow-right" %}</button>
 
-  <div class="js-filter-card-no-results d-none py-4 text-center color-text-secondary font-mktg">
+  <div class="js-filter-card-no-results d-none py-4 text-center text-gray font-mktg">
     <div class="mb-3">{% octicon "search" width="24" %}</div>
     <h3 class="text-normal">Sorry, there is no result for <strong class="js-filter-card-value"></strong></h3>
     <p class="my-3 f4">It looks like we don't have an example that fits your filter.<br>Try another filter or add your code example</p>

content/actions/managing-workflow-runs/removing-workflow-artifacts.md

@@ -22,13 +22,13 @@ versions:
 
 {% data reusables.repositories.permissions-statement-write %}
 
-{% data reusables.github-actions.artifact-log-retention-statement %}
+{% data reusables.github-actions.artifact-log-retention-statement %} 
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.actions-tab %}
 {% data reusables.repositories.navigate-to-workflow %}
 {% data reusables.repositories.view-run %}
-1. Under **Artifacts**, click {% octicon "trash" aria-label="The trash icon" %} next to the artifact you want to remove.
+1. Under **Artifacts**, click {% octicon "trashcan" aria-label="The trashcan icon" %} next to the artifact you want to remove.
     {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}
     ![Delete artifact drop-down menu](/assets/images/help/repository/actions-delete-artifact-updated.png)
     {% else %}

content/actions/reference/environments.md

@@ -80,7 +80,7 @@ Deleting an environment will delete all secrets and protection rules associated
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.github-actions.sidebar-environment %}
-1. Next the the environment that you want to delete, click {% octicon "trash" aria-label="The trash icon" %}.
+1. Next the the environment that you want to delete, click {% octicon "trashcan" aria-label="The trashcan icon" %}.
 2. Click **I understand, delete this environment**.
 
 {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}You can also delete environments through the REST API. For more information, see "[Environments](/rest/reference/repos#environments)."{% endif %}

content/discussions/index.md

@@ -47,7 +47,7 @@ versions:
   {% if discussionsCommunityExamples.length > 6 %}
     <button class="js-filter-card-show-more btn btn-outline float-right" data-js-filter-card-max="6">Show more {% octicon "arrow-right" %}</button>
   {% endif %}
-  <div class="js-filter-card-no-results d-none py-4 text-center color-text-secondary font-mktg">
+  <div class="js-filter-card-no-results d-none py-4 text-center text-gray font-mktg">
     <div class="mb-3">{% octicon "search" width="24" %}</div>
     <h3 class="text-normal">Sorry, there is no result for <strong class="js-filter-card-value"></strong></h3>
     <p class="my-3 f4">It looks like we don't have an example that fits your filter.<br>Try another filter or add your code example</p>

content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md

@@ -52,8 +52,8 @@ For more information about repository permission levels, see "[Permission levels
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.repositories.navigate-to-manage-access %}
-4. Under "Manage access", find the team or person whose access you'd like to remove, then click {% octicon "trash" aria-label="The trash icon" %}.
-  ![trash icon for removing access](/assets/images/help/repository/manage-access-remove.png)
+4. Under "Manage access", find the team or person whose access you'd like to remove, then click {% octicon "trashcan" aria-label="The trashcan icon" %}.
+  ![Trashcan icon for removing access](/assets/images/help/repository/manage-access-remove.png)
 
 ### Further reading
 

content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md

@@ -37,7 +37,7 @@ If the branch you want to delete is associated with an open pull request, you mu
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.navigate-to-branches %}
-1. Scroll to the branch that you want to delete, then click {% octicon "trash" aria-label="The trash icon to delete the branch" %}.
+1. Scroll to the branch that you want to delete, then click {% octicon "trashcan" aria-label="The trashcan icon to delete the branch" %}.
     ![delete the branch](/assets/images/help/branches/branches-delete.png)
 
 {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %}

content/github/managing-files-in-a-repository/deleting-files-in-a-repository.md

@@ -25,7 +25,7 @@ If the file{% if currentVersion == "free-pro-team@latest" or currentVersion ver_
 ### Deleting a file
 
 1. Browse to the file in your repository that you want to delete.
-2. At the top of the file, click {% octicon "trash" aria-label="The trash icon" %}.
+2. At the top of the file, click {% octicon "trashcan" aria-label="The trashcan icon" %}.
 {% data reusables.files.write_commit_message %}
 {% data reusables.files.choose-commit-email %}
 {% data reusables.files.choose_commit_branch %}

content/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise.md

@@ -9,7 +9,7 @@ versions:
 ---
 ### About Azure subscriptions and {% data variables.product.product_name %}
 
-{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions) and "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)."
+{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[About billing for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions) and "[About billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)." 
 
 After you connect an Azure subscription, you can also manage your spending limit. For information on managing and changing your account's spending limit, see "[Managing your spending limit for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages)" and "[Managing your spending limit for {% data variables.product.prodname_actions %}](/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions)."
 
@@ -23,7 +23,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc
 {% data reusables.enterprise-accounts.payment-information-tab %}
 1. Under "Payment Information", click **Add Azure Subscription**.
 1. To sign in to your Microsoft account, follow the prompts.
-1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**.
+1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. 
 1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your enterprise.
 1. Click **Connect**.
 
@@ -35,5 +35,5 @@ After you disconnect your Azure subscription from your enterprise account, your
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.billing-tab %}
 {% data reusables.enterprise-accounts.payment-information-tab %}
-1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trash" aria-label="The trash icon" %}**.
+1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trashcan" aria-label="The trashcan icon" %}**.
 1. Review the prompt, then click **Remove**.

content/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address.md

@@ -22,7 +22,7 @@ topics:
    ![Add another email address button](/assets/images/help/settings/add_another_email_address.png)
 4. Under "Primary email address", use the drop-down menu to click the email address you'd like to set as your primary email address, and click **Save**.
    ![Set as primary button](/assets/images/help/settings/set_as_primary_email.png)
-5. To remove the old email address from your account, next to the old email, click {% octicon "trash" aria-label="The trash symbol" %}.
+5. To remove the old email address from your account, next to the old email, click {% octicon "trashcan" aria-label="The trashcan symbol" %}.
 {% if currentVersion == "free-pro-team@latest" %}
 6. Verify your new primary email address. Without a verified email address, you won't be able to use all of {% data variables.product.product_name %}'s features. For more information, see "[Verifying your email address](/articles/verifying-your-email-address)."
 {% endif %}

content/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository.md

@@ -28,7 +28,7 @@ While forks of private repositories are deleted when a collaborator is removed,
 {% data reusables.repositories.sidebar-settings %}
 {% if currentVersion == "free-pro-team@latest" %}
 {% data reusables.repositories.navigate-to-manage-access %}
-4. To the right of the collaborator you want to remove, click {% octicon "trash" aria-label="The trash icon" %}.
+4. To the right of the collaborator you want to remove, click {% octicon "trashcan" aria-label="The trashcan icon" %}.
   ![Button to remove collaborator](/assets/images/help/repository/collaborator-remove.png)
 {% else %}
 3. In the left sidebar, click **Collaborators & teams**.