Skip to content

Commit 2860d75

Browse files
authored
Merge pull request #17932 from github/repo-sync
repo sync
2 parents 431e909 + 40ce7a5 commit 2860d75

File tree

52 files changed

+234
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+234
-206
lines changed

content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/viewing-contributions-on-your-profile.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ The contribution activity section includes a detailed timeline of your work, inc
9191

9292
![Contribution activity time filter](/assets/images/help/profile/contributions_activity_time_filter.png)
9393

94-
{% ifversion fpt or ghes or ghae or ghec %}
95-
9694
## Viewing contributions from {% data variables.product.prodname_enterprise %} on {% data variables.product.prodname_dotcom_the_website %}
9795

9896
If you use {% ifversion fpt or ghec %}{% data variables.product.prodname_ghe_server %}{% ifversion ghae %} or {% data variables.product.prodname_ghe_managed %}{% endif %}{% else %}{% data variables.product.product_name %}{% endif %} and your enterprise owner enables {% data variables.product.prodname_unified_contributions %}, you can send enterprise contribution counts from to your {% data variables.product.prodname_dotcom_the_website %} profile. For more information, see "[Sending enterprise contributions to your {% data variables.product.prodname_dotcom_the_website %} profile](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/sending-enterprise-contributions-to-your-githubcom-profile)."
9997

100-
{% endif %}

content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,11 @@ The security log lists all actions performed within the last 90 days.
2828
![Security log tab](/assets/images/help/settings/audit-log-tab.png)
2929
{% endif %}
3030

31-
{% ifversion fpt or ghae or ghes or ghec %}
3231
## Searching your security log
3332

3433
{% data reusables.audit_log.audit-log-search %}
3534

3635
### Search based on the action performed
37-
{% else %}
38-
## Understanding events in your security log
39-
{% endif %}
4036

4137
The events listed in your security log are triggered by your actions. Actions are grouped into the following categories:
4238

content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ Using the template builder, you can specify a title and description for each tem
3636
With issue forms, you can create templates that have web form fields using the {% data variables.product.prodname_dotcom %} form schema. When a contributor opens an issue using an issue form, the form inputs are converted to a standard markdown issue comment. You can specify different input types and set inputs as required to help contributors open actionable issues in your repository. For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#creating-issue-forms)" and "[Syntax for issue forms](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms)."
3737
{% endif %}
3838

39-
{% ifversion fpt or ghae or ghes or ghec %}
4039
{% data reusables.repositories.issue-template-config %} For more information, see "[Configuring issue templates for your repository](/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser)."
41-
{% endif %}
4240

4341
Issue templates are stored on the repository's default branch, in a hidden `.github/ISSUE_TEMPLATE` directory. If you create a template in another branch, it will not be available for collaborators to use. Issue template filenames are not case sensitive, and need a *.md* extension.{% ifversion fpt or ghec %} Issue templates created with issue forms need a *.yml* extension.{% endif %} {% data reusables.repositories.valid-community-issues %}
4442

content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ shortTitle: Configure
2121

2222
{% endif %}
2323

24-
{% ifversion fpt or ghae or ghes or ghec %}
25-
2624
## Creating issue templates
2725

28-
{% endif %}
29-
3026
{% data reusables.repositories.navigate-to-repo %}
3127
{% data reusables.repositories.sidebar-settings %}
3228
3. In the "Features" section, under "Issues," click **Set up templates**.
@@ -71,7 +67,6 @@ Here is the rendered version of the issue form.
7167

7268
{% endif %}
7369

74-
{% ifversion fpt or ghae or ghes or ghec %}
7570
## Configuring the template chooser
7671

7772
{% data reusables.repositories.issue-template-config %}
@@ -110,7 +105,6 @@ Your configuration file will customize the template chooser when the file is mer
110105
{% data reusables.files.write_commit_message %}
111106
{% data reusables.files.choose_commit_branch %}
112107
{% data reusables.files.propose_new_file %}
113-
{% endif %}
114108

115109
## Further reading
116110

content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ While most of your API interaction should occur using your server-to-server inst
238238

239239
* [List deployments](/rest/reference/deployments#list-deployments)
240240
* [Create a deployment](/rest/reference/deployments#create-a-deployment)
241-
* [Get a deployment](/rest/reference/deployments#get-a-deployment){% ifversion fpt or ghes or ghae or ghec %}
242-
* [Delete a deployment](/rest/reference/deployments#delete-a-deployment){% endif %}
241+
* [Get a deployment](/rest/reference/deployments#get-a-deployment)
242+
* [Delete a deployment](/rest/reference/deployments#delete-a-deployment)
243243

244244
#### Events
245245

@@ -421,14 +421,12 @@ While most of your API interaction should occur using your server-to-server inst
421421
* [Remove pre-receive hook enforcement for an organization](/enterprise/user/rest/reference/enterprise-admin#remove-pre-receive-hook-enforcement-for-an-organization)
422422
{% endif %}
423423

424-
{% ifversion fpt or ghes or ghae or ghec %}
425424
#### Organization Team Projects
426425

427426
* [List team projects](/rest/reference/teams#list-team-projects)
428427
* [Check team permissions for a project](/rest/reference/teams#check-team-permissions-for-a-project)
429428
* [Add or update team project permissions](/rest/reference/teams#add-or-update-team-project-permissions)
430429
* [Remove a project from a team](/rest/reference/teams#remove-a-project-from-a-team)
431-
{% endif %}
432430

433431
#### Organization Team Repositories
434432

@@ -574,7 +572,7 @@ While most of your API interaction should occur using your server-to-server inst
574572

575573
#### Reactions
576574

577-
{% ifversion fpt or ghes or ghae or ghec %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction-legacy){% else %}* [Delete a reaction](/rest/reference/reactions#delete-a-reaction){% endif %}
575+
* [Delete a reaction](/rest/reference/reactions)
578576
* [List reactions for a commit comment](/rest/reference/reactions#list-reactions-for-a-commit-comment)
579577
* [Create reaction for a commit comment](/rest/reference/reactions#create-reaction-for-a-commit-comment)
580578
* [List reactions for an issue](/rest/reference/reactions#list-reactions-for-an-issue)
@@ -586,13 +584,13 @@ While most of your API interaction should occur using your server-to-server inst
586584
* [List reactions for a team discussion comment](/rest/reference/reactions#list-reactions-for-a-team-discussion-comment)
587585
* [Create reaction for a team discussion comment](/rest/reference/reactions#create-reaction-for-a-team-discussion-comment)
588586
* [List reactions for a team discussion](/rest/reference/reactions#list-reactions-for-a-team-discussion)
589-
* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion){% ifversion fpt or ghes or ghae or ghec %}
587+
* [Create reaction for a team discussion](/rest/reference/reactions#create-reaction-for-a-team-discussion)
590588
* [Delete a commit comment reaction](/rest/reference/reactions#delete-a-commit-comment-reaction)
591589
* [Delete an issue reaction](/rest/reference/reactions#delete-an-issue-reaction)
592590
* [Delete a reaction to a commit comment](/rest/reference/reactions#delete-an-issue-comment-reaction)
593591
* [Delete a pull request comment reaction](/rest/reference/reactions#delete-a-pull-request-comment-reaction)
594592
* [Delete team discussion reaction](/rest/reference/reactions#delete-team-discussion-reaction)
595-
* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction){% endif %}
593+
* [Delete team discussion comment reaction](/rest/reference/reactions#delete-team-discussion-comment-reaction)
596594

597595
#### Repositories
598596

@@ -706,11 +704,9 @@ While most of your API interaction should occur using your server-to-server inst
706704
* [Get a repository README](/rest/reference/repos#get-a-repository-readme)
707705
* [Get the license for a repository](/rest/reference/licenses#get-the-license-for-a-repository)
708706

709-
{% ifversion fpt or ghes or ghae or ghec %}
710707
#### Repository Event Dispatches
711708

712709
* [Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event)
713-
{% endif %}
714710

715711
#### Repository Hooks
716712

content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ Webhook events are triggered based on the specificity of the domain you register
353353
### Webhook payload object
354354
355355
Key | Type | Description
356-
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
357-
`action` |`string` | The action performed. Can be `created`.{% endif %}
356+
----|------|-------------
357+
`action` |`string` | The action performed. Can be `created`.
358358
`deployment` |`object` | The [deployment](/rest/reference/deployments#list-deployments).
359359
{% data reusables.webhooks.repo_desc %}
360360
{% data reusables.webhooks.org_desc %}
@@ -378,8 +378,8 @@ Key | Type | Description
378378
### Webhook payload object
379379
380380
Key | Type | Description
381-
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
382-
`action` |`string` | The action performed. Can be `created`.{% endif %}
381+
----|------|-------------
382+
`action` |`string` | The action performed. Can be `created`.
383383
`deployment_status` |`object` | The [deployment status](/rest/reference/deployments#list-deployment-statuses).
384384
`deployment_status["state"]` |`string` | The new state. Can be `pending`, `success`, `failure`, or `error`.
385385
`deployment_status["target_url"]` |`string` | The optional link added to the status.
@@ -1152,7 +1152,6 @@ Key | Type | Description
11521152
11531153
{{ webhookPayloadsForCurrentVersion.release.published }}
11541154
1155-
{% ifversion fpt or ghes or ghae or ghec %}
11561155
## repository_dispatch
11571156
11581157
This event occurs when a {% data variables.product.prodname_github_app %} sends a `POST` request to the "[Create a repository dispatch event](/rest/reference/repos#create-a-repository-dispatch-event)" endpoint.
@@ -1164,7 +1163,6 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends
11641163
### Webhook payload example
11651164
11661165
{{ webhookPayloadsForCurrentVersion.repository_dispatch }}
1167-
{% endif %}
11681166
11691167
## repository
11701168

content/get-started/getting-started-with-git/about-remote-repositories.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,10 @@ When you `git clone`, `git fetch`, `git pull`, or `git push` to a remote reposit
8181

8282
{% endtip %}
8383

84-
{% ifversion fpt or ghes or ghae or ghec %}
85-
8684
## Cloning with {% data variables.product.prodname_cli %}
8785

8886
You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} workflows in your terminal. For more information, see "[About {% data variables.product.prodname_cli %}](/github-cli/github-cli/about-github-cli)."
8987

90-
{% endif %}
91-
9288
{% ifversion not ghae %}
9389
## Cloning with Subversion
9490

content/get-started/quickstart/communicating-on-github.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ This example shows the {% data variables.product.prodname_discussions %} welcome
116116
This community maintainer started a discussion to welcome the community, and to ask members to introduce themselves. This post fosters an inviting atmosphere for visitors and contributors. The post also clarifies that the team's happy to help with contributions to the repository.
117117

118118
{% endif %}
119-
{% ifversion fpt or ghes or ghae or ghec %}
120119
### Scenarios for team discussions
121120

122121
- I have a question that's not necessarily related to specific files in the repository.
@@ -139,8 +138,6 @@ The `octocat` team member posted a team discussion, informing the team of variou
139138
- There is a blog post describing how the teams use {% data variables.product.prodname_actions %} to produce their docs.
140139
- Material about the April All Hands is now available for all team members to view.
141140

142-
{% endif %}
143-
144141
## Next steps
145142

146143
These examples showed you how to decide which is the best tool for your conversations on {% data variables.product.product_name %}. But this is only the beginning; there is so much more you can do to tailor these tools to your needs.

content/get-started/using-github/keyboard-shortcuts.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The {% data variables.product.prodname_command_palette %} also gives you quick a
3030
| Keyboard shortcut | Description
3131
|-----------|------------
3232
|<kbd>S</kbd> or <kbd>/</kbd> | Focus the search bar. For more information, see "[About searching on {% data variables.product.company_short %}](/search-github/getting-started-with-searching-on-github/about-searching-on-github)."
33-
|<kbd>G</kbd> <kbd>N</kbd> | Go to your notifications. For more information, see {% ifversion fpt or ghes or ghae or ghec %}"[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}"[About notifications](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}."
33+
|<kbd>G</kbd> <kbd>N</kbd> | Go to your notifications. For more information, see "[About notifications](/github/managing-subscriptions-and-notifications-on-github/about-notifications)."
3434
|<kbd>Esc</kbd> | When focused on a user, issue, or pull request hovercard, closes the hovercard and refocuses on the element the hovercard is in
3535
{% if command-palette %}|<kbd>Command</kbd>+<kbd>K</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>K</kbd> (Windows/Linux) | Opens the {% data variables.product.prodname_command_palette %}. If you are editing Markdown text, open the command palette with <kbd>Command</kbd>+<kbd>Option</kbd>+<kbd>K</kbd> or <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>K</kbd>. For more information, see "[{% data variables.product.prodname_command_palette %}](/get-started/using-github/github-command-palette)."{% endif %}
3636

@@ -101,7 +101,6 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
101101
|<kbd>Command</kbd>+<kbd>G</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>G</kbd> (Windows/Linux) | Insert a suggestion. For more information, see "[Reviewing proposed changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request)." |{% endif %}
102102
|<kbd>R</kbd> | Quote the selected text in your reply. For more information, see "[Basic writing and formatting syntax](/articles/basic-writing-and-formatting-syntax#quoting-text)." |
103103

104-
105104
## Issue and pull request lists
106105

107106
| Keyboard shortcut | Description
@@ -137,8 +136,8 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
137136
|<kbd>J</kbd> | Move selection down in the list
138137
|<kbd>K</kbd> | Move selection up in the list
139138
|<kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>Enter</kbd> | Add a single comment on a pull request diff |
140-
|<kbd>Alt</kbd> and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down <kbd>Alt</kbd> and clicking **Show outdated** or **Hide outdated**.|{% ifversion fpt or ghes or ghae or ghec %}
141-
|Click, then <kbd>Shift</kbd> and click | Comment on multiple lines of a pull request by clicking a line number, holding <kbd>Shift</kbd>, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."|{% endif %}
139+
|<kbd>Alt</kbd> and click | Toggle between collapsing and expanding all outdated review comments in a pull request by holding down <kbd>Alt</kbd> and clicking **Show outdated** or **Hide outdated**.|
140+
|Click, then <kbd>Shift</kbd> and click | Comment on multiple lines of a pull request by clicking a line number, holding <kbd>Shift</kbd>, then clicking another line number. For more information, see "[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#adding-line-comments-to-a-pull-request)."|
142141

143142
## Project boards
144143

@@ -195,21 +194,13 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
195194

196195
## Notifications
197196

198-
{% ifversion fpt or ghes or ghae or ghec %}
199197
| Keyboard shortcut | Description
200198
|-----------|------------
201199
|<kbd>E</kbd> | Mark as done
202200
|<kbd>Shift</kbd>+<kbd>U</kbd>| Mark as unread
203201
|<kbd>Shift</kbd>+<kbd>I</kbd>| Mark as read
204202
|<kbd>Shift</kbd>+<kbd>M</kbd> | Unsubscribe
205203

206-
{% else %}
207-
208-
| Keyboard shortcut | Description
209-
|-----------|------------
210-
|<kbd>E</kbd> or <kbd>I</kbd> or <kbd>Y</kbd> | Mark as read
211-
|<kbd>Shift</kbd>+<kbd>M</kbd> | Mute thread
212-
{% endif %}
213204

214205
## Network graph
215206

content/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ Gist supports mapping GeoJSON files. These maps are displayed in embedded gists,
6060

6161
Follow the steps below to create a gist.
6262

63-
{% ifversion fpt or ghes or ghae or ghec %}
6463
{% note %}
6564

6665
You can also create a gist using the {% data variables.product.prodname_cli %}. For more information, see "[`gh gist create`](https://cli.github.com/manual/gh_gist_create)" in the {% data variables.product.prodname_cli %} documentation.
6766

6867
Alternatively, you can drag and drop a text file from your desktop directly into the editor.
6968

7069
{% endnote %}
71-
{% endif %}
7270

7371
1. Sign in to {% data variables.product.product_name %}.
7472
2. Navigate to your {% data variables.gists.gist_homepage %}.

0 commit comments

Comments
 (0)