Skip to content

Commit 00beada

Browse files
authored
Merge branch 'main' into main
2 parents f5dbd02 + bdb49ef commit 00beada

File tree

17 files changed

+112
-25
lines changed

17 files changed

+112
-25
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<!--
2-
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
3-
-->
4-
5-
<!--
6-
Hello! Thanks for your interest in contributing to this project.
2+
Thank you for contributing to this project! You must fill out the information below before we can review this pull request. By explaining why you're making a change (or linking to a pull request) and what changes you've made, we can triage your pull request to the best possible team for review.
73
8-
Before opening a PR, please see our [CONTRIBUTING.md](https://github.com/github/docs/blob/main/CONTRIBUTING.md) for information how to contribute.
4+
See our [CONTRIBUTING.md](/main/CONTRIBUTING.md) for information how to contribute.
95
106
For changes to content in [site policy](https://github.com/github/docs/tree/main/content/github/site-policy), see the [CONTRIBUTING guide in the site-policy repo](https://github.com/github/site-policy/blob/main/CONTRIBUTING.md).
117
12-
Thanks again! :octocat:
8+
We cannot accept changes to our translated content right now. See the [contributing.md](/main/CONTRIBUTING.md#earth_asia-translations) for more information.
9+
10+
Thanks again!
1311
-->
1412

1513
### Why:

.github/allowed-actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.exports = [
1515
'actions/setup-node@v1',
1616
'actions/setup-ruby@v1',
1717
'actions/stale@v3',
18+
'crowdin/[email protected]',
1819
'dawidd6/action-delete-branch@v3',
1920
'docker://chinthakagodawita/autoupdate-action:v1',
2021
'github/codeql-action/analyze@v1',

.github/workflows/crowdin.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Please ping @github/docs-localization in the PR whenever you update this file!
2+
3+
name: Crowdin Sync
4+
5+
on:
6+
push:
7+
branches:
8+
- main
9+
10+
jobs:
11+
sync_with_crowdin:
12+
name: Sync with Crowdin
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
18+
- name: Sync
19+
uses: crowdin/[email protected]
20+
with:
21+
upload_translations: true
22+
download_translations: true
23+
create_pull_request: true
24+
25+
# Using a custom config temporarily to avoid clobbering the existing crowdin.yml
26+
# that is used by the github-help-docs OAuth integration.
27+
config: 'crowdin-actions-config.yml'
28+
29+
# This is the name of the git branch that Crowdin will create when opening a pull request.
30+
# This branch does NOT need to be manually created. It will be created automatically by the action.
31+
localization_branch_name: automated-crowdin-translations
32+
33+
# This is the name of the top-level directory that Crowdin will use for files.
34+
# Note that this is not a "branch" in the git sense, but more like a top-level directory in your Crowdin project.
35+
# This branch does NOT need to be manually created. It will be created automatically by the action.
36+
crowdin_branch_name: crowdin-main
37+
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
41+
# This is a numeric id, not to be confused with Crowdin API v1 "project identifier" string
42+
# See "API v2" on https://crowdin.com/project/<your-project>/settings#api
43+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
44+
45+
# A personal access token, not to be confused with Crowdin API v1 "API key"
46+
# See https://crowdin.com/settings#api-key to generate a token
47+
# This token was created by logging into Crowdin with the octoglot user
48+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
49+
50+

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
123123
<td align="center"><a href="https://github.com/ruth"><img src="https://avatars0.githubusercontent.com/u/85029?v=4?s=64" width="64px;" alt=""/><br /><sub><b>Ruth</b></sub></a><br /><a href="#content-Ruth" title="Content">🖋</a></td>
124124
<td align="center"><a href="http://tomaszwisniewski.com"><img src="https://avatars2.githubusercontent.com/u/12593852?v=4?s=64" width="64px;" alt=""/><br /><sub><b>Tomasz Wisniewski</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=wi5nia" title="Documentation">📖</a></td>
125125
<td align="center"><a href="https://chiedojohn.com/"><img src="https://avatars2.githubusercontent.com/u/2156688?v=4?s=64" width="64px;" alt=""/><br /><sub><b>Chiedo John</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=chiedo" title="Code">💻</a></td>
126+
126127
</tr>
127128
<tr>
128-
<td align="center"><a href="https://github.com/BenJam"><img src="https://avatars2.githubusercontent.com/u/158833?v=4" width="64px;" alt=""/><br /><sub><b>Benjamin Nickolls</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=BenJam" title="Documentation">📖</a></td>
129-
<td align="center"><a href="https://mcaffer.com"><img src="https://avatars2.githubusercontent.com/u/10070956?v=4" width="64px;" alt=""/><br /><sub><b>Jeff McAffer</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=jeffmcaffer" title="Documentation">📖</a></td>
130-
<td align="center"><a href="https://tjenkinson.me"><img src="https://avatars0.githubusercontent.com/u/3259993?v=4" width="64px;" alt=""/><br /><sub><b>Tom Jenkinson</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=tjenkinson" title="Code">💻</a></td>
131-
<td align="center"><a href="https://github.com/casals"><img src="https://avatars0.githubusercontent.com/u/785860?v=4" width="64px;" alt=""/><br /><sub><b>Arthur Casals</b></sub></a><br /><a href="#content-casals" title="Content">🖋</a> <a href="https://github.com/github/docs/commits?author=casals" title="Documentation">📖</a></td>
132-
<td align="center"><a href="https://www.arangodb.com/"><img src="https://avatars3.githubusercontent.com/u/7819991?v=4" width="64px;" alt=""/><br /><sub><b>Simran</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=Simran-B" title="Documentation">📖</a></td>
133-
<td align="center"><a href="https://github.com/ruth"><img src="https://avatars0.githubusercontent.com/u/85029?v=4" width="64px;" alt=""/><br /><sub><b>Ruth</b></sub></a><br /><a href="#content-Ruth" title="Content">🖋</a></td>
134-
<td align="center"><a href="http://tomaszwisniewski.com"><img src="https://avatars2.githubusercontent.com/u/12593852?v=4" width="64px;" alt=""/><br /><sub><b>Tomasz Wisniewski</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=wi5nia" title="Documentation">📖</a></td>
129+
<td align="center"><a href="https://www.arangodb.com/"><img src="https://avatars3.githubusercontent.com/u/7819991?v=4" width="64px;" alt=""/><br /><sub><b>Simran</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=Simran-B" title="Documentation">📖</a></td>
135130
</tr>
131+
136132
</table>
137133

138134
<!-- markdownlint-restore -->
Loading
Loading
Loading
Loading

content/admin/configuration/network-ports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Application ports provide web application and Git access for end users.
3434
| 443 | HTTPS | Access to the web application and Git over HTTPS. |
3535
| 80 | HTTP | Access to the web application. All requests are redirected to the HTTPS port when SSL is enabled. |
3636
| 22 | SSH | Access to Git over SSH. Supports clone, fetch, and push operations to public and private repositories. |
37-
| 9418 | Git | Git protocol port supports clone and fetch operations to public repositories with unencrypted network communication. |
37+
| 9418 | Git | Git protocol port supports clone and fetch operations to public repositories with unencrypted network communication. {% data reusables.enterprise_installation.when-9418-necessary %} |
3838

3939
{% data reusables.enterprise_installation.terminating-tls %}
4040

content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ versions:
1010

1111
{% data reusables.codespaces.release-stage %}
1212

13-
### Connecting the {% data variables.product.prodname_vs_codespaces %} extension to your {% data variables.product.prodname_dotcom %} account
13+
### Prerequisites
1414

1515
Before you can develop in a codespace directly in {% data variables.product.prodname_vscode %}, you must configure the {% data variables.product.prodname_vs_codespaces %} extension to connect to your {% data variables.product.product_name %} account.
1616

@@ -29,11 +29,27 @@ Before you can develop in a codespace directly in {% data variables.product.prod
2929
8. To authorize {% data variables.product.prodname_vscode %} to access your account on {% data variables.product.product_name %}, click **Allow**.
3030
9. Sign in to {% data variables.product.product_name %} to approve the extension.
3131

32-
### Opening a codespace in {% data variables.product.prodname_vscode %}
32+
### Creating a codespace in {% data variables.product.prodname_vscode %}
3333

34-
After you've connected your {% data variables.product.product_name %} account to the {% data variables.product.prodname_vs_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} directly in {% data variables.product.prodname_vscode %}.
34+
After you connect your {% data variables.product.product_name %} account to the {% data variables.product.prodname_vs_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} or in {% data variables.product.prodname_vscode %}.
35+
36+
{% data reusables.codespaces.click-remote-explorer-icon-vscode %}
37+
2. Click the Add icon, then click **Create New Codespace**.
38+
![The Create new Codespace option in {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/create-codespace-vscode.png)
39+
3. Type, then click the repository's name you want to develop in.
40+
![Searching for repository to create a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-repository-vscode.png)
41+
4. Click the branch you want to develop in.
42+
![Searching for a branch to create a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-branch-vscode.png)
43+
44+
### Opening a codespace in {% data variables.product.prodname_vscode %}
3545

3646
{% data reusables.codespaces.click-remote-explorer-icon-vscode %}
3747
2. Under Codespaces, click the codespace you want to develop in.
3848
3. Click the Connect to Codespace icon.
3949
![The Connect to Codespace icon in {% data variables.product.prodname_vscode %}](/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png)
50+
51+
### Deleting a codespace in {% data variables.product.prodname_vscode %}
52+
53+
1. Under Codespaces, right-click the codespace you want to delete.
54+
2. In the drop-down menu, click **Delete Codespace**.
55+
![Deleting a codespace in {% data variables.product.prodname_dotcom %}](/assets/images/help/codespaces/delete-codespace-vscode.png)

0 commit comments

Comments
 (0)