Skip to content

Commit f8e75e0

Browse files
authored
Merge pull request #43712 from github/repo-sync
Repo sync
2 parents 365a48a + 873ae90 commit f8e75e0

File tree

121 files changed

+267
-3318
lines changed

Some content is hidden

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

121 files changed

+267
-3318
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
- graphql
5959
- landings
6060
- languages
61-
- learning-track
6261
# - links
6362
- observability
6463
# - open-source

content/README.md

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ See the [contributing docs](https://docs.github.com/en/contributing) for general
2323
- [`changelog`](#changelog)
2424
- [`defaultPlatform`](#defaultplatform)
2525
- [`defaultTool`](#defaulttool)
26-
- [`learningTracks`](#learningtracks)
27-
- [`includeGuides`](#includeguides)
26+
2827
- [`journeyTracks`](#journeytracks)
28+
- [`journeyArticlesHeading`](#journeyarticlesheading)
2929
- [`contentType`](#contenttype)
3030
- [`communityRedirect`](#communityRedirect)
3131
- [`effectiveDate`](#effectiveDate)
@@ -40,7 +40,6 @@ See the [contributing docs](https://docs.github.com/en/contributing) for general
4040
- [Legacy filepaths and redirects for links](#legacy-filepaths-and-redirects-for-links)
4141
- [Index pages](#index-pages)
4242
- [Home page](#homepage)
43-
- [Creating new product guides pages](#creating-new-product-guides-pages)
4443

4544
## Frontmatter
4645

@@ -230,27 +229,6 @@ defaultPlatform: linux
230229
defaultTool: cli
231230
```
232231

233-
### `learningTracks`
234-
- Purpose: Render a list of learning tracks on a product's sub-landing page.
235-
- type: `String`. This should reference learning tracks' names defined in [`data/learning-tracks/*.yml`](../data/learning-tracks/README.md).
236-
- Optional
237-
238-
**Note: the featured track is set by a specific property in the learning tracks YAML. See that [README](../data/learning-tracks/README.md) for details.*
239-
240-
### `includeGuides`
241-
- Purpose: Render a list of articles, filterable by `contentType`. Only applicable when used with `layout: product-guides`.
242-
- Type: `Array`
243-
- Optional.
244-
245-
Example:
246-
247-
```yaml
248-
includeGuides:
249-
- /actions/guides/about-continuous-integration
250-
- /actions/guides/setting-up-continuous-integration-using-workflow-templates
251-
- /actions/guides/building-and-testing-nodejs
252-
- /actions/guides/building-and-testing-powershell
253-
```
254232

255233
### `journeyTracks`
256234
- Purpose: Define journeys for journey landing pages.
@@ -284,6 +262,24 @@ journeyTracks:
284262
- href: '/actions/deployment/deploying-with-github-actions'
285263
```
286264

265+
### `journeyArticlesHeading`
266+
- Purpose: Override the default "Articles" heading shown above the article list on single-track journey landing pages.
267+
- Type: `String`
268+
- Only applicable when used with `layout: journey-landing` and a single journey track.
269+
- Optional. If omitted, the heading defaults to the translated value of `journey_landing.articles_heading` ("Articles").
270+
271+
Example:
272+
273+
```yaml
274+
layout: journey-landing
275+
journeyArticlesHeading: "Guides"
276+
journeyTracks:
277+
- id: ado_migration
278+
title: Run your migration
279+
guides:
280+
- href: /migrations/ado/understand-migrations-from-azure-devops-to-github
281+
```
282+
287283
### `contentType`
288284
- Purpose: Indicate the type of article.
289285
- Type: `String`, one of `get-started`, `concepts`, `how-tos`, `reference`, `tutorials`, `rai`, `landing` (only applies to `content/<product>/index.md` files).
@@ -433,13 +429,3 @@ The homepage is the main Table of Contents file for the docs site. The homepage
433429

434430
`childGroups` is an array of mappings containing a `name` for the group, an optional `icon` for the group, and an array of `children`. The `children` in the array must be present in the `children` frontmatter property.
435431

436-
### Creating new product guides pages
437-
438-
To create a product guides page (e.g. [Actions' Guide page](https://docs.github.com/en/actions/guides)), create or modify an existing markdown file with these specific frontmatter values:
439-
440-
1. Use the product guides page template by referencing `layout: product-guides`.
441-
1. (optional) Include the learning tracks in [`learningTracks`](#learningTracks).
442-
1. (optional) Define which articles to include with [`includeGuides`](#includeGuides).
443-
444-
If using learning tracks, they need to be defined in [`data/learning-tracks/*.yml`](../data/learning-tracks/README.md).
445-
If using `includeGuides`, make sure each of the articles in this list has [`contentType`](#contenttype) in its frontmatter.

content/billing/how-tos/set-up-payment/connect-azure-sub.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ redirect_from:
88
- /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
99
- /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription
1010
- /billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription
11+
- /video-transcripts/transcript-billing-github-consumption-through-an-azure-subscription
1112
versions:
1213
fpt: '*'
1314
ghec: '*'

content/code-security/concepts/secret-security/about-push-protection.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ category:
1818

1919
## What is push protection?
2020

21-
Push protection is a {% data variables.product.prodname_secret_scanning %} feature designed to prevent sensitive information, such as secrets or tokens, from ever being pushed to your repository. Unlike {% data variables.product.prodname_secret_scanning %}, which detects secrets after they have been committed, push protection proactively scans your code for secrets during the push process, then blocks the push if any are detected.
21+
Push protection is a {% data variables.product.prodname_secret_scanning %} feature designed to prevent hardcoded credentials, such as secrets or tokens, from ever being pushed to your repository. Rather than alerting you to credential leaks after the fact, push protection blocks pushes that contain secrets _before_ they reach your repository.
2222

2323
## How push protection works
2424

@@ -74,9 +74,9 @@ If you want greater control over which contributors can bypass push protection a
7474

7575
## Benefits of push protection
7676

77-
* **Preventative security:** Push protection acts as a frontline defense mechanism by scanning code for secrets at the time of the push. This preventative approach helps to catch potential issues before they are merged into a repository.
77+
* **Preventative security:** Push protection acts as a frontline defense mechanism by scanning code for hardcoded secrets at the time of the push. This preventative approach helps prevent credential leaks before they become ingrained in the repository's history, making it easier to address and remediate threats.
7878
* **Immediate feedback:** Developers receive instant feedback if a potential secret is detected during a push attempt. This immediate notification allows for quick remediation, reducing the likelihood of sensitive information being exposed.
79-
* **Reduced risk of data leaks:** By blocking commits that contain sensitive information, push protection significantly reduces the risk of accidental data leaks. This helps in safeguarding against unauthorized access to your infrastructure, services, and data.
79+
* **Reduced risk of credential leaks:** By blocking commits that contain hardcoded credentials, push protection significantly reduces the risk of accidental credential leaks and secret sprawl. This helps in safeguarding against potential breaches and maintaining the integrity of the codebase.
8080
* **Efficient secret management:** Instead of retrospectively dealing with exposed secrets, developers can address issues at the source. This makes secret management more efficient and less time-consuming.
8181
* **Bypass functionality for flexibility:** For cases where false positives occur or when certain patterns are necessary, you can bypass push protection for users, and designated users can use the delegated bypass feature to bypass push protection for repositories. {% ifversion push-protection-org-enterprise-exemptions %}Additionally, you can exempt trusted actors {% ifversion push-protection-repo-exemptions %}{% else %}at the organization and enterprise levels {% endif %}from push protection entirely. {% endif %}This provides flexibility without compromising overall security.
8282
* **Ability to detect custom patterns (for repositories in organizations):** Organizations can define custom patterns for detecting secrets unique to their environment. This customization ensures that push protection can effectively identify and block even non-standard secrets.

content/code-security/concepts/secret-security/about-secret-scanning.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ category:
1919
- Protect your secrets
2020
---
2121

22-
When credentials like API keys and passwords are committed to repositories, they become targets for unauthorized access. {% data variables.product.prodname_secret_scanning_caps %} automatically detects these exposed secrets so you can secure them before they're exploited.
22+
When credentials like API keys and passwords are committed to repositories as hardcoded secrets, they become targets for unauthorized access. {% data variables.product.prodname_secret_scanning_caps %} automatically detects credential leaks so you can secure them before they're exploited.
2323

2424
{% ifversion secret-risk-assessment %}
2525

@@ -32,15 +32,15 @@ When credentials like API keys and passwords are committed to repositories, they
3232

3333
## How secret scanning protects your code
3434

35-
{% data variables.product.prodname_secret_scanning_caps %} scans your entire Git history on all branches of your repository for API keys, passwords, tokens, and other known secret types. {% data variables.product.github %} also periodically rescans repositories when new secret types are added.
35+
{% data variables.product.prodname_secret_scanning_caps %} scans your entire Git history on all branches of your repository for hardcoded credentials, including API keys, passwords, tokens, and other known secret types. This helps you identify secret sprawl, the uncontrolled proliferation of credentials across repositories, before it becomes a security risk. {% data variables.product.github %} also periodically rescans repositories when new secret types are added.
3636

3737
{% data variables.product.github %} also automatically scans:
3838

3939
{% data reusables.secret-scanning.what-is-scanned %}
4040

4141
### {% data variables.product.prodname_secret_scanning_caps %} alerts and remediation
4242

43-
When {% data variables.product.prodname_secret_scanning %} finds a potential secret, {% data variables.product.github %} generates an alert on your repository's **{% data variables.product.prodname_security_and_quality_tab %}** tab with details about the exposed credential.
43+
When {% data variables.product.prodname_secret_scanning %} detects a credential leak, {% data variables.product.github %} generates an alert on your repository's **{% data variables.product.prodname_security_and_quality_tab %}** tab with details about the exposed credential.
4444

4545
When you receive an alert, rotate the affected credential immediately to prevent unauthorized access. While you can also remove secrets from your Git history, this is time-intensive and often unnecessary if you've already revoked the credential.
4646

content/code-security/concepts/secret-security/about-secret-security-with-github.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ category:
1414
- Protect your secrets
1515
---
1616

17-
Exposed secrets in your repositories can lead to unauthorized access, data breaches, and significant costs to your organization. For details about these risks and how to protect against them, see [AUTOTITLE](/code-security/concepts/secret-security/secret-leakage-risks).
17+
Hardcoded credentials in your repositories can lead to credential leaks, unauthorized access, data breaches, and significant costs to your organization. For details about these risks and how to protect against them, see [AUTOTITLE](/code-security/concepts/secret-security/secret-leakage-risks).
1818

1919
{% data variables.product.github %} provides tools to help you understand and address your organization's exposure to leaked secrets:
2020

@@ -23,7 +23,7 @@ Exposed secrets in your repositories can lead to unauthorized access, data breac
2323

2424
## Secret risk assessment
2525

26-
The secret risk assessment provides organization owners and security managers with a free point-in-time scan of their organization's repositories to identify leaked secrets like API keys, tokens, and passwords.
26+
The secret risk assessment provides organization owners and security managers with a free point-in-time scan of their organization's repositories to identify hardcoded credentials like API keys, tokens, and passwords, and understand the extent of secret sprawl across your organization.
2727

2828
{% data variables.secret-scanning.secret-risk-assessment-cta-product %}
2929

@@ -52,13 +52,13 @@ Regular assessment helps prevent:
5252
While the {% data variables.product.prodname_secret_risk_assessment %} provides a point-in-time view of your organization's current secret exposure, {% data variables.product.prodname_GH_secret_protection %}:
5353

5454
* **Implements continuous monitoring** and expands scanned surfaces beyond code to include pull requests, issues, wikis, and discussions
55-
* **Prevents secret leaks** by blocking commits containing secrets before they are saved to {% data variables.product.github %}
55+
* **Prevents credential leaks** by blocking commits containing hardcoded secrets before they are saved to {% data variables.product.github %}
5656
* **Creates actionable alerts** that can be grouped into campaigns and assigned to team members for remediation
5757
* **Meets your specific needs** by scanning for patterns unique to your organization and unstructured secrets like passwords
5858
* **Supports governance at scale** with settings dictating who can bypass protections and dismiss alerts
5959
* **Surfaces key analytics** through a view dedicated to your organization's secret security
6060

61-
Through these features, {% data variables.product.prodname_GH_secret_protection %} provides complete coverage for your organization, reducing the risk of costly secret leaks and high-effort remediation processes.
61+
Through these features, {% data variables.product.prodname_GH_secret_protection %} provides complete coverage for your organization, reducing the risk of costly credential leaks, secret sprawl, and high-effort remediation.
6262

6363
For more information about the specific features of {% data variables.product.prodname_GH_secret_protection %}, see [AUTOTITLE](/code-security/getting-started/github-security-features#available-with-github-secret-protection).
6464

0 commit comments

Comments
 (0)