Skip to content

Commit b5e5a60

Browse files
committed
Merge branch 'github:main' into codewithdev-docs
2 parents 27028b5 + 54b450a commit b5e5a60

6 files changed

Lines changed: 69 additions & 141 deletions

File tree

‎content/codespaces/about-codespaces.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Developers and organization administrators can also configure settings to add en
5858

5959
### Joining the beta
6060

61-
A limited number of people will be invited to join the beta. To join the waitlist, see [Sign up for Codespaces beta](https://github.com/features/codespaces/signup).
61+
A limited number of people will be invited to join the beta. To join the waitlist, see [Sign up for the Codespaces beta](https://github.com/features/codespaces/signup).
6262

6363
### Contacting us about {% data variables.product.prodname_codespaces %}
6464

‎content/github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ When you participate in certain programs, {% data variables.product.prodname_dot
127127
| ![{% data variables.product.prodname_dotcom %} Sponsor badge icon](/assets/images/help/profile/badge-sponsors-small.png) | **{% data variables.product.prodname_dotcom %} Sponsor** | If you sponsored an open source contributor through {% data variables.product.prodname_sponsors %} you'll get a {% data variables.product.prodname_dotcom %} Sponsor badge on your profile. Clicking the badge takes you to the **Sponsoring** tab of your profile. For more information, see "[Sponsoring open source contributors](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-open-source-contributors)." |
128128
| {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% data variables.product.prodname_dotcom %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/program/). |
129129
| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products#github-pro)." |
130+
| {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). |
131+
| {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **Github Campus Expert** | If you participate in the {% data variables.product.prodname_dotcom %} Campus Program you'll get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). |
130132

131133
### Disabling badges on your profile
132134

‎contributing/content-templates.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Use the [content model](/contributing/content-model.md#conceptual) for full inst
1818
title: About [subject]
1919
intro: 'Article intro. See tips for a great intro below.'
2020
product: '{{ optional product callout }}'
21-
productVersions:
21+
versions:
2222
---
2323
2424
<!-- Follow the guidelines in https://github.com/github/docs/blob/main/contributing/content-model.md#conceptual to write this article.-- >
2525
<!-- 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://github.com/github/docs/blob/main/contributing/content-model.md#intro. -->
2626
<!-- For product callout info, see https://github.com/github/docs/tree/main/content#product.-->
27-
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#productversions.-->
27+
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#versions.-->
2828
<!-- Remove these comments from your article file when you're done writing. -->
2929
3030
### A section here
@@ -53,13 +53,13 @@ Use the [content model](https://github.com/github/docs/blob/main/contributing/co
5353
title: Nouns describing your subject
5454
intro: 'Article intro. See tips for a great intro below.'
5555
product: '{{ optional product callout }}'
56-
productVersions:
56+
versions:
5757
---
5858
5959
<!-- Follow the guidelines in https://github.com/github/docs/blob/main/contributing/content-model.md#referential to write this article.-- >
6060
<!-- 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://github.com/github/docs/blob/main/contributing/content-model.md#intro. -->
6161
<!-- For product callout info, see https://github.com/github/docs/tree/main/content#product.-->
62-
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#productversions.-->
62+
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#versions.-->
6363
<!-- Remove these comments from your article file when you're done writing -->
6464
6565
### A section here
@@ -88,13 +88,13 @@ Use the [content model](https://github.com/github/docs/blob/main/contributing/co
8888
title: Start with a gerund
8989
intro: 'Article intro. See tips for a great intro below.'
9090
product: '{{ optional product callout }}'
91-
productVersions:
91+
versions:
9292
---
9393
9494
<!-- Follow the guidelines in https://github.com/github/docs/blob/main/contributing/content-model.md#procedural to write this article.-- >
9595
<!-- 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://github.com/github/docs/blob/main/contributing/content-model.md#intro. -->
9696
<!-- For product callout info, see https://github.com/github/docs/tree/main/content#product.-->
97-
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#productversions.-->
97+
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#versions.-->
9898
<!-- Remove these comments from your article file when you're done writing -->
9999
100100
### Procedural section header here
@@ -122,11 +122,11 @@ Use the [content model](https://github.com/github/docs/blob/main/contributing/co
122122
---
123123
title: Quickstart title
124124
intro: 'Article intro. Highlight that the guide is quick and to the point.'
125-
productVersions:
125+
versions:
126126
---
127127
128128
<!-- Follow the guidelines in https://github.com/github/docs/blob/main/contributing/content-model.md#quickstart to write this article.-->
129-
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#productversions.-->
129+
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#versions.-->
130130
<!-- The entire quickstart should be about 600 words long or take about five minutes to read.-->
131131
<!-- Remove these comments from your article file when you're done writing -->
132132
@@ -172,13 +172,13 @@ Use the [content model](https://github.com/github/docs/blob/main/contributing/co
172172
title: Tutorial title
173173
intro: 'Article intro. See tips for a great intro below'
174174
product: '{{ optional product callout }}'
175-
productVersions:
175+
versions:
176176
---
177177
178178
<!-- Follow the instructions in https://github.com/github/docs/blob/main/contributing/content-model.md#quickstart to write this article.-->
179179
<!-- Great intros clarify who the tutorial is intended for, state what the user will accomplish, and state the technologies that will be used.-->
180180
<!-- For product callout info, see https://github.com/github/docs/tree/main/content#product.-->
181-
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#productversions.-->
181+
<!-- For product version instructions, see https://github.com/github/docs/tree/main/content#versions.-->
182182
<!-- Remove these comments from your article file when you're done writing -->
183183
184184
### Introduction
@@ -235,7 +235,7 @@ Use the [tutorial content model](hhttps://github.com/github/docs/blob/main/contr
235235
title: Guide title
236236
intro: 'Article intro. See tips for a great intro below'
237237
product: '{{ site.data.reusables.gated-features.actions }}'
238-
productVersions:
238+
versions:
239239
---
240240
241241
<!--
@@ -312,4 +312,4 @@ productVersions:
312312
<!--
313313
This section can simply link out to https://docs.github.com/en/actions/configuring-and-managing-workflows/persisting-workflow-data-using-artifacts or provide additional information about which artifacts might be typical to upload for a CI workflow.
314314
-->
315-
```
315+
```

‎lib/excluded-links.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ module.exports = [
1717
'https://www.facebook.com/',
1818
'https://ko-fi.com/',
1919
'https://en.liberapay.com/',
20-
'https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb'
20+
'https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb',
21+
'https://www.vmware.com/products/esxi-and-esx.html'
2122
]

0 commit comments

Comments
 (0)