Skip to content

Commit a8f13d1

Browse files
authored
Merge pull request #37432 from github/repo-sync
Repo sync
2 parents e280f4c + 6682cc1 commit a8f13d1

File tree

31 files changed

+234
-213
lines changed

31 files changed

+234
-213
lines changed

content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Commits will appear on your contributions graph if they meet **all** of the foll
3838
* In the repository's default branch
3939
* In the `gh-pages` branch (for repositories with project sites)
4040

41-
For more information on project sites, see [AUTOTITLE](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites).
41+
For more information on project sites, see [AUTOTITLE](/pages/getting-started-with-github-pages/what-is-github-pages#types-of-github-pages-sites).
4242

4343
In addition, **at least one** of the following must be true:
4444
* You are a collaborator on the repository or are a member of the organization that owns the repository.
@@ -83,7 +83,7 @@ Generic email addresses, such as `[email protected]`, cannot be added to {% da
8383

8484
### Commit was not made in the default or `gh-pages` branch
8585

86-
Commits are only counted if they are made in the default branch or the `gh-pages` branch (for repositories with project sites). For more information, see [AUTOTITLE](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites).
86+
Commits are only counted if they are made in the default branch or the `gh-pages` branch (for repositories with project sites). For more information, see [AUTOTITLE](/pages/getting-started-with-github-pages/what-is-github-pages#types-of-github-pages-sites).
8787

8888
If your commits are in a non-default or non-`gh-pages` branch and you'd like them to count toward your contributions, you will need to do one of the following:
8989
* [Open a pull request](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) to have your changes merged into the default branch or the `gh-pages` branch.

content/admin/managing-iam/understanding-iam-for-enterprises/abilities-and-restrictions-of-managed-user-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ With {% data variables.product.prodname_emus %}, you can control the user accoun
5454

5555
## {% data variables.product.prodname_pages %}
5656

57-
* {% data variables.enterprise.prodname_managed_users_caps %} are limited in their use of {% data variables.product.prodname_pages %}. See [AUTOTITLE](/pages/getting-started-with-github-pages/about-github-pages#limitations-for-enterprise-managed-users).
57+
* {% data variables.enterprise.prodname_managed_users_caps %} are limited in their use of {% data variables.product.prodname_pages %}. See [AUTOTITLE](/pages/getting-started-with-github-pages/github-pages-limits#limits-for-enterprise-managed-users).
5858

5959
## Interactions
6060

content/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,17 @@ After using `git-filter-repo` to remove the sensitive data and pushing your chan
138138
1. Contact {% data variables.contact.contact_support %}, and provide the following information:
139139

140140
* The owner and repository name in question (e.g. YOUR-USERNAME/YOUR-REPOSITORY).
141+
{%- ifversion fpt or ghec %}
141142
* The number of affected pull requests, found in the previous step. This is used by Support to verify you understand how much will be affected.
143+
{%- endif %}
144+
{%- ifversion ghes %}
145+
* The number of affected pull requests, found in the previous step. This is used by your site administrator to verify you understand how much will be affected.
146+
{%- endif %}
142147
* The First Changed Commit(s) reported by `git-filter-repo` (Look for `NOTE: First Changed Commit(s)` in its output.)
143148
* If `NOTE: There were LFS Objects Orphaned by this rewrite` appears in the git-filter-repo output (right after the First Changed Commit), then mention you had LFS Objects Orphaned and upload the named file to the ticket as well.
144149

145-
If you have successfully cleaned up all references other than PRs, and no forks have references to the sensitive data, Support will then:
150+
{% ifversion fpt or ghec %}If you have successfully cleaned up all references other than PRs, and no forks have references to the sensitive data, Support will then:{% endif %}
151+
{% ifversion ghes %}If you have successfully cleaned up all references other than PRs, and no forks have references to the sensitive data, your site administrator will then:{% endif %}
146152

147153
* Dereference or delete any affected PRs on {% data variables.product.github %}.
148154
* Run a garbage collection on the server to expunge the sensitive data from storage.

content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ body:
3535
3636
You can set the following top-level keys for each issue form.
3737
38-
{% ifversion issue-types %}
39-
40-
{% data reusables.issues.release-stage %}
41-
42-
{% endif %}
43-
4438
| Key | Description | Required | Type |
4539
| :-- | :-- | :-- | :-- |
4640
| `name` | A name for the issue form template. Must be unique from all other templates, including Markdown templates. | Required | String |

content/copilot/setting-up-github-copilot/setting-up-github-copilot-for-your-enterprise.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@ redirect_from:
1414
- /copilot/github-copilot-enterprise/overview/enabling-github-copilot-enterprise-features
1515
---
1616

17-
## 1. Subscribe your enterprise to {% data variables.product.prodname_copilot %}
17+
## 1. Enable {% data variables.product.prodname_copilot %} in your Enterprise through payment verification
1818

19-
Set up a subscription to {% data variables.product.prodname_copilot_enterprise_short %} or {% data variables.product.prodname_copilot_business_short %} for your enterprise. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/subscribing-to-copilot-for-your-enterprise).
19+
{% data reusables.enterprise-accounts.access-enterprise %}
20+
{% data reusables.enterprise-accounts.settings-tab %}
21+
1. Click the **{% octicon "check-circle" aria-hidden="true" %} Getting Started** tab.
22+
1. Under "Next steps", click **Verify your payment method**. This will enable {% data variables.product.prodname_copilot %} in your enterprise.
23+
24+
After you've completed these steps, you will be able to confirm that {% data variables.product.prodname_copilot %} is enabled in your enterprise's **{% octicon "law" aria-hidden="true" %} Policies** tab.
2025

2126
## 2. Set policies
2227

content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@ You can also use a <code>&ast;</code> as a wildcard.
233233

234234
If your organization uses issue types, you can filter for particular types.
235235

236-
{% data reusables.issues.release-stage %}
237-
238236
| Qualifier | Example
239237
| ---------- | -------------
240238
| <code>type:&quot;<em>ISSUE TYPE</em>&quot; | **type:&quot;bug&quot;** will show issues with the "bug" type.
@@ -247,8 +245,6 @@ If your organization uses issue types, you can filter for particular types.
247245

248246
You can filter your sub-issues by their parent issue.
249247

250-
{% data reusables.issues.release-stage %}
251-
252248
| Qualifier | Example
253249
| ---------- | -------------
254250
| <code>parent-issue:<em>OWNER/REPO#ISSUE NUMBER</em></code> | **parent-issue:octocat/game#4** will show issues with issue #4 in octocat/game as their parent issue.

content/issues/tracking-your-work-with-issues/configuring-issues/managing-issue-types-in-an-organization.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ shortTitle: 'Managing issue types'
1010
permissions: 'Organization owners can modify issue types.'
1111
---
1212

13-
{% data reusables.issues.release-stage %}
14-
1513
You can use issue types to classify and manage different types of issues across your organization. You can create up to {% data variables.projects.issue_type_limit %} issue types that your organization members can apply to issues, making it easier for you and your members to find issues and plan work.
1614

1715
Default issue types are included in every organization, but these can edited, disabled, or deleted. The default types are task, bug, and feature.

content/issues/tracking-your-work-with-issues/configuring-issues/planning-and-tracking-work-for-your-team-or-project.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ Below we have added a task list to our Project Octocat issue, breaking it down i
8888

8989
### Breaking down your work with sub-issues
9090

91-
{% data reusables.issues.release-stage %}
92-
9391
{% data reusables.issues.about-sub-issues %} See [AUTOTITLE](/issues/tracking-your-work-with-issues/using-issues/adding-sub-issues) and [AUTOTITLE](/issues/tracking-your-work-with-issues/using-issues/browsing-sub-issues).
9492

9593
{% endif %}

content/issues/tracking-your-work-with-issues/using-issues/editing-an-issue.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ You can also make changes to the issue description. The edit history is availabl
4242

4343
## Adding or changing the issue type
4444

45-
{% data reusables.issues.release-stage %}
46-
4745
You can add an issue type or make changes to an existing issue type.
4846

4947
1. Navigate to the issue you want to edit.

content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ We recommend always using a `www` subdomain, even if you also use an apex domain
3434

3535
## Using a custom domain across multiple repositories
3636

37-
If you set a custom domain for a user or organization site, by default, the same custom domain will be used for all project sites owned by the same account. For more information about site types, see [AUTOTITLE](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites).
37+
If you set a custom domain for a user or organization site, by default, the same custom domain will be used for all project sites owned by the same account. For more information about site types, see [AUTOTITLE](/pages/getting-started-with-github-pages/what-is-github-pages#types-of-github-pages-sites).
3838

3939
For example, if the custom domain for your user site is `www.octocat.com`, and you have a project site with no custom domain configured that is published from a repository called `octo-project`, the {% data variables.product.prodname_pages %} site for that repository will be available at `www.octocat.com/octo-project`.
4040

0 commit comments

Comments
 (0)