Skip to content

Commit 9854b01

Browse files
authored
Merge pull request #38260 from github/repo-sync
Repo sync
2 parents 1f6565a + 1265a03 commit 9854b01

File tree

7 files changed

+48
-8
lines changed

7 files changed

+48
-8
lines changed

content/contributing/writing-for-github-docs/creating-tool-switchers-in-articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ Do not use the tool switcher just to show examples in different languages. Only
6060

6161
New tools are only added when they are the only way to accurately document something for a specific user need. If a writer determines that adding a new tool is the only way to accurately document something, they need to propose the new tool in a content design plan. Whoever reviews the content design plan should consider any alternative ways to address the documentation needs without adding a new tool. If a new tool is the only way to create accurate documentation, the new tool should be added. If there is an alternative content solution that does not add a new tool, that option should be used.
6262

63-
To add a new tool, add an entry to the `allTools` object in the [`lib/all-tools.js`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.js) file as a key-value pair. The key is the tag you use to refer to the tool in the article and the value is how the tool will be identified on the tool picker at the top of the article. For example, `vscode: 'Visual Studio Code'`.
63+
To add a new tool, add an entry to the `allTools` object in the [`lib/all-tools.ts`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.ts) file as a key-value pair. The key is the tag you use to refer to the tool in the article and the value is how the tool will be identified on the tool picker at the top of the article. For example, `vscode: 'Visual Studio Code'`.
6464

6565
Add new tools in alphabetical order.

content/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ You can define a default platform in an article's YAML frontmatter. For more inf
201201

202202
We occasionally need to write documentation that has different instructions for different tools. For example, the {% data variables.product.prodname_dotcom %} UI, {% data variables.product.prodname_cli %}, {% data variables.product.prodname_desktop %}, {% data variables.product.prodname_github_codespaces %}, and {% data variables.product.prodname_vscode %} might be able to accomplish the same task using different steps. We use tool tags to control what information is displayed for each tool.
203203

204-
{% data variables.product.prodname_docs %} maintains tool tags for {% data variables.product.prodname_dotcom %} products and selected third-party extensions. See the [`all-tools.js`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.js) object in the `github/docs` repository for a list of all supported tools.
204+
{% data variables.product.prodname_docs %} maintains tool tags for {% data variables.product.prodname_dotcom %} products and selected third-party extensions. See the [`all-tools.ts`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.ts) object in the `github/docs` repository for a list of all supported tools.
205205

206-
On rare occasions, we will add new tools. Before adding a new tool, read [AUTOTITLE](/contributing/syntax-and-versioning-for-github-docs/creating-tool-switchers-in-articles). To add a new tool, add an entry to the `allTools` object in [`lib/all-tools.js`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.js) as a key-value pair. The key is the tag you'll use to refer to the tool in the article, and the value is how the tool will be identified on the tool picker at the top of the article.
206+
On rare occasions, we will add new tools. Before adding a new tool, read [AUTOTITLE](/contributing/syntax-and-versioning-for-github-docs/creating-tool-switchers-in-articles). To add a new tool, add an entry to the `allTools` object in [`lib/all-tools.ts`](https://github.com/github/docs/blob/main/src/tools/lib/all-tools.ts) as a key-value pair. The key is the tag you'll use to refer to the tool in the article, and the value is how the tool will be identified on the tool picker at the top of the article.
207207

208208
You can define a default tool for an article in the YAML frontmatter. For more information, see [AUTOTITLE](/contributing/syntax-and-versioning-for-github-docs/using-yaml-frontmatter#defaulttool).
209209

src/audit-logs/data/fpt/organization.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,11 @@
994994
"description": "A billing manager was added to an organization.",
995995
"docs_reference_links": "/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization"
996996
},
997+
{
998+
"action": "org.add_disallowed_two_factor_method",
999+
"description": "An organization prevented access to resources by users with the given two-factor method.",
1000+
"docs_reference_links": "N/A"
1001+
},
9971002
{
9981003
"action": "org.add_member",
9991004
"description": "A user joined an organization.",
@@ -1094,6 +1099,11 @@
10941099
"description": "N/A",
10951100
"docs_reference_links": "N/A"
10961101
},
1102+
{
1103+
"action": "org.clear_disallowed_two_factor_methods",
1104+
"description": "Cleared two-factor authentication restrictions for an organization.",
1105+
"docs_reference_links": "N/A"
1106+
},
10971107
{
10981108
"action": "org.code_scanning_autofix_disabled",
10991109
"description": "Autofix for code scanning alerts was disabled for an organization.",
@@ -1429,6 +1439,11 @@
14291439
"description": "A billing manager was removed from an organization, either manually or due to a two-factor authentication requirement.",
14301440
"docs_reference_links": "/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization, /organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization"
14311441
},
1442+
{
1443+
"action": "org.remove_disallowed_two_factor_method",
1444+
"description": "Removed a two-factor authentication method restriction for an organization.",
1445+
"docs_reference_links": "N/A"
1446+
},
14321447
{
14331448
"action": "org.remove_integration_secret",
14341449
"description": "A Codespaces or Dependabot secret was removed from an organization.",
@@ -3227,7 +3242,7 @@
32273242
{
32283243
"action": "secret_scanning_closure_request.cancel",
32293244
"description": "N/A",
3230-
"docs_reference_links": "A request to close a secret scanning alert was canceled by a user."
3245+
"docs_reference_links": "A reqeust to close a secret scanning alert was canceled by a user."
32313246
},
32323247
{
32333248
"action": "secret_scanning_closure_request.create",

src/audit-logs/data/ghec/enterprise.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
"description": "A billing manager was added to an enterprise.",
110110
"docs_reference_links": "N/A"
111111
},
112+
{
113+
"action": "business.add_disallowed_two_factor_method",
114+
"description": "An enterprise prevented access to resources by users with the given two-factor method.",
115+
"docs_reference_links": "N/A"
116+
},
112117
{
113118
"action": "business.add_organization",
114119
"description": "An organization was added to an enterprise.",
@@ -424,6 +429,11 @@
424429
"description": "A billing manager was removed from an enterprise.",
425430
"docs_reference_links": "N/A"
426431
},
432+
{
433+
"action": "business.remove_disallowed_two_factor_method",
434+
"description": "Removed a two-factor authentication method restriction for an enterprise.",
435+
"docs_reference_links": "N/A"
436+
},
427437
{
428438
"action": "business.remove_member",
429439
"description": "A member was removed from an enterprise.",
@@ -3982,7 +3992,7 @@
39823992
{
39833993
"action": "secret_scanning_closure_request.cancel",
39843994
"description": "N/A",
3985-
"docs_reference_links": "A request to close a secret scanning alert was canceled by a user."
3995+
"docs_reference_links": "A reqeust to close a secret scanning alert was canceled by a user."
39863996
},
39873997
{
39883998
"action": "secret_scanning_closure_request.create",

src/audit-logs/data/ghec/organization.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,11 @@
994994
"description": "A billing manager was added to an organization.",
995995
"docs_reference_links": "/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization"
996996
},
997+
{
998+
"action": "org.add_disallowed_two_factor_method",
999+
"description": "An organization prevented access to resources by users with the given two-factor method.",
1000+
"docs_reference_links": "N/A"
1001+
},
9971002
{
9981003
"action": "org.add_member",
9991004
"description": "A user joined an organization.",
@@ -1094,6 +1099,11 @@
10941099
"description": "N/A",
10951100
"docs_reference_links": "N/A"
10961101
},
1102+
{
1103+
"action": "org.clear_disallowed_two_factor_methods",
1104+
"description": "Cleared two-factor authentication restrictions for an organization.",
1105+
"docs_reference_links": "N/A"
1106+
},
10971107
{
10981108
"action": "org.code_scanning_autofix_disabled",
10991109
"description": "Autofix for code scanning alerts was disabled for an organization.",
@@ -1429,6 +1439,11 @@
14291439
"description": "A billing manager was removed from an organization, either manually or due to a two-factor authentication requirement.",
14301440
"docs_reference_links": "/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization, /organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization"
14311441
},
1442+
{
1443+
"action": "org.remove_disallowed_two_factor_method",
1444+
"description": "Removed a two-factor authentication method restriction for an organization.",
1445+
"docs_reference_links": "N/A"
1446+
},
14321447
{
14331448
"action": "org.remove_integration_secret",
14341449
"description": "A Codespaces or Dependabot secret was removed from an organization.",
@@ -3227,7 +3242,7 @@
32273242
{
32283243
"action": "secret_scanning_closure_request.cancel",
32293244
"description": "N/A",
3230-
"docs_reference_links": "A request to close a secret scanning alert was canceled by a user."
3245+
"docs_reference_links": "A reqeust to close a secret scanning alert was canceled by a user."
32313246
},
32323247
{
32333248
"action": "secret_scanning_closure_request.create",

src/audit-logs/data/ghes-3.17/organization.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3182,7 +3182,7 @@
31823182
{
31833183
"action": "secret_scanning_closure_request.cancel",
31843184
"description": "N/A",
3185-
"docs_reference_links": "A request to close a secret scanning alert was canceled by a user."
3185+
"docs_reference_links": "A reqeust to close a secret scanning alert was canceled by a user."
31863186
},
31873187
{
31883188
"action": "secret_scanning_closure_request.create",

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
44
"apiRequestEvent": "This event is only available via audit log streaming."
55
},
6-
"sha": "ff3e90a228450595711a45a63b9c764db5ed3a00"
6+
"sha": "5649c28c98e5a831c75008d7c1ced9e6e58306ea"
77
}

0 commit comments

Comments
 (0)