Merge pull request #36010 from github/repo-sync

Repo sync
github · Jan 21, 2025 · 369a7d7 · 369a7d7
2 parents 429c64b + d3fbc0f
commit 369a7d7
Show file tree

Hide file tree

Showing 104 changed files with 301 additions and 276 deletions.
diff --git a/...ub/managing-email-preferences/adding-an-email-address-to-your-github-account.md b/...ub/managing-email-preferences/adding-an-email-address-to-your-github-account.md
@@ -26,7 +26,32 @@ shortTitle: Add an email address
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.emails %}
 {% data reusables.user-settings.add_and_verify_email %}
-{% data reusables.user-settings.select_primary_email %}
+1. If you'd like to associate the email address with your web-based Git operations, select it from the "Primary email address" dropdown menu.
+
+   ![Screenshot of the "Email" settings page. Under "Primary email address," a dropdown menu, labeled with Octocat's email address, is outlined in orange.](/assets/images/help/settings/email-primary.png)
+
+## Troubleshooting adding an email
+
+If you see an error message when you try to add an email address to your account, you may be experiencing one of the following issues.
+
+### Email already in use
+
+If you see the error message `Error adding EMAIL: email is already in use`, it means the email address is already linked to another {% data variables.product.prodname_dotcom %} account. An email address can only be associated with one {% data variables.product.prodname_dotcom %} account at a time.
+
+To use this email with a different account, follow these steps:
+
+1. Sign in to the account currently linked to the email address and remove it from that account.
+1. If you don’t have access to the account, request a password reset email to recover it. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials).
+
+### Email linked to a {% data variables.enterprise.prodname_managed_user %}
+
+If the email address that you are trying to add is provided to you by your organization, you may see the `Error adding EMAIL: email is already in use` error when your organization has created a {% data variables.enterprise.prodname_managed_user %} for you in their {% data variables.enterprise.prodname_emu_enterprise %}.
+
+Reach out to your site administrator or internal IT helpdesk to learn about their deployment of {% data variables.product.prodname_ghe_cloud %} and how to access the account. You may be able to sign into the {% data variables.product.prodname_ghe_cloud %} application via the organization's identity provider (IdP).
+
+If you want to use your email address with a personal account, you must sign in to your {% data variables.enterprise.prodname_managed_user %} and unverify the email in your account settings. The email will remain linked to your {% data variables.enterprise.prodname_managed_user %}, allowing you to access the account through your organization's IdP.
+
+However, some third-party apps or services may not function properly with a {% data variables.enterprise.prodname_managed_user %} that has an unverified email address.
 
 ## Further reading
 

diff --git a/content/communities/documenting-your-project-with-wikis/about-wikis.md b/content/communities/documenting-your-project-with-wikis/about-wikis.md
@@ -14,15 +14,15 @@ topics:
   - Community
 ---
 
-Every repository on {% data variables.product.product_name %} comes equipped with a section for hosting documentation, called a wiki. You can use your repository's wiki to share long-form content about your project, such as how to use it, how you designed it, or its core principles. A README file quickly tells what your project can do, while you can use a wiki to provide additional documentation. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes).
+Every repository on {% data variables.product.github %} comes equipped with a section for hosting documentation, called a wiki. You can use your repository's wiki to share long-form content about your project, such as how to use it, how you designed it, or its core principles. A README file quickly tells what your project can do, while you can use a wiki to provide additional documentation. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes).
 
 With wikis, you can write content just like everywhere else on {% data variables.product.prodname_dotcom %}. For more information, see [AUTOTITLE](/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github). We use [our open-source Markup library](https://github.com/github/markup) to convert different formats into HTML, so you can choose to write in Markdown or any other supported format.
 
 {% data reusables.getting-started.math-and-diagrams %}
 
 If you create a wiki in a public repository, the wiki is available to {% ifversion ghes %}anyone with access to {% data variables.location.product_location %}{% else %}the public{% endif %}. If you create a wiki in a private{% ifversion ghec or ghes %} or internal{% endif %} repository, only people with access to the repository can access the wiki. For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility).
 
-You can edit wikis directly on {% data variables.product.product_name %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.location.product_location %} to contribute to a wiki in a public repository. For more information, see [AUTOTITLE](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis).
+You can edit wikis directly on {% data variables.product.github %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.location.product_location %} to contribute to a wiki in a public repository. For more information, see [AUTOTITLE](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis).
 
 {% ifversion fpt or ghec %}
 

diff --git a/...communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages.md b/...communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages.md
@@ -1,6 +1,6 @@
 ---
 title: Adding or editing wiki pages
-intro: 'You can add and edit wiki pages directly on {% data variables.product.product_name %} or locally using the command line.'
+intro: 'You can add and edit wiki pages directly on {% data variables.product.github %} or locally using the command line.'
 redirect_from:
   - /articles/adding-wiki-pages-via-the-online-interface
   - /articles/editing-wiki-pages-via-the-online-interface
@@ -47,7 +47,7 @@ Wikis are part of Git repositories, so you can make changes locally and push the
 ### Cloning wikis to your computer
 
 Every wiki provides an easy way to clone its contents down to your computer.
-Once you've created an initial page on {% data variables.product.product_name %}, you can clone the repository to your computer with the provided URL:
+Once you've created an initial page on {% data variables.product.github %}, you can clone the repository to your computer with the provided URL:
 
 ```shell
 $ git clone https://github.com/YOUR-USERNAME/YOUR-REPOSITORY.wiki.git

diff --git a/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md b/content/communities/documenting-your-project-with-wikis/editing-wiki-content.md
@@ -43,7 +43,7 @@ Wikis can display PNG, JPEG, and GIF images.
 
 ### Linking to images in a repository
 
-You can link to an image in a repository on {% data variables.product.product_name %} by copying the URL in your browser and using that as the path to the image. For example, embedding an image in your wiki using Markdown might look like this:
+You can link to an image in a repository on {% data variables.product.github %} by copying the URL in your browser and using that as the path to the image. For example, embedding an image in your wiki using Markdown might look like this:
 
     [[https://github.com/USERNAME/REPOSITORY/blob/main/img/octocat.png|alt=octocat]]
 

diff --git a/...r-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project.md b/...r-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project.md
@@ -25,7 +25,7 @@ You can create a default code of conduct for your organization or personal accou
 
 ## Adding a code of conduct using a template
 
-{% data variables.product.product_name %} provides templates for common codes of conduct to help you quickly add a code of conduct to your project.
+{% data variables.product.github %} provides templates for common codes of conduct to help you quickly add a code of conduct to your project.
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.files.add-file %}

diff --git a/...r-project-for-healthy-contributions/creating-a-default-community-health-file.md b/...r-project-for-healthy-contributions/creating-a-default-community-health-file.md
@@ -18,13 +18,13 @@ shortTitle: Community health file
 
 Default community health files are a set of predefined files that provide guidance and templates for maintaining a healthy and collaborative open source project. These files help you automate and standardize various aspects of your project's development and community interaction, promoting transparency, good practices, and collaboration.
 
-You can add default community health files to a public repository called `.github` and {% data variables.product.product_name %} will use and display default files for any repository owned by the account that does not have its own file of that type in the following order:
+You can add default community health files to a public repository called `.github` and {% data variables.product.github %} will use and display default files for any repository owned by the account that does not have its own file of that type in the following order:
 
 * The `.github` folder
 * The root of the repository
 * The `docs` folder
 
-If no corresponding file is found in the current repository, {% data variables.product.product_name %} will use the default file from the `.github` repository, following the same order of precedence.
+If no corresponding file is found in the current repository, {% data variables.product.github %} will use the default file from the `.github` repository, following the same order of precedence.
 
 For example, anyone who creates an issue or pull request in a repository that does not have its own `CONTRIBUTING.md` file will see a link to the default `CONTRIBUTING.md` from the `.github` repository. However, if a repository has any files in its own `.github/ISSUE_TEMPLATE` folder, such as issue templates or a `_config.yml` file, none of the contents of the default `.github/ISSUE_TEMPLATE` folder will be used. This allows repository maintainers to override the default files with specific templates or content on per-repository basis.
 

diff --git a/...ful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md b/...ful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md
@@ -66,7 +66,7 @@ You can encourage contributors to use issue templates by setting `blank_issues_e
 > [!NOTE]
 > If you used the legacy workflow to manually create an `issue_template.md` file in the `.github` folder and enable blank issues in your _config.yml_ file, the template in `issue_template.md` will be used when people choose to open a blank issue. If you disable blank issues, the template will never be used.
 
-If you prefer to receive certain reports outside of {% data variables.product.product_name %}, you can direct people to external sites with `contact_links`.
+If you prefer to receive certain reports outside of {% data variables.product.github %}, you can direct people to external sites with `contact_links`.
 
 Here is an example _config.yml_ file.
 

diff --git a/...pilot/managing-copilot-as-an-individual-subscriber/about-github-copilot-free.md b/...pilot/managing-copilot-as-an-individual-subscriber/about-github-copilot-free.md
@@ -67,7 +67,7 @@ In {% data variables.product.prodname_vscode_shortname %} you can access {% data
 
 With {% data variables.product.prodname_copilot_free_short %}, you can ask {% data variables.product.prodname_copilot_short %} questions within a chat interface on {% data variables.product.github %}.
 
-1. To access your personal dashboard once you're signed in, click the {% octicon "mark-github" aria-label="The github octocat logo" %} in the upper-left corner of any page on {% data variables.product.product_name %}.
+1. To access your personal dashboard once you're signed in, click the {% octicon "mark-github" aria-label="The github octocat logo" %} in the upper-left corner of any page on {% data variables.product.github %}.
 1. At the top of the dashboard, use the "Ask a question" box to start a chat with {% data variables.product.prodname_copilot_short %}.
 
 ### Other IDEs

diff --git a/...ssions/collaborating-with-your-community-using-discussions/about-discussions.md b/...ssions/collaborating-with-your-community-using-discussions/about-discussions.md
@@ -1,6 +1,6 @@
 ---
 title: About discussions
-intro: 'Use discussions to ask and answer questions, share information, make announcements, and conduct or participate in a conversation about a project on {% data variables.product.product_name %}.'
+intro: 'Use discussions to ask and answer questions, share information, make announcements, and conduct or participate in a conversation about a project.'
 versions:
   fpt: '*'
   ghes: '*'

diff --git a/...community-using-discussions/collaborating-with-maintainers-using-discussions.md b/...community-using-discussions/collaborating-with-maintainers-using-discussions.md
@@ -1,7 +1,7 @@
 ---
 title: Collaborating with maintainers using discussions
 shortTitle: Collaborating with maintainers
-intro: 'You can contribute to the goals, plans, health, and community for a project on {% data variables.product.product_name %} by communicating with the maintainers of the project in a discussion.'
+intro: 'You can contribute to the goals, plans, health, and community for a project on {% data variables.product.github %} by communicating with the maintainers of the project in a discussion.'
 permissions: 'People with read access to a repository can start and participate in discussions and polls in the repository. People with read access to the source repository for organization discussions can start and participate in discussions and polls in the organization. {% data reusables.enterprise-accounts.emu-permission-interact %}'
 versions:
   fpt: '*'

diff --git a/...borating-with-your-community-using-discussions/participating-in-a-discussion.md b/...borating-with-your-community-using-discussions/participating-in-a-discussion.md
@@ -1,6 +1,6 @@
 ---
 title: Participating in a discussion
-intro: 'You can converse with the community and maintainers in a forum within the repository for a project on {% data variables.product.product_name %}.'
+intro: 'You can converse with the community and maintainers in a forum within the repository for a project on {% data variables.product.github %}.'
 permissions: 'People with read access to a repository can participate in discussions and polls in the repository. People with read access to the source repository for organization discussions can participate in discussions and polls in that organization. {% data reusables.enterprise-accounts.emu-permission-interact %}'
 versions:
   fpt: '*'
@@ -21,7 +21,7 @@ In addition to starting or viewing discussions and polls, you can:
 * React to comments with emoji
 * Upvote discussions and top-level comments to give them more visibility
 
-{% ifversion fpt or ghec %}You can block users and report disruptive content to maintain a safe and pleasant environment for yourself on {% data variables.product.product_name %}. For more information, see [AUTOTITLE](/communities/maintaining-your-safety-on-github).{% endif %}
+{% ifversion fpt or ghec %}You can block users and report disruptive content to maintain a safe and pleasant environment for yourself. For more information, see [AUTOTITLE](/communities/maintaining-your-safety-on-github).{% endif %}
 
 ## Prerequisites
 

diff --git a/content/discussions/guides/finding-your-discussions.md b/content/discussions/guides/finding-your-discussions.md
@@ -15,12 +15,12 @@ redirect_from:
 {% ifversion global-nav-update %}
 1. In the top-left corner of {% data variables.product.prodname_dotcom %}, select {% octicon "three-bars" aria-label="Open global navigation menu" %}, then click **{% octicon "comment-discussion" aria-hidden="true" %} Discussions**.
 
-   ![Screenshot of the navigation bar on {% data variables.product.product_name %}. The "Open global navigation menu" icon is outlined in dark orange.](/assets/images/help/navigation/global-navigation-menu-icon.png)
+   ![Screenshot of the navigation bar on {% data variables.product.github %}. The "Open global navigation menu" icon is outlined in dark orange.](/assets/images/help/navigation/global-navigation-menu-icon.png)
 
 {% else %}
 1. In the top-right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your discussions**.
 
-   ![Screenshot of the account dropdown on {% data variables.product.product_name %}. The "Your discussions" option is outlined in dark orange.](/assets/images/help/discussions/your-discussions.png)
+   ![Screenshot of the account dropdown on {% data variables.product.github %}. The "Your discussions" option is outlined in dark orange.](/assets/images/help/discussions/your-discussions.png)
 
 {% endif %}
 1. Toggle between **Created** and **Commented** to see the discussions you've created or participated in.

diff --git a/content/discussions/managing-discussions-for-your-community/index.md b/content/discussions/managing-discussions-for-your-community/index.md
@@ -1,7 +1,7 @@
 ---
 title: Managing discussions for your community
 shortTitle: Managing discussions
-intro: 'You can enable and configure {% data variables.product.prodname_discussions %} for your repository, and you can use tools on {% data variables.product.product_name %} to moderate conversations among community members.'
+intro: 'You can enable and configure {% data variables.product.prodname_discussions %} for your repository, and you can use tools to moderate conversations among community members.'
 versions:
   fpt: '*'
   ghes: '*'

diff --git a/.../managing-discussions-for-your-community/managing-categories-for-discussions.md b/.../managing-discussions-for-your-community/managing-categories-for-discussions.md
@@ -82,7 +82,7 @@ You can edit a section to change the section's emoji and title, and to add and r
 
 ## Deleting a category
 
-When you delete a category, {% data variables.product.product_name %} will move all discussions in the deleted category to an existing category that you choose.
+When you delete a category, {% data variables.product.github %} will move all discussions in the deleted category to an existing category that you choose.
 
 When you delete a section, all categories within the section will no longer belong to a section.
 

diff --git a/content/education/contribute-with-github-community-exchange/index.md b/content/education/contribute-with-github-community-exchange/index.md
@@ -1,7 +1,7 @@
 ---
 title: Contribute with GitHub Community Exchange
 shortTitle: '{% data variables.product.prodname_community_exchange %}'
-intro: 'With {% data variables.product.prodname_community_exchange %}, you can use {% data variables.product.product_name %} to contribute to open source and build your portfolio.'
+intro: 'With {% data variables.product.prodname_community_exchange %}, you can use {% data variables.product.github %} to contribute to open source and build your portfolio.'
 versions:
   fpt: '*'
 children:

diff --git a/...ucation/github-education-for-teachers/apply-to-github-education-as-a-teacher.md b/...ucation/github-education-for-teachers/apply-to-github-education-as-a-teacher.md
@@ -22,7 +22,7 @@ shortTitle: Apply to GitHub Education
 
 {% data reusables.education.educator-requirements %}
 
-For more information about personal accounts on {% data variables.product.product_name %}, see [AUTOTITLE](/get-started/start-your-journey/creating-an-account-on-github).
+For more information about personal accounts on {% data variables.product.github %}, see [AUTOTITLE](/get-started/start-your-journey/creating-an-account-on-github).
 
 ## Applying to {% data variables.product.prodname_global_campus %}
 

diff --git a/content/education/guides.md b/content/education/guides.md
@@ -1,15 +1,15 @@
 ---
 title: Guides for GitHub Education
-intro: 'These guides for {% data variables.product.prodname_education %} help you teach and learn both {% data variables.product.product_name %} and software development.'
+intro: 'These guides for {% data variables.product.prodname_education %} help you teach and learn both {% data variables.product.github %} and software development.'
 allowTitleToDifferFromFilename: true
 versions:
   fpt: '*'
 shortTitle: Guides
 ---
 
-## Get started with {% data variables.product.product_name %}
+## Get started with {% data variables.product.github %}
 
-Teachers, students, and researchers can use tools from {% data variables.product.product_name %} to enrich a software development curriculum and develop real-world collaboration skills.
+Teachers, students, and researchers can use tools from {% data variables.product.github %} to enrich a software development curriculum and develop real-world collaboration skills.
 
 * [Sign up for a new {% data variables.product.prodname_dotcom %} account](/get-started/start-your-journey/creating-an-account-on-github)
 * [Git and {% data variables.product.prodname_dotcom %} quickstart](/get-started/start-your-journey)

diff --git a/content/education/manage-coursework-with-github-classroom/index.md b/content/education/manage-coursework-with-github-classroom/index.md
@@ -1,7 +1,7 @@
 ---
 title: Manage coursework with GitHub Classroom
 shortTitle: '{% data variables.product.prodname_classroom %}'
-intro: 'With {% data variables.product.prodname_classroom %}, you can use {% data variables.product.product_name %} to administer or participate in a course about software development.'
+intro: 'With {% data variables.product.prodname_classroom %}, you can use {% data variables.product.github %} to administer or participate in a course about software development.'
 versions:
   fpt: '*'
 children: