Skip to content

Commit b16dfd2

Browse files
authored
Merge pull request #44277 from github/repo-sync
Repo sync
2 parents a3ea589 + 1090121 commit b16dfd2

16 files changed

Lines changed: 32 additions & 88 deletions

File tree

content/actions/concepts/runners/github-hosted-runners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Using {% data variables.product.prodname_dotcom %}-hosted runners requires netwo
5454

5555
## Runner images
5656

57-
{% data variables.product.github %} maintains our own set of VM images for our standard hosted runners. This includes the images for macOS, x64 linux and Windows images. The list of images and their included tools are managed in the [`actions/runner-images`](https://github.com/actions/runner-images) repository. Our arm64 images are partner images, and those are managed in the [`actions/partner-runner-images`](https://github.com/actions/partner-runner-images) repository.
57+
{% data variables.product.github %} maintains our own set of VM images for our standard hosted runners. The list of images and their included tools are managed in the [`actions/runner-images`](https://github.com/actions/runner-images) repository.
5858

5959
### Preinstalled software for GitHub-owned images
6060

content/actions/reference/runners/larger-runners.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ You can choose from several specifications for {% data variables.actions.hosted_
5454

5555
{% data variables.actions.hosted_runner_caps %}s run on virtual machines (VMs), and {% data variables.product.prodname_dotcom %} installs a virtual hard disk (VHD) on this machine during the VM creation process. You can choose from different VM images to install on your runners.
5656

57-
**{% data variables.product.prodname_dotcom %}-owned images:** These images are maintained by {% data variables.product.prodname_dotcom %} and are available for Linux x64, Windows x64, and macOS (x64 and arm) runners. For more information on these images and a full list of included tools for each runner operating system, see the [{% data variables.product.prodname_actions %} Runner Images](https://github.com/actions/runner-images) repository.
57+
**{% data variables.product.prodname_dotcom %}-owned images:** These images are maintained by {% data variables.product.prodname_dotcom %} and are available for Linux (x64 and arm64), Windows (x64 and arm64), and macOS (x64 and arm64) runners. For more information on these images and a full list of included tools for each runner operating system, see the [{% data variables.product.prodname_actions %} Runner Images](https://github.com/actions/runner-images) repository.
5858

5959
**Partner Images:** Partner images are not managed by {% data variables.product.prodname_dotcom %} and are pulled from the Azure Marketplace. See below for resources on where to find more information and to report issues for partner images.
6060
* [Base Windows 11 desktop image](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/microsoftwindowsdesktop.windows-11?tab=Overview).
6161
* [NVIDIA GPU-Optimized VMI](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nvidia.ngc_azure_17_11)
6262
* [Data Science Virtual Machine - Windows 2019](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/microsoft-dsvm.dsvm-win-2019?tab=overview).
63-
* arm64 images: [`actions/partner-runner-images` repository](https://github.com/actions/partner-runner-images).
6463

6564
## Available macOS {% data variables.actions.hosted_runners %} and labels
6665

content/actions/reference/security/secure-use.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ For more information on how to enable {% data variables.product.prodname_code_sc
239239

240240
For {% data variables.product.prodname_dotcom %}-hosted runners created from images maintained by {% data variables.product.company_short %}, you can view a software bill of materials (SBOM) to see what software was pre-installed on the runner. You can provide your users with the SBOM which they can run through a vulnerability scanner to validate if there are any vulnerabilities in the product. If you are building artifacts, you can include this SBOM in your bill of materials for a comprehensive list of everything that went into creating your software.
241241

242-
SBOMs are available for Ubuntu, Windows, and macOS runner images maintained by {% data variables.product.company_short %}. You can locate the SBOM for your build in the release assets at https://github.com/actions/runner-images/releases. An SBOM with a filename in the format of `sbom.IMAGE-NAME.json.zip` can be found in the attachments of each release.
243-
244-
For third-party images, such as the images for ARM-powered runners, you can find details of the software that's included in the image in the [`actions/partner-runner-images` repository](https://github.com/actions/partner-runner-images).
242+
SBOMs are available for Ubuntu, Windows, and macOS runner images maintained by {% data variables.product.company_short %}, including ARM-powered runners. You can locate the SBOM for your build in the release assets at https://github.com/actions/runner-images/releases. An SBOM with a filename in the format of `sbom.IMAGE-NAME.json.zip` can be found in the attachments of each release.
245243

246244
{% endif %}
247245

content/contributing/style-guide-and-content-model/conceptual-content-type.md renamed to content/contributing/style-guide-and-content-model/concepts-content-type.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
---
2-
title: Conceptual content type
2+
title: Concepts content type
33
intro: People most often use conceptual content when they are learning about something new to them.
4+
category:
5+
- Follow the style guide and content model
46
versions:
57
fpt: '*'
68
ghec: '*'
79
ghes: '*'
8-
category:
9-
- Follow the style guide and content model
10+
redirect_from:
11+
- /contributing/style-guide-and-content-model/conceptual-content-type
1012
---
1113

1214
Conceptual content helps people understand a feature or topic by providing a clear, high-level overview, explanation of how the feature or topic can help them on their journey, and context like use cases or examples.
1315

14-
We create conceptual articles and conceptual sections within other articles. Most major products, features, or subjects have their own conceptual article.
16+
We create concepts articles and conceptual sections within other articles. Most major products, features, or subjects have their own concepts article.
17+
18+
## Deciding between an article or a section
19+
20+
How-tos or tutorials can have 1-2 brief introductory sentences before the steps. If more explanation beyond a couple of sentences is needed, that’s when we should consider whether it merits a spot in a concepts article.
21+
22+
However, we should be selective. Not every concept or “About X” section needs its own article. Generally this comes down to how much information will be useful to the user that we need to include.
1523

1624
## How to write conceptual content
1725

18-
For the conceptual content template, see [AUTOTITLE](/contributing/writing-for-github-docs/templates#conceptual-article-template).
26+
For the conceptual content template, see [AUTOTITLE](/contributing/writing-for-github-docs/templates#concepts-article-template).
1927

2028
* Describe in plain language what the feature, product, or topic is.
2129
* Describe its purpose and why it’s useful to the reader.
2230
* Share use cases or examples.
23-
* If relevant, describe how the feature or topic works (be mindful of audience and the right location for deep dives into technical details).
24-
* Highlight any details the reader needs to know to use the feature.
25-
* Include next steps for getting started with the feature (whether through further reading links or content within the article itself).
2631

2732
## Titles for conceptual content
2833

29-
* Conceptual articles or headers of conceptual sections start with "About [subject]”.
34+
Short titles for articles should be one word or a noun phrase. If the articles appear under Concepts in the sidebar avoid using "About", unless the article appears under a heading of the same name. Ex: "Coding agent" and "About coding agent".
35+
36+
Headers of conceptual sections in articles start with "About [subject]”.
3037
* Use a noun to describe the subject.
3138
* Use: "About {% data variables.product.prodname_code_scanning %}"
3239
* Avoid: "About scanning your code for vulnerabilities"

content/contributing/style-guide-and-content-model/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ children:
99
- /style-guide
1010
- /about-the-content-model
1111
- /contents-of-a-github-docs-article
12-
- /conceptual-content-type
12+
- /concepts-content-type
1313
- /reference-content-type
1414
- /how-to-content-type
1515
- /troubleshooting-content-type

content/contributing/writing-for-github-docs/templates.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ category:
99
- Follow the style guide and content model
1010
---
1111

12-
## Conceptual article template
12+
## Concepts article template
1313

14-
Use the content model for full instructions and examples on how to write conceptual content. For more information, see [AUTOTITLE](/contributing/style-guide-and-content-model/conceptual-content-type).
14+
Use the content model for full instructions and examples on how to write conceptual content. For more information, see [AUTOTITLE](/contributing/style-guide-and-content-model/concepts-content-type).
1515

1616
<!-- markdownlint-disable search-replace -->
1717

@@ -27,7 +27,7 @@ versions:
2727
---
2828

2929
{% comment %}
30-
- Follow the guidelines in https://docs.github.com/contributing/writing-for-github-docs/content-model#conceptual to write this article.
30+
- Follow the guidelines in https://docs.github.com/contributing/writing-for-github-docs/content-model to write this article.
3131
- Great intros give readers a quick understanding of what's in the article, so they can tell whether it's relevant to them before moving ahead. For more tips, see https://docs.github.com/contributing/writing-for-github-docs/content-model
3232
- For product callout info, see https://github.com/github/docs/tree/main/content#product
3333
- For product version instructions, see https://github.com/github/docs/tree/main/content#versioning

data/reusables/actions/supported-github-runners.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For public repositories, jobs using the workflow labels shown in the table below
5858
<td>14 GB</td>
5959
<td>arm64</td>
6060
<td>
61-
<code><a href="https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md">windows-11-arm</a></code>
61+
<code><a href="https://github.com/actions/runner-images/blob/main/images/windows/Windows11-Arm64-Readme.md">windows-11-arm</a></code>
6262
</td>
6363
</tr>
6464
<tr>
@@ -148,7 +148,7 @@ For {% ifversion ghec %}internal and{% endif %} private repositories, jobs using
148148
<td>14 GB</td>
149149
<td> arm64 </td>
150150
<td>
151-
<code><a href="https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md">windows-11-arm</a></code>
151+
<code><a href="https://github.com/actions/runner-images/blob/main/images/windows/Windows11-Arm64-Readme.md">windows-11-arm</a></code>
152152
</td>
153153
</tr>
154154
<tr>

src/rest/data/ghes-3.16-2022-11-28/secret-scanning.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5403,7 +5403,7 @@
54035403
},
54045404
"status": {
54055405
"type": "string",
5406-
"description": "The state of the scan. Either \"completed\", \"running\", or \"pending\""
5406+
"description": "'The state of the scan. Either \"completed\", \"running\", or \"pending\"'"
54075407
},
54085408
"completed_at": {
54095409
"type": [

src/rest/data/ghes-3.17-2022-11-28/secret-scanning.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5438,7 +5438,7 @@
54385438
},
54395439
"status": {
54405440
"type": "string",
5441-
"description": "The state of the scan. Either \"completed\", \"running\", or \"pending\""
5441+
"description": "'The state of the scan. Either \"completed\", \"running\", or \"pending\"'"
54425442
},
54435443
"completed_at": {
54445444
"type": [

src/rest/data/ghes-3.18-2022-11-28/secret-scanning.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5335,7 +5335,7 @@
53355335
},
53365336
"status": {
53375337
"type": "string",
5338-
"description": "The state of the scan. Either \"completed\", \"running\", or \"pending\""
5338+
"description": "'The state of the scan. Either \"completed\", \"running\", or \"pending\"'"
53395339
},
53405340
"completed_at": {
53415341
"type": [

0 commit comments

Comments
 (0)