Skip to content

Commit 153c2bc

Browse files
authored
Merge branch 'main' into bold-headers
2 parents 3231aeb + 1d7acfa commit 153c2bc

2,308 files changed

Lines changed: 49979 additions & 788637 deletions

File tree

Some content is hidden

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

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = [
2424
'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8',
2525
'pascalgn/automerge-action@c9bd182',
2626
'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326',
27-
'peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670',
27+
'peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd',
2828
'peter-evans/create-pull-request@938e6aea6f8dbdaced2064e948cb806c77fe87b8',
2929
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
3030
'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',

.github/workflows/check-all-english-links.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- name: Run script
2020
run: |
2121
script/check-english-links.js > broken_links.md
22-
echo -e '\ncc @github/docs-content'>> broken_links.md
2322
- if: ${{ failure() }}
2423
name: Get title for issue
2524
id: check
@@ -28,7 +27,7 @@ jobs:
2827
name: Close previous report
2928
uses: lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8
3029
with:
31-
query: 'label:"broken+link+report"'
30+
query: 'label:"broken link report"'
3231
token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
3332
- if: ${{ failure() }}
3433
name: Create issue from file
@@ -40,11 +39,10 @@ jobs:
4039
content-filepath: ./broken_links.md
4140
labels: broken link report
4241
- if: ${{ failure() }}
43-
name: Add issue to FR project board
44-
uses: peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670
42+
name: Add comment to issue
43+
uses: peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd
4544
with:
46-
project-repository: 'github'
47-
project-number: '1367'
48-
column-name: 'Docs-content FR issues'
45+
body: |
46+
cc @github/docs-content
4947
issue-number: ${{ steps.broken-link-report.outputs.issue-number }}
5048
token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}

content/actions/creating-actions/about-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ You can build Docker container and JavaScript actions. Actions require a metadat
3232
| Type | Operating system |
3333
| ---- | ------------------- |
3434
| Docker container | Linux |
35-
| JavaScript | Linux, MacOS, Windows |
36-
| Composite run steps | Linux, MacOS, Windows |
35+
| JavaScript | Linux, macOS, Windows |
36+
| Composite run steps | Linux, macOS, Windows |
3737

3838
#### Docker container actions
3939

content/actions/hosting-your-own-runners/about-self-hosted-runners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The following operating systems are supported for the self-hosted runner applica
8787
- Windows Server 2016 64-bit
8888
- Windows Server 2019 64-bit
8989

90-
#### MacOS
90+
#### macOS
9191

9292
- macOS 10.13 (High Sierra) or later
9393

content/actions/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Printing "Hello, World!" is a great way to explore the basic set up and syntax o
103103
# When the event is triggered, GitHub Actions will run the jobs indicated
104104
jobs:
105105
say_hello:
106-
# Uses a ubuntu-lates runner to complete the requested steps
106+
# Uses a ubuntu-latest runner to complete the requested steps
107107
runs-on: ubuntu-latest
108108
steps:
109109
- run: |

content/actions/reference/specifications-for-github-hosted-runners.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ The software tools included in {% data variables.product.prodname_dotcom %}-host
6363
* [Ubuntu 16.04 LTS](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1604-README.md)
6464
* [Windows Server 2019](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md)
6565
* [Windows Server 2016](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md)
66-
* [MacOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md)
67-
* [MacOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md)
66+
* [macOS 10.15](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md)
67+
* [macOS 11.0](https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md)
6868

6969
{% data reusables.github-actions.ubuntu-runner-preview %}
7070
{% data reusables.github-actions.macos-runner-preview %}

content/admin/configuration/index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ versions:
3131
{% link_in_list /enabling-private-mode %}
3232
{% link_in_list /configuring-email-for-notifications %}
3333
{% link_in_list /configuring-rate-limits %}
34-
<!-- if currentVersion ver_gt "enterprise-server@2.15" -->
3534
{% link_in_list /configuring-applications %}
36-
<!-- endif -->
3735
{% link_in_list /troubleshooting-ssl-errors %}
3836
{% link_in_list /configuring-time-synchronization %}
3937
{% link_in_list /command-line-utilities %}
@@ -54,11 +52,7 @@ versions:
5452
{% link_in_list /connecting-github-enterprise-server-to-github-enterprise-cloud %}
5553
{% link_in_list /enabling-unified-search-between-github-enterprise-server-and-githubcom %}
5654
{% link_in_list /enabling-unified-contributions-between-github-enterprise-server-and-githubcom %}
57-
<!-- if currentVersion ver_gt "enterprise-server@2.16" -->
5855
{% link_in_list /enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server %}
5956
{% link_in_list /enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud %}
60-
<!-- endif -->
61-
<!-- if currentVersion ver_gt "enterprise-server@2.21" -->
6257
{% topic_link_in_list /configuring-advanced-security-features %}
6358
{% link_in_list /configuring-code-scanning-for-your-appliance %}
64-
<!-- endif -->

content/github/administering-a-repository/configuration-options-for-dependency-updates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ updates:
302302
- dependency-name: "express"
303303
# For Express, ignore all updates for version 4 and 5
304304
versions: ["4.x", "5.x"]
305-
# For Loadash, ignore all updates
306-
- dependency-name: "loadash"
305+
# For Lodash, ignore all updates
306+
- dependency-name: "lodash"
307307
```
308308
309309
{% note %}

content/github/administering-a-repository/index.md

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,24 @@ versions:
1212
### Table of Contents
1313

1414
{% topic_link_in_list /managing-repository-settings %}
15-
{% link_in_list /setting-repository-visibility %}{% if currentVersion == "free-pro-team@latest" %}
16-
{% link_in_list /managing-teams-and-people-with-access-to-your-repository %}{% endif %}
15+
{% link_in_list /setting-repository-visibility %}
16+
{% link_in_list /managing-teams-and-people-with-access-to-your-repository %}
1717
{% link_in_list /classifying-your-repository-with-topics %}
1818
{% link_in_list /customizing-how-changed-files-appear-on-github %}
1919
{% link_in_list /about-email-notifications-for-pushes-to-your-repository %}
20-
<!-- if currentVersion == "free-pro-team@latest" -->
2120
{% link_in_list /displaying-a-sponsor-button-in-your-repository %}
22-
<!-- endif -->
23-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.17" -->
2421
{% link_in_list /customizing-your-repositorys-social-media-preview %}
25-
<!-- endif -->
26-
<!-- if currentVersion == "free-pro-team@latest" -->
2722
{% link_in_list /viewing-deployment-activity-for-your-repository %}
28-
<!-- endif -->
2923
{% link_in_list /managing-the-forking-policy-for-your-repository %}
30-
<!-- if enterpriseServerVersions contains currentVersion -->
3124
{% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository %}
3225
{% link_in_list /disabling-or-limiting-github-actions-for-a-repository %}
3326
{% link_in_list /managing-git-lfs-objects-in-archives-of-your-repository %}
3427
{% link_in_list /enabling-anonymous-git-read-access-for-a-repository %}
35-
<!-- endif -->
36-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.18" -->
3728
{% link_in_list /configuring-autolinks-to-reference-external-resources %}
38-
<!-- endif -->
3929
{% link_in_list /renaming-a-repository %}
4030
{% link_in_list /transferring-a-repository %}
4131
{% link_in_list /deleting-a-repository %}
42-
<!-- if currentVersion == "free-pro-team@latest" -->
4332
{% link_in_list /restoring-a-deleted-repository %}
44-
<!-- endif -->
4533
{% topic_link_in_list /managing-branches-in-your-repository %}
4634
{% link_in_list /viewing-branches-in-your-repository %}
4735
{% link_in_list /changing-the-default-branch %}
@@ -50,9 +38,7 @@ versions:
5038
{% link_in_list /about-merge-methods-on-github %}
5139
{% link_in_list /configuring-commit-squashing-for-pull-requests %}
5240
{% link_in_list /configuring-commit-rebasing-for-pull-requests %}
53-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.18" -->
5441
{% link_in_list /managing-the-automatic-deletion-of-branches %}
55-
<!-- endif -->
5642
{% topic_link_in_list /defining-the-mergeability-of-pull-requests %}
5743
{% link_in_list /about-protected-branches %}
5844
{% link_in_list /configuring-protected-branches %}
@@ -65,31 +51,22 @@ versions:
6551
{% link_in_list /enabling-required-reviews-for-pull-requests %}
6652
{% link_in_list /about-required-commit-signing %}
6753
{% link_in_list /enabling-required-commit-signing %}
68-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" -->
6954
{% link_in_list /requiring-a-linear-commit-history %}
7055
{% link_in_list /enabling-force-pushes-to-a-protected-branch %}
7156
{% link_in_list /enabling-deletion-of-a-protected-branch %}
72-
<!-- endif -->
7357
{% topic_link_in_list /releasing-projects-on-github %}
7458
{% link_in_list /about-releases %}
7559
{% link_in_list /managing-releases-in-a-repository %}
7660
{% link_in_list /viewing-your-repositorys-releases-and-tags %}
7761
{% link_in_list /linking-to-releases %}
78-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" -->
7962
{% link_in_list /comparing-releases %}
80-
<!-- endif -->
81-
<!-- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.15" -->
8263
{% link_in_list /automation-for-release-forms-with-query-parameters %}
83-
<!-- endif -->
84-
<!-- if currentVersion == "free-pro-team@latest" -->
8564
{% topic_link_in_list /securing-your-repository %}
8665
{% link_in_list /about-securing-your-repository %}
8766
{% link_in_list /about-secret-scanning %}
8867
{% link_in_list /configuring-secret-scanning-for-private-repositories %}
8968
{% link_in_list /managing-alerts-from-secret-scanning %}
9069
{% link_in_list /managing-security-and-analysis-settings-for-your-repository %}
91-
<!-- endif -->
92-
<!-- if currentVersion == "free-pro-team@latest" -->
9370
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
9471
{% link_in_list /about-dependabot-version-updates %}
9572
{% link_in_list /enabling-and-disabling-version-updates %}
@@ -98,4 +75,3 @@ versions:
9875
{% link_in_list /customizing-dependency-updates %}
9976
{% link_in_list /configuration-options-for-dependency-updates %}
10077
{% link_in_list /keeping-your-actions-up-to-date-with-dependabot %}
101-
<!-- endif -->

content/github/authenticating-to-github/creating-a-strong-password.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ versions:
99
enterprise-server: '*'
1010
---
1111

12-
You must choose or generate a password for your {% data variables.product.product_name %} account that is:
12+
You must choose or generate a password for your {% data variables.product.product_name %} account that is at least:
1313
- Eight characters long, if it includes a number and a lowercase letter, or
1414
- 16 characters long with any combination of characters
1515

0 commit comments

Comments
 (0)