Skip to content

Commit b7d0974

Browse files
hubwriterhubwriter
committed
Merge branch 'main' into codespaces-universe-megabranch
2 parents 039561c + 4936519 commit b7d0974

File tree

181 files changed

+12692
-4456
lines changed

Some content is hidden

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

181 files changed

+12692
-4456
lines changed

‎.github/workflows/site-policy-sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
git config --local user.name 'site-policy-bot'
6262
git config --local user.email 'site-policy-bot@github.com'
6363
NUM_FILES_CHANGED=$(git diff --name-only HEAD^..HEAD | wc -l)
64-
if [[ $NUM_FILES_CHANGED -ge 1]]
64+
if [[ $NUM_FILES_CHANGED -ge 1 ]]
6565
then
6666
git push --set-upstream origin automated-sync-$GITHUB_RUN_ID
6767
else

‎assets/images/help/billing/download-enterprise-GHAS-usage-data.png

-1.23 KB
Loading

‎assets/images/help/billing/download-organization-GHAS-usage-data.png

3.19 KB
Loading

‎components/guides/ProductGuides.tsx

+21-19
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,28 @@ export const ProductGuides = () => {
1717
<GuidesHero />
1818
</LandingSection>
1919

20-
{learningTracks && learningTracks.length > 0 && (
21-
<LandingSection
22-
title={`${title} learning paths`}
23-
className="border-top py-6"
24-
sectionLink="learning-paths"
25-
description={t('learning_paths_desc')}
26-
>
27-
<LearningTracks />
28-
</LandingSection>
29-
)}
20+
<div data-search="article-body">
21+
{learningTracks && learningTracks.length > 0 && (
22+
<LandingSection
23+
title={`${title} learning paths`}
24+
className="border-top py-6"
25+
sectionLink="learning-paths"
26+
description={t('learning_paths_desc')}
27+
>
28+
<LearningTracks />
29+
</LandingSection>
30+
)}
3031

31-
{includeGuides && (
32-
<LandingSection
33-
title={`All ${title} guides`}
34-
className="border-top py-6 color-border-default"
35-
sectionLink="all-guides"
36-
>
37-
<ArticleCards />
38-
</LandingSection>
39-
)}
32+
{includeGuides && (
33+
<LandingSection
34+
title={`All ${title} guides`}
35+
className="border-top py-6 color-border-default"
36+
sectionLink="all-guides"
37+
>
38+
<ArticleCards />
39+
</LandingSection>
40+
)}
41+
</div>
4042
</DefaultLayout>
4143
)
4244
}

‎components/landing/ProductLanding.tsx

+41-39
Original file line numberDiff line numberDiff line change
@@ -28,53 +28,55 @@ export const ProductLanding = () => {
2828

2929
return (
3030
<DefaultLayout>
31-
<LandingSection className="pt-3">
32-
<LandingHero />
33-
</LandingSection>
34-
35-
<LandingSection>
36-
<FeaturedArticles />
37-
</LandingSection>
38-
39-
{productCodeExamples.length > 0 && (
40-
<LandingSection
41-
title={t('code_examples')}
42-
sectionLink="code-examples"
43-
className="my-6 pb-6"
44-
>
45-
<CodeExamples />
31+
<div data-search="article-body">
32+
<LandingSection className="pt-3">
33+
<LandingHero />
4634
</LandingSection>
47-
)}
4835

49-
{productCommunityExamples.length > 0 && (
50-
<LandingSection title={t('communities_using_discussions')} className="my-6 pb-6">
51-
<CommunityExamples />
36+
<LandingSection>
37+
<FeaturedArticles />
5238
</LandingSection>
53-
)}
5439

55-
{productUserExamples.length > 0 && (
56-
<LandingSection title={t('sponsor_community')} className="my-6 pb-6">
57-
<SponsorsExamples />
58-
</LandingSection>
59-
)}
40+
{productCodeExamples.length > 0 && (
41+
<LandingSection
42+
title={t('code_examples')}
43+
sectionLink="code-examples"
44+
className="my-6 pb-6"
45+
>
46+
<CodeExamples />
47+
</LandingSection>
48+
)}
6049

61-
{router.query.productId === 'admin' && isEnterpriseServer && (
62-
<LandingSection title={t('supported_releases')} className="my-6 pb-6">
63-
<ProductReleases />
64-
</LandingSection>
65-
)}
50+
{productCommunityExamples.length > 0 && (
51+
<LandingSection title={t('communities_using_discussions')} className="my-6 pb-6">
52+
<CommunityExamples />
53+
</LandingSection>
54+
)}
55+
56+
{productUserExamples.length > 0 && (
57+
<LandingSection title={t('sponsor_community')} className="my-6 pb-6">
58+
<SponsorsExamples />
59+
</LandingSection>
60+
)}
6661

67-
{featuredLinks.guideCards?.length > 0 && (
68-
<div className="color-bg-subtle py-6">
69-
<LandingSection title={t('guides')} sectionLink="guides-2" className="my-6">
70-
<GuideCards />
62+
{router.query.productId === 'admin' && isEnterpriseServer && (
63+
<LandingSection title={t('supported_releases')} className="my-6 pb-6">
64+
<ProductReleases />
7165
</LandingSection>
72-
</div>
73-
)}
66+
)}
7467

75-
<LandingSection title={`All ${shortTitle} docs`} sectionLink="all-docs" className="pt-9">
76-
<ProductArticlesList />
77-
</LandingSection>
68+
{featuredLinks.guideCards?.length > 0 && (
69+
<div className="color-bg-subtle py-6">
70+
<LandingSection title={t('guides')} sectionLink="guides-2" className="my-6">
71+
<GuideCards />
72+
</LandingSection>
73+
</div>
74+
)}
75+
76+
<LandingSection title={`All ${shortTitle} docs`} sectionLink="all-docs" className="pt-9">
77+
<ProductArticlesList />
78+
</LandingSection>
79+
</div>
7880
</DefaultLayout>
7981
)
8082
}

‎content/actions/creating-actions/creating-a-docker-container-action.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Next, the script gets the current time and sets it as an output variable that ac
124124
1. Make your `entrypoint.sh` file executable. Git provides a way to explicitly change the permission mode of a file so that it doesn’t get reset every time there is a clone/fork.
125125

126126
```shell{:copy}
127-
$ git update-index —chmod=+x entrypoint.sh
127+
$ git update-index --chmod=+x entrypoint.sh
128128
```
129129

130130
1. Optionally, to check the permission mode of the file in the git index, run the following command.

‎content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ When you use external authentication, {% data variables.product.product_location
3636

3737
If you use an enterprise with {% data variables.product.prodname_emus %}, members of your enterprise authenticate to access {% data variables.product.prodname_dotcom %} through your SAML identity provider (IdP). For more information, see "[About {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users)" and "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#authentication-methods-for-github-enterprise-server)."
3838

39-
{% data variables.product.product_name %} automatically creates a username for each person when their user account is provisioned via SCIM, by normalizing an identifier provided by your IdP. If multiple identifiers are normalized into the same username, a username conflict occurs, and only the first user account is created. You can resolve username conflicts by making a change in your IdP so that the normalized usernames will be unique.
39+
{% data variables.product.product_name %} automatically creates a username for each person when their user account is provisioned via SCIM, by normalizing an identifier provided by your IdP. If multiple identifiers are normalized into the same username, a username conflict occurs, and only the first user account is created. {% data reusables.enterprise-accounts.emu-only-emails-within-the-enterprise-can-conflict %} You can resolve username conflicts by making a change in your IdP so that the normalized usernames will be unique.
4040

4141
{% elsif ghae %}
4242

‎content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ By default, when an unauthenticated user attempts to access an enterprise that u
135135

136136
{% data variables.product.product_name %} automatically creates a username for each person by normalizing an identifier provided by your IdP. For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
137137

138-
A conflict may occur when provisioning users if the unique parts of the identifier provided by your IdP are removed during normalization. If you're unable to provision a user due to a username conflict, you should modify the username provided by your IdP. For more information, see "[Resolving username conflicts](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication#resolving-username-conflicts)."
138+
A conflict may occur when provisioning users if the unique parts of the identifier provided by your IdP are removed during normalization. {% data reusables.enterprise-accounts.emu-only-emails-within-the-enterprise-can-conflict %} If you're unable to provision a user due to a username conflict, you should modify the username provided by your IdP. For more information, see "[Resolving username conflicts](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication#resolving-username-conflicts)."
139139

140140
The profile name and email address of a {% data variables.product.prodname_managed_user %} is also provided by the IdP. {% data variables.product.prodname_managed_users_caps %} cannot change their profile name or email address on {% data variables.product.prodname_dotcom %}, and the IdP can only provide a single email address.
141141

‎content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ If you are a site administrator for {% data variables.product.product_location %
6666
```shell
6767
> Generating public/private ALGORITHM key pair.
6868
```
69-
3. When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location.
69+
When you're prompted to "Enter a file in which to save the key", you can press **Enter** to accept the default file location. Please note that if you created SSH keys previously, ssh-keygen may ask you to rewrite another key, in which case we recommend creating a custom-named SSH key. To do so, type the default file location and replace id_ssh_keyname with your custom key name.
70+
7071

7172
{% mac %}
7273

‎content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ You can download the {% data variables.product.prodname_advanced_security %} lic
8888
{% data reusables.profile.access_org %}
8989
{% data reusables.profile.org_settings %}
9090
{% data reusables.organizations.billing_plans %}
91-
1. Underneath "{% data variables.product.prodname_GH_advanced_security %}," click {% octicon "download" aria-label="The download icon" %} next to "Committers."
91+
1. Underneath "{% data variables.product.prodname_GH_advanced_security %}," click **{% octicon "download" aria-label="The download icon" %} CSV report** next to "Committers."
9292
![Download button for organization-level data](/assets/images/help/billing/download-organization-GHAS-usage-data.png)
9393

9494
#### At the enterprise-level
9595

9696
{% data reusables.enterprise-accounts.access-enterprise %}
9797
{% data reusables.enterprise-accounts.settings-tab %}
9898
{% data reusables.enterprise-accounts.license-tab %}
99-
1. Under "{% data variables.product.prodname_GH_advanced_security %}," click {% octicon "download" aria-label="The download icon" %} next to "Commiters."
99+
1. Under "{% data variables.product.prodname_GH_advanced_security %}," click **{% octicon "download" aria-label="The download icon" %} CSV report** next to "Committers."
100100
![Download button for enterprise-level data](/assets/images/help/billing/download-enterprise-GHAS-usage-data.png)
101101

102102
### Downloading {% data variables.product.prodname_advanced_security %} license usage information through the REST API

‎content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ For general information about configuring {% data variables.product.prodname_cod
4040

4141
## About autobuild for {% data variables.product.prodname_codeql %}
4242

43-
Code scanning works by running queries against one or more databases. Each database contains a representation of all of the code in a single language in your repository. For the compiled languages C/C++, C#, and Java, the process of populating this database involves building the code and extracting data. {% data reusables.code-scanning.analyze-go %}
43+
{% data variables.product.prodname_code_scanning_capc %} works by running queries against one or more databases. Each database contains a representation of all of the code in a single language in your repository.
44+
For the compiled languages C/C++, C#, and Java, the process of populating this database involves building the code and extracting data. {% data reusables.code-scanning.analyze-go %}
4445

4546
{% data reusables.code-scanning.autobuild-compiled-languages %}
4647

‎content/code-security/dependabot/dependabot-alerts/browsing-security-advisories-in-the-github-advisory-database.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ Generally, we name our supported ecosystems after the software programming langu
5757
- Maven (registry: https://repo.maven.apache.org/maven2)
5858
- npm (registry: https://www.npmjs.com/)
5959
- NuGet (registry: https://www.nuget.org/)
60-
- pip (registry: https://pypi.org/)
60+
- pip (registry: https://pypi.org/){% ifversion dependency-graph-dart-support %}
61+
- pub (registry: https://pub.dev/packages/registry){% endif %}
6162
- RubyGems (registry: https://rubygems.org/)
6263
- Rust (registry: https://crates.io/)
6364

‎content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -784,15 +784,7 @@ registries:
784784

785785
### `docker-registry`
786786

787-
{% data variables.product.prodname_dependabot %} works with container registries that implement the OCI container registry. For more information, see [https://github.com/opencontainers/distribution-spec/blob/main/spec.md](https://github.com/opencontainers/distribution-spec/blob/main/spec.md). {% data variables.product.prodname_dependabot %} supports authentication to private registries via a central service. For further details, see [Token Authentication Specification](https://docs.docker.com/registry/spec/auth/token/) in the Docker documentation.
788-
789-
We currently support the container registries listed here:
790-
791-
* Docker Hub
792-
* {% data variables.product.company_short %} {% data variables.product.prodname_container_registry %}
793-
* GCR (Google Cloud)
794-
* Private ECR (AWS) - public ECR support is tracked in [https://github.com/dependabot/dependabot-core/issues/4212](https://github.com/dependabot/dependabot-core/issues/4212).
795-
787+
{% data variables.product.prodname_dependabot %} works with any container registries that implement the OCI container registry spec. For more information, see [https://github.com/opencontainers/distribution-spec/blob/main/spec.md](https://github.com/opencontainers/distribution-spec/blob/main/spec.md). {% data variables.product.prodname_dependabot %} supports authentication to private registries via a central token service or HTTP Basic Auth. For further details, see [Token Authentication Specification](https://docs.docker.com/registry/spec/auth/token/) in the Docker documentation and [Basic access authentication](https://en.wikipedia.org/wiki/Basic_access_authentication) on Wikipedia.
796788

797789
The `docker-registry` type supports username and password.
798790

‎content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
go-version: ">=1.18.0"
6262

6363
- name: Run snapshot action
64-
uses: @actions/go-dependency-submission@v1
64+
uses: actions/go-dependency-submission@v1
6565
with:
6666
# Required: Define the repo path to the go.mod file used by the
6767
# build target

‎content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -283,14 +283,16 @@ you or your users have two-factor authentication enabled.
283283

284284
The `redirect_uri` parameter is optional. If left out, GitHub will
285285
redirect users to the callback URL configured in the OAuth Application
286-
settings. If provided, the redirect URL's host and port must exactly
286+
settings. If provided, the redirect URL's host (excluding sub-domains) and port must exactly
287287
match the callback URL. The redirect URL's path must reference a
288288
subdirectory of the callback URL.
289289

290290
CALLBACK: http://example.com/path
291291

292292
GOOD: http://example.com/path
293293
GOOD: http://example.com/path/subdir/other
294+
GOOD: http://oauth.example.com/path
295+
GOOD: http://oauth.example.com/path/subdir/other
294296
BAD: http://example.com/bar
295297
BAD: http://example.com/
296298
BAD: http://example.com:8080/path

0 commit comments

Comments
 (0)