Skip to content

repo sync #21037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2022
Merged

repo sync #21037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b838c5
New translation batch for cn (#31358)
docubot Oct 2, 2022
f9e40ec
Merge branch 'main' into repo-sync
Octomerger Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions translations/log/msft-cn-resets.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-pers
translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md,rendering error
translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md,rendering error
translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username.md,rendering error
translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md,broken liquid tags
translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md,rendering error
translations/zh-CN/content/actions/creating-actions/creating-a-javascript-action.md,rendering error
translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md,rendering error
translations/zh-CN/content/actions/deployment/about-deployments/about-continuous-deployment.md,rendering error
Expand Down Expand Up @@ -309,7 +309,7 @@ translations/zh-CN/content/admin/overview/accessing-compliance-reports-for-your-
translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md,rendering error
translations/zh-CN/content/authentication/connecting-to-github-with-ssh/about-ssh.md,broken liquid tags
translations/zh-CN/content/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.md,rendering error
translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md,rendering error
Expand Down Expand Up @@ -357,7 +357,7 @@ translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/a
translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md,rendering error
translations/zh-CN/content/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates.md,rendering error
translations/zh-CN/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md,rendering error
translations/zh-CN/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md,broken liquid tags
translations/zh-CN/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md,rendering error
translations/zh-CN/content/code-security/getting-started/github-security-features.md,rendering error
translations/zh-CN/content/code-security/getting-started/securing-your-repository.md,rendering error
translations/zh-CN/content/code-security/secret-scanning/about-secret-scanning.md,rendering error
Expand Down Expand Up @@ -397,7 +397,7 @@ translations/zh-CN/content/codespaces/getting-started/deep-dive.md,broken liquid
translations/zh-CN/content/codespaces/getting-started/quickstart.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md,rendering error
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md,broken liquid tags
translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces.md,broken liquid tags
Expand Down Expand Up @@ -481,6 +481,7 @@ translations/zh-CN/content/packages/learn-github-packages/viewing-packages.md,re
translations/zh-CN/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md,rendering error
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md,rendering error
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-npm-registry.md,rendering error
translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md,broken liquid tags
translations/zh-CN/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md,rendering error
translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md,broken liquid tags
translations/zh-CN/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md,rendering error
Expand Down Expand Up @@ -628,6 +629,7 @@ translations/zh-CN/data/reusables/organizations/security.md,rendering error
translations/zh-CN/data/reusables/organizations/teams_sidebar.md,rendering error
translations/zh-CN/data/reusables/organizations/verified-domains.md,rendering error
translations/zh-CN/data/reusables/pages/sidebar-pages.md,rendering error
translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md,broken liquid tags
translations/zh-CN/data/reusables/pull_requests/resolving-conversations.md,broken liquid tags
translations/zh-CN/data/reusables/release-notes/ghas-3.4-secret-scanning-known-issue.md,rendering error
translations/zh-CN/data/reusables/repositories/changed-files.md,broken liquid tags
Expand All @@ -652,3 +654,5 @@ translations/zh-CN/data/reusables/user-settings/saved_replies.md,rendering error
translations/zh-CN/data/reusables/user-settings/security-analysis.md,rendering error
translations/zh-CN/data/reusables/user-settings/security.md,rendering error
translations/zh-CN/data/reusables/user-settings/ssh.md,rendering error
translations/zh-CN/data/reusables/webhooks/pull_request_properties.md,broken liquid tags
translations/zh-CN/data/reusables/webhooks/pull_request_webhook_properties.md,broken liquid tags
55 changes: 28 additions & 27 deletions ...g-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ If you are a site administrator for {% data variables.product.product_location %
{%- ifversion ghae %}
<!-- GitHub AE is FIPS 140-2 compliant. FIPS does not yet permit keys that use the ed25519 algorithm. -->
```shell
$ ssh-keygen -t rsa -b 4096 -C "<em>your_email@example.com</em>"
$ ssh-keygen -t rsa -b 4096 -C "<em>your_email@example.com</em>"
```
{%- else %}
```shell
$ ssh-keygen -t ed25519 -C "<em>your_email@example.com</em>"
```
{% note %}

**Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
```shell
$ ssh-keygen -t rsa -b 4096 -C "<em>your_email@example.com</em>"
Expand All @@ -67,27 +67,27 @@ If you are a site administrator for {% data variables.product.product_location %
3. When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location.

{% mac %}

```shell
> Enter a file in which to save the key (/Users/<em>you</em>/.ssh/id_<em>algorithm</em>): <em>[Press enter]</em>
```

{% endmac %}

{% windows %}

```shell
> Enter a file in which to save the key (/c/Users/<em>you</em>/.ssh/id_<em>algorithm</em>):<em>[Press enter]</em>
```

{% endwindows %}

{% linux %}

```shell
> Enter a file in which to save the key (/home/<em>you</em>/.ssh/<em>algorithm</em>): <em>[Press enter]</em>
```

{% endlinux %}

4. At the prompt, type a secure passphrase. For more information, see ["Working with SSH key passphrases](/articles/working-with-ssh-key-passphrases)."
Expand Down Expand Up @@ -119,7 +119,7 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
$ touch ~/.ssh/config
```

* Open your `~/.ssh/config` file, then modify the file to contain the following lines. If your SSH key file has a different name or path than the example code, modify the filename or path to match your current setup.
* Open your `~/.ssh/config` file, then modify the file to contain the following lines. If your SSH key file has a different name or path than the example code, modify the filename or path to match your current setup.

```
Host *
Expand All @@ -131,9 +131,9 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
{% note %}

**Notes:**

- If you chose not to add a passphrase to your key, you should omit the `UseKeychain` line.

- If you see a `Bad configuration option: usekeychain` error, add an additional line to the configuration's' `Host *` section.

```
Expand All @@ -144,15 +144,16 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav

3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
$ ssh-add -K ~/.ssh/id_{% ifversion ghae %}rsa{% else %}ed25519{% endif %}
```
{% note %}
$ ssh-add --apple-use-keychain ~/.ssh/id_{% ifversion ghae %}rsa{% else %}ed25519{% endif %}
```
{% note %}

**Note:** The `--apple-use-keychain` option stores the passphrase in your keychain for you when you add an SSH key to the ssh-agent. If you chose not to add a passphrase to your key, run the command without the `--apple-use-keychain` option.

The `--apple-use-keychain` option is in Apple's standard version of `ssh-add`. In MacOS versions prior to Monterey (12.0), the `--apple-use-keychain` and `--apple-load-keychain` flags used the syntax `-K` and `-A`, respectively.

**Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an SSH key to the ssh-agent. If you chose not to add a passphrase to your key, run the command without the `-K` option.
If you don't have Apple's standard version of `ssh-add` installed, you may receive an error. For more information, see "[Error: ssh-add: illegal option -- K](/articles/error-ssh-add-illegal-option-k)."

If you don't have Apple's standard version installed, you may receive an error. For more information on resolving this error, see "[Error: ssh-add: illegal option -- K](/articles/error-ssh-add-illegal-option-k)."

In MacOS Monterey (12.0), the `-K` and `-A` flags are deprecated and have been replaced by the `--apple-use-keychain` and `--apple-load-keychain` flags, respectively.

{% endnote %}

Expand Down Expand Up @@ -199,42 +200,42 @@ If you are using macOS or Linux, you may need to update your SSH client or insta
```shell
$ ssh-keygen -t {% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}-sk -C "<em>your_email@example.com</em>"
```

{%- ifversion not ghae %}
{% note %}

**Note:** If the command fails and you receive the error `invalid format` or `feature not supported,` you may be using a hardware security key that does not support the Ed25519 algorithm. Enter the following command instead.
```shell
$ ssh-keygen -t ecdsa-sk -C "your_email@example.com"
```

{% endnote %}
{%- endif %}
4. When you are prompted, touch the button on your hardware security key.
5. When you are prompted to "Enter a file in which to save the key," press Enter to accept the default file location.

{% mac %}

```shell
> Enter a file in which to save the key (/Users/<em>you</em>/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk): <em>[Press enter]</em>
```

{% endmac %}

{% windows %}

```shell
> Enter a file in which to save the key (/c/Users/<em>you</em>/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk):<em>[Press enter]</em>
```

{% endwindows %}

{% linux %}

```shell
> Enter a file in which to save the key (/home/<em>you</em>/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk): <em>[Press enter]</em>
```

{% endlinux %}

6. When you are prompted to type a passphrase, press **Enter**.
Expand Down
4 changes: 4 additions & 0 deletions .../content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,10 @@ Key | Type | Description

{% data reusables.webhooks.pull_request_short_desc %}

{% ifversion fpt or ghec %}
{% data reusables.pull_requests.merge-queue-beta %}
{% endif %}

### Availability

- Repository webhooks
Expand Down
Loading