Skip to content

Commit 92ba8d9

Browse files
authored
Merge branch 'main' into experiment-with-react-and-mdx
2 parents f89c983 + c1d7d83 commit 92ba8d9

10 files changed

Lines changed: 36 additions & 12 deletions

File tree

content/admin/overview/about-enterprise-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ An enterprise account allows you to manage multiple organizations{% if enterpris
1515

1616
- Member access and management (organization members, outside collaborators){% if enterpriseServerVersions contains currentVersion %}
1717
- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs){% endif %}
18-
- Security{% if enterpriseServerVersions contains currentVersion %}(single sign-on, two factor authentication)
18+
- Security {% if enterpriseServerVersions contains currentVersion %}(single sign-on, two factor authentication)
1919
- Requests {% if enterpriseServerVersions contains currentVersion %}and support bundle sharing {% endif %}with {% data variables.contact.enterprise_support %}{% endif %}
2020

2121
{% if enterpriseServerVersions contains currentVersion %}{% data reusables.enterprise-accounts.enterprise-accounts-billing %} For more information about managing your {% data variables.product.prodname_ghe_cloud %} subscription, see "[Viewing the subscription and usage for your enterprise account](/articles/viewing-the-subscription-and-usage-for-your-enterprise-account)." {% endif %}For more information about managing your {% data variables.product.product_name %} billing settings, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)."

content/developers/overview/about-githubs-apis.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ versions:
99
github-ae: '*'
1010
---
1111

12-
There are two stable versions of the GitHub API: the [REST API](/rest) and the [GraphQL API](/graphql).
13-
14-
When using the REST API, we encourage you to [request v3 via the `Accept` header](/rest/overview/media-types#request-specific-version).
15-
16-
For information on using the GraphQL API, see the [v4 docs](/graphql).
12+
There are two stable versions of the GitHub API: the [REST API](/rest) and the [GraphQL API](/graphql). When using the REST API, we encourage you to [request v3 via the `Accept` header](/v3/media/#request-specific-version). For information on using the GraphQL API, see the [v4 docs](/graphql).
1713

1814
## Deprecated versions
1915

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ This event occurs when a {% data variables.product.prodname_github_app %} sends
10461046
10471047
Key | Type | Description
10481048
----|------|-------------
1049-
`action` |`string` | The action that was performed. This can be one of:<ul><li>`created` - A repository is created.</li><li>`deleted` - A repository is deleted. This event type is only available to [organization hooks](/rest/reference/orgs#webhooks/)</li><li>`archived` - A repository is archived.</li><li>`unarchived` - A repository is unarchived.</li>{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}<li>`anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/rest/overview/api-previews#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/rest/overview/api-previews#anonymous-git-access-to-repositories)</li>{% endif %}<li>`edited` - A repository's information is edited.</li><li>`renamed` - A repository is renamed.</li><li>`transferred` - A repository is transferred.</li><li>`publicized` - A repository is made public.</li><li> `privatized` - A repository is made private.</li></ul>
1049+
`action` |`string` | The action that was performed. This can be one of:<ul><li>`created` - A repository is created.</li><li>`deleted` - A repository is deleted.</li><li>`archived` - A repository is archived.</li><li>`unarchived` - A repository is unarchived.</li>{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}<li>`anonymous_access_enabled` - A repository is [enabled for anonymous Git access](/rest/overview/api-previews#anonymous-git-access-to-repositories), `anonymous_access_disabled` - A repository is [disabled for anonymous Git access](/rest/overview/api-previews#anonymous-git-access-to-repositories)</li>{% endif %}<li>`edited` - A repository's information is edited.</li><li>`renamed` - A repository is renamed.</li><li>`transferred` - A repository is transferred.</li><li>`publicized` - A repository is made public.</li><li> `privatized` - A repository is made private.</li></ul>
10501050
{% data reusables.webhooks.repo_desc %}
10511051
{% data reusables.webhooks.org_desc %}
10521052
{% data reusables.webhooks.app_desc %}

content/rest/overview/libraries.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Library name | Repository
111111

112112
Library name | Repository
113113
|---|---|
114+
**ghapi**|[fastai/ghapi](https://github.com/fastai/ghapi)
114115
**PyGithub**|[PyGithub/PyGithub](https://github.com/PyGithub/PyGithub)
115116
**libsaas**|[duckboard/libsaas](https://github.com/ducksboard/libsaas)
116117
**github3.py**|[sigmavirus24/github3.py](https://github.com/sigmavirus24/github3.py)

contributing/content-style-guide.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ These guidelines are specific to GitHub’s documentation. For general style que
1212
- [Code blocks](#code-blocks)
1313
- [Commands](#commands)
1414
- [Examples](#examples)
15+
- [Indentation](#indentation)
1516
- [Headers](#headers)
1617
- [Images](#images)
1718
- [Alt text](#alt-text)
@@ -129,6 +130,21 @@ schedule:
129130
- cron: "40 19 * * *"
130131
```
131132

133+
### Indentation
134+
135+
In YAML examples, such as actions and workflow files, use two spaces to indent lines within nested lists and block sequences.
136+
137+
- **Use:**
138+
139+
```yaml
140+
steps:
141+
- uses: actions/checkout@v2
142+
- name: Setup Python
143+
uses: actions/setup-python@v2
144+
with:
145+
python-version: ${{ matrix.python }}
146+
```
147+
132148
## Headers
133149
134150
Use H3 for headers, and H4 for subheaders. When referring to headers, surround the header name with quotation marks.

data/reusables/github-actions/contacting-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
If you need help with anything related to workflow configuration, such as syntax, {% data variables.product.prodname_dotcom %}-hosted runners, or building actions, look for an existing topic or start a new one in the [{% data variables.product.prodname_gcf %}'s {% data variables.product.prodname_actions %} board](https://github.community/c/github-actions).
1+
If you need help with anything related to workflow configuration, such as syntax, {% data variables.product.prodname_dotcom %}-hosted runners, or building actions, look for an existing topic or start a new one in the [{% data variables.product.prodname_gcf %}'s {% data variables.product.prodname_actions %} category](https://github.community/c/code-to-cloud/github-actions/41).
22

33
If you have feedback or feature requests for {% data variables.product.prodname_actions %}, share those in the {% data variables.contact.contact_feedback_actions %}.
44

includes/article-version-switcher.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<svg class="arrow ml-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="#1277eb"><path d="M1,1l6.2,6L13,1"></path></svg>
77
</summary>
88

9-
<div class="nav-dropdown position-md-absolute bg-white rounded-1 px-4 py-3 top-7 box-shadow-large" style="z-index: 6; width: 210px;">
9+
<div class="nav-dropdown position-absolute bg-white rounded-1 px-4 py-3 top-7 box-shadow-large" style="z-index: 6; width: 210px;">
1010
{% for permalink in page.permalinks %}
1111
<a
1212
href="{{ permalink.href }}"

lib/page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Page {
6666
// only the homepage will not have this.parentProduct
6767
.filter(availableVersion => this.parentProduct && !this.parentProduct.versions.includes(availableVersion))
6868

69-
if (versionsParentProductIsNotAvailableIn.length && this.languageCode === 'en') {
69+
if (versionsParentProductIsNotAvailableIn.length) {
7070
throw new Error(`\`versions\` frontmatter in ${this.fullPath} contains ${versionsParentProductIsNotAvailableIn}, which ${this.parentProduct.id} product is not available in!`)
7171
}
7272

tests/unit/page.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ describe('catches errors thrown in Page class', () => {
389389
expect(getPage).toThrowError('versions')
390390
})
391391

392-
test('page with a version in frontmatter that its parent product is not available in', () => {
392+
test('English page with a version in frontmatter that its parent product is not available in', () => {
393393
function getPage () {
394394
return new Page({
395395
relativePath: 'admin/some-category/some-article-with-mismatched-versions-frontmatter.md',
@@ -400,4 +400,16 @@ describe('catches errors thrown in Page class', () => {
400400

401401
expect(getPage).toThrowError(/`versions` frontmatter.*? product is not available in/)
402402
})
403+
404+
test('non-English page with a version in frontmatter that its parent product is not available in', () => {
405+
function getPage () {
406+
return new Page({
407+
relativePath: 'admin/some-category/some-article-with-mismatched-versions-frontmatter.md',
408+
basePath: path.join(__dirname, '../fixtures/products'),
409+
languageCode: 'es'
410+
})
411+
}
412+
413+
expect(getPage).toThrowError(/`versions` frontmatter.*? product is not available in/)
414+
})
403415
})

translations/es-XL/content/insights/installing-and-configuring-github-insights/updating-github-insights.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ redirect_from:
66
- /github/installing-and-configuring-github-insights/updating-github-insights
77
permissions: 'Las personas con permisos de lectura para el repositorio de `github/insights-releases` y el acceso administrativo al servidor de aplicaciones pueden actualizar {% data variables.product.prodname_insights %}.'
88
versions:
9-
free-pro-team: '*'
109
enterprise-server: '*'
1110
---
1211

0 commit comments

Comments
 (0)