diff --git a/translations/log/msft-cn-resets.csv b/translations/log/msft-cn-resets.csv index a1232c094d39..4310813aba97 100644 --- a/translations/log/msft-cn-resets.csv +++ b/translations/log/msft-cn-resets.csv @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md index 95fdb321b5dc..9d0033a39f75 100644 --- a/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md +++ b/translations/zh-CN/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md @@ -44,14 +44,14 @@ If you are a site administrator for {% data variables.product.product_location % {%- ifversion ghae %} ```shell - $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com" + $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com" ``` {%- else %} ```shell $ ssh-keygen -t ed25519 -C "your_email@example.com" ``` {% 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 "your_email@example.com" @@ -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/you/.ssh/id_algorithm): [Press enter] ``` - + {% endmac %} - + {% windows %} - + ```shell > Enter a file in which to save the key (/c/Users/you/.ssh/id_algorithm):[Press enter] ``` {% endwindows %} - + {% linux %} - + ```shell > Enter a file in which to save the key (/home/you/.ssh/algorithm): [Press enter] ``` - + {% endlinux %} 4. At the prompt, type a secure passphrase. For more information, see ["Working with SSH key passphrases](/articles/working-with-ssh-key-passphrases)." @@ -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 * @@ -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. ``` @@ -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 %} @@ -199,7 +200,7 @@ 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 "your_email@example.com" ``` - + {%- ifversion not ghae %} {% note %} @@ -207,34 +208,34 @@ If you are using macOS or Linux, you may need to update your SSH client or insta ```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/you/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk): [Press enter] ``` {% endmac %} - + {% windows %} - + ```shell > Enter a file in which to save the key (/c/Users/you/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk):[Press enter] ``` {% endwindows %} - + {% linux %} - + ```shell > Enter a file in which to save the key (/home/you/.ssh/id_{% ifversion ghae %}ecdsa{% else %}ed25519{% endif %}_sk): [Press enter] ``` - + {% endlinux %} 6. When you are prompted to type a passphrase, press **Enter**. diff --git a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md index 8c8a2844c46a..5125f0390988 100644 --- a/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md +++ b/translations/zh-CN/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md @@ -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 diff --git a/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md b/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md index ce3f3612d991..e1c0cc329d27 100644 --- a/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md +++ b/translations/zh-CN/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md @@ -1,6 +1,6 @@ --- -title: 管理 GitHub Pages 站点的自定义域 -intro: '您可以设置或更新某些 DNS 记录和仓库设置，以将 {% data variables.product.prodname_pages %} 站点的默认域指向自定义域。' +title: Managing a custom domain for your GitHub Pages site +intro: 'You can set up or update certain DNS records and your repository settings to point the default domain for your {% data variables.product.prodname_pages %} site to a custom domain.' redirect_from: - /articles/quick-start-setting-up-a-custom-domain - /articles/setting-up-an-apex-domain @@ -18,42 +18,49 @@ versions: topics: - Pages shortTitle: Manage a custom domain -ms.openlocfilehash: ad96d0be88614e8294e29de74fd7112cfed1bc46 -ms.sourcegitcommit: 478f2931167988096ae6478a257f492ecaa11794 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/09/2022 -ms.locfileid: '147710321' --- -拥有仓库管理员权限的人可为 {% data variables.product.prodname_pages %} 站点配置自定义域。 -## 关于自定义域配置 +People with admin permissions for a repository can configure a custom domain for a {% data variables.product.prodname_pages %} site. -使用 DNS 提供程序配置自定义域之前，请确保将自定义域添加到您的 {% data variables.product.prodname_pages %} 站点。 使用 DNS 提供程序配置自定义域而不将其添加到 {% data variables.product.product_name %}，可能导致其他人能够在您的某个子域上托管站点。 +## About custom domain configuration + +Make sure you add your custom domain to your {% data variables.product.prodname_pages %} site before configuring your custom domain with your DNS provider. Configuring your custom domain with your DNS provider without adding your custom domain to {% data variables.product.product_name %} could result in someone else being able to host a site on one of your subdomains. {% windows %} -`dig` 命令可用于验证 DNS 记录的配置是否正确，它未包含在 Windows 中。 必须安装 [BIND](https://www.isc.org/bind/) 才能验证 DNS 记录是否配置正确。 +The `dig` command, which can be used to verify correct configuration of DNS records, is not included in Windows. Before you can verify that your DNS records are configured correctly, you must install [BIND](https://www.isc.org/bind/). {% endwindows %} {% note %} -注意：传播 DNS 更改可能需要长达 24 小时的时间。 +**Note:** DNS changes can take up to 24 hours to propagate. {% endnote %} -## 配置子域 +## Configuring a subdomain + +To set up a `www` or custom subdomain, such as `www.example.com` or `blog.example.com`, you must add your domain in the repository settings. After that, configure a CNAME record with your DNS provider. + +{% data reusables.pages.navigate-site-repo %} +{% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} +4. Under "Custom domain", type your custom domain, then click **Save**. If you are publishing your site from a branch, this will create a commit that adds a `CNAME` file to the root of your source branch. If you are publishing your site with a custom {% data variables.product.prodname_actions %} workflow , no `CNAME` file is created. For more information about your publishing source, see "[Configuring a publishing source for your GitHub Pages site](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)." +![Save custom domain button](/assets/images/help/pages/save-custom-subdomain.png) + +{% note %} + +**Note:** If your custom domain is an internationalized domain name, you must enter the Punycode encoded version. -要设置 `www` 或自定义子域（例如 `www.example.com` 或 `blog.example.com`），必须在存储库设置中添加你的域。 然后，通过 DNS 提供商配置 CNAME 记录。 +For more information on Punycodes, see [Internationalized domain name](https://en.wikipedia.org/wiki/Internationalized_domain_name). + +{% endnote %} -{% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.pages.sidebar-pages %} -4. 在“自定义域”下，键入自定义域，然后单击“保存”。 如果从分支发布站点，将会创建一个提交，将 `CNAME` 文件添加到源分支的根目录。 如果使用自定义 {% data variables.product.prodname_actions %} 工作流发布站点，则不会创建 `CNAME` 文件。 有关发布源的详细信息，请参阅“[为 GitHub Pages 站点配置发布源](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)”。 - ![“保存自定义域”按钮](/assets/images/help/pages/save-custom-subdomain.png) -5. 导航到 DNS 提供程序并创建 `CNAME` 记录，使子域指向站点的默认域。 例如，如果要使用子域 `www.example.com` 作为你的用户站点，请创建将 `www.example.com` 指向 `.github.io` 的 `CNAME` 记录。 如果要使用子域 `another.example.com` 作为你的组织站点，请创建将 `another.example.com` 指向 `.github.io` 的 `CNAME` 记录。 `CNAME` 记录应始终指向 `.github.io` 或 `.github.io`，排除存储库名称。 {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} +5. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `.github.io`. If you want to use the subdomain `another.example.com` for your organization site, create a `CNAME` record that points `another.example.com` to `.github.io`. The `CNAME` record should always point to `.github.io` or `.github.io`, excluding the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} -{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %} {% data reusables.command_line.open_the_multi_os_terminal %} -6. 要确认 DNS 记录配置正确，请使用 `dig` 命令，将 WWW.EXAMPLE.COM 替换为子域。 +{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %} +{% data reusables.command_line.open_the_multi_os_terminal %} +6. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your subdomain. ```shell $ dig WWW.EXAMPLE.COM +nostats +nocomments +nocmd > ;WWW.EXAMPLE.COM. IN A @@ -61,27 +68,30 @@ ms.locfileid: '147710321' > YOUR-USERNAME.github.io. 43192 IN CNAME GITHUB-PAGES-SERVER . > GITHUB-PAGES-SERVER . 22 IN A 192.0.2.1 ``` -{% data reusables.pages.build-locally-download-cname %} {% data reusables.pages.enforce-https-custom-domain %} +{% data reusables.pages.build-locally-download-cname %} +{% data reusables.pages.enforce-https-custom-domain %} -## 配置 apex 域 +## Configuring an apex domain -要设置顶点域（例如 `example.com`），必须在存储库设置中配置自定义域，并使用 DNS 提供程序配置至少一个 `ALIAS`、`ANAME` 或 `A` 记录。 +To set up an apex domain, such as `example.com`, you must configure a custom domain in your repository settings and at least one `ALIAS`, `ANAME`, or `A` record with your DNS provider. -{% data reusables.pages.www-and-apex-domain-recommendation %} 有关详细信息，请参阅“[配置子域](#configuring-a-subdomain)”。 +{% data reusables.pages.www-and-apex-domain-recommendation %} For more information, see "[Configuring a subdomain](#configuring-a-subdomain)." -{% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.pages.sidebar-pages %} -4. 在“自定义域”下，键入自定义域，然后单击“保存”。 如果从分支发布站点，将会创建一个提交，将 `CNAME` 文件添加到源分支的根目录。 如果使用自定义 {% data variables.product.prodname_actions %} 工作流发布站点，则不会创建 `CNAME` 文件。 有关发布源的详细信息，请参阅“[为 GitHub Pages 站点配置发布源](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)”。 - ![“保存自定义域”按钮](/assets/images/help/pages/save-custom-apex-domain.png) -5. 导航到 DNS 提供程序并创建一条 `ALIAS`、`ANAME` 或 `A` 记录。 还可以为 IPv6 支持创建 `AAAA` 记录。 {% data reusables.pages.contact-dns-provider %} - - 要创建 `ALIAS` 或 `ANAME` 记录，请将顶点域指向站点的默认域。 {% data reusables.pages.default-domain-information %} - - 要创建 `A` 记录，请将顶点域指向 {% data variables.product.prodname_pages %} 的 IP 地址。 +{% data reusables.pages.navigate-site-repo %} +{% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} +4. Under "Custom domain", type your custom domain, then click **Save**. If you are publishing your site from a branch, this will create a commit that adds a `CNAME` file to the root of your source branch. If you are publishing your site with a custom {% data variables.product.prodname_actions %} workflow , no `CNAME` file is created. For more information about your publishing source, see "[Configuring a publishing source for your GitHub Pages site](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site)." + ![Save custom domain button](/assets/images/help/pages/save-custom-apex-domain.png) +5. Navigate to your DNS provider and create either an `ALIAS`, `ANAME`, or `A` record. You can also create `AAAA` records for IPv6 support. {% data reusables.pages.contact-dns-provider %} + - To create an `ALIAS` or `ANAME` record, point your apex domain to the default domain for your site. {% data reusables.pages.default-domain-information %} + - To create `A` records, point your apex domain to the IP addresses for {% data variables.product.prodname_pages %}. ```shell 185.199.108.153 185.199.109.153 185.199.110.153 185.199.111.153 ``` - - 要创建 `AAAA` 记录，请将顶点域指向 {% data variables.product.prodname_pages %} 的 IP 地址。 + - To create `AAAA` records, point your apex domain to the IP addresses for {% data variables.product.prodname_pages %}. ```shell 2606:50c0:8000::153 2606:50c0:8001::153 @@ -89,9 +99,10 @@ ms.locfileid: '147710321' 2606:50c0:8003::153 ``` -{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %} {% data reusables.command_line.open_the_multi_os_terminal %} -6. 要确认 DNS 记录配置正确，请使用 `dig` 命令，将 EXAMPLE.COM 替换为顶点域。 确认结果与上面 {% data variables.product.prodname_pages %} 的 IP 地址相匹配。 - - 适用于 `A` 记录。 +{% indented_data_reference reusables.pages.wildcard-dns-warning spaces=3 %} +{% data reusables.command_line.open_the_multi_os_terminal %} +6. To confirm that your DNS record configured correctly, use the `dig` command, replacing _EXAMPLE.COM_ with your apex domain. Confirm that the results match the IP addresses for {% data variables.product.prodname_pages %} above. + - For `A` records. ```shell $ dig EXAMPLE.COM +noall +answer -t A > EXAMPLE.COM 3600 IN A 185.199.108.153 @@ -99,7 +110,7 @@ ms.locfileid: '147710321' > EXAMPLE.COM 3600 IN A 185.199.110.153 > EXAMPLE.COM 3600 IN A 185.199.111.153 ``` - - 适用于 `AAAA` 记录。 + - For `AAAA` records. ```shell $ dig EXAMPLE.COM +noall +answer -t AAAA > EXAMPLE.COM 3600 IN AAAA 2606:50c0:8000::153 @@ -107,18 +118,19 @@ ms.locfileid: '147710321' > EXAMPLE.COM 3600 IN AAAA 2606:50c0:8002::153 > EXAMPLE.COM 3600 IN AAAA 2606:50c0:8003::153 ``` -{% data reusables.pages.build-locally-download-cname %} {% data reusables.pages.enforce-https-custom-domain %} +{% data reusables.pages.build-locally-download-cname %} +{% data reusables.pages.enforce-https-custom-domain %} -## 配置顶点域和 `www` 子域变体 +## Configuring an apex domain and the `www` subdomain variant -使用顶点域时，建议配置 {% data variables.product.prodname_pages %} 站点，以便在顶点域和该域的 `www` 子域变体中托管内容。 +When using an apex domain, we recommend configuring your {% data variables.product.prodname_pages %} site to host content at both the apex domain and that domain's `www` subdomain variant. -要与顶点域一起设置 `www` 子域，必须先使用 DNS 提供程序创建 `ALIAS`、`ANAME` 或 `A` 记录来配置顶点域。 有关详细信息，请参阅[配置顶点域](#configuring-an-apex-domain)。 +To set up a `www` subdomain alongside the apex domain, you must first configure an apex domain by creating an `ALIAS`, `ANAME`, or `A` record with your DNS provider. For more information, see "[Configuring an apex domain](#configuring-an-apex-domain)." -配置 apex 域后，您必须通过 DNS 提供商配置 CNAME 记录。 +After you configure the apex domain, you must configure a CNAME record with your DNS provider. -1. 导航到 DNS 提供程序并创建 `CNAME` 记录，使其将 `www.example.com` 指向站点 `.github.io` 或 `.github.io` 的默认域。 不要包括仓库名称。 {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} -2. 要确认 DNS 记录配置正确，请使用 `dig` 命令，将 `www` 替换为子域变体。 +1. Navigate to your DNS provider and create a `CNAME` record that points `www.example.com` to the default domain for your site: `.github.io` or `.github.io`. Do not include the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} +2. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your `www` subdomain variant. ```shell $ dig WWW.EXAMPLE.COM +nostats +nocomments +nocmd > ;WWW.EXAMPLE.COM. IN A @@ -126,16 +138,18 @@ ms.locfileid: '147710321' > YOUR-USERNAME.github.io. 43192 IN CNAME GITHUB-PAGES-SERVER . > GITHUB-PAGES-SERVER . 22 IN A 192.0.2.1 ``` -## 删除自定义域 +## Removing a custom domain -{% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.pages.sidebar-pages %} -4. 在“自定义域”下，单击“删除”。 - ![“保存自定义域”按钮](/assets/images/help/pages/remove-custom-domain.png) +{% data reusables.pages.navigate-site-repo %} +{% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} +4. Under "Custom domain," click **Remove**. + ![Save custom domain button](/assets/images/help/pages/remove-custom-domain.png) -## 保护自定义域 +## Securing your custom domain -{% data reusables.pages.secure-your-domain %} 有关详细信息，请参阅“[验证 {% data variables.product.prodname_pages %} 的自定义域](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)”。 +{% data reusables.pages.secure-your-domain %} For more information, see "[Verifying your custom domain for {% data variables.product.prodname_pages %}](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)." -## 延伸阅读 +## Further reading -- [自定义域和 {% data variables.product.prodname_pages %} 故障排除](/articles/troubleshooting-custom-domains-and-github-pages) +- "[Troubleshooting custom domains and {% data variables.product.prodname_pages %}](/articles/troubleshooting-custom-domains-and-github-pages)" diff --git a/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md b/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md index 9b5859cbe37c..fe55c68405d1 100644 --- a/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md +++ b/translations/zh-CN/data/reusables/pull_requests/merge-queue-beta.md @@ -1,14 +1,7 @@ ---- -ms.openlocfilehash: 2aec9cd701a3503386b9d751c1da74f64940c431 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/05/2022 -ms.locfileid: "147496434" ---- -{% ifversion fpt %} {% note %} +{% ifversion fpt or ghec %} +{% note %} -注意：拉取请求合并队列功能目前处于有限公测阶段，可能会发生更改。 +**Note:** The pull request merge queue feature is currently in limited public beta and subject to change. {% endnote %} diff --git a/translations/zh-CN/data/reusables/webhooks/pull_request_properties.md b/translations/zh-CN/data/reusables/webhooks/pull_request_properties.md index 399f3944d348..df7710260f35 100644 --- a/translations/zh-CN/data/reusables/webhooks/pull_request_properties.md +++ b/translations/zh-CN/data/reusables/webhooks/pull_request_properties.md @@ -1,13 +1,6 @@ ---- -ms.openlocfilehash: e2c781f830b789fbb8fdaaa9403fe4c7a37c63b5 -ms.sourcegitcommit: ac00e2afa6160341c5b258d73539869720b395a4 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/09/2022 -ms.locfileid: "147876025" ---- -`number`|`integer` | 拉取请求号。 -`changes`|`object`| 对注释的更改（如果操作为 `edited`）。 -`changes[title][from]`|`string` | 先前版本的标题（如果操作为 `edited`）。 -`changes[body][from]`|`string` | 先前版本的正文（如果操作为 `edited`）。 -`pull_request`|`object` | [拉取请求](/rest/reference/pulls)本身。 +`number`|`integer` | The pull request number. +`changes`|`object`| The changes to the comment if the action was `edited`. +`changes[title][from]`|`string` | The previous version of the title if the action was `edited`. +`changes[body][from]`|`string` | The previous version of the body if the action was `edited`. +`pull_request`|`object` | The [pull request](/rest/reference/pulls) itself.{% ifversion fpt or ghec %} +`reason`|`string` | The reason the pull request was removed from a merge queue if the action was `dequeued`.{% endif %} diff --git a/translations/zh-CN/data/reusables/webhooks/pull_request_webhook_properties.md b/translations/zh-CN/data/reusables/webhooks/pull_request_webhook_properties.md index cb88fbcd6bff..933b82d81a0a 100644 --- a/translations/zh-CN/data/reusables/webhooks/pull_request_webhook_properties.md +++ b/translations/zh-CN/data/reusables/webhooks/pull_request_webhook_properties.md @@ -1,11 +1,3 @@ ---- -ms.openlocfilehash: b7fde4d22f9d5e5e8b7a3d8f55b3ab19dee1185a -ms.sourcegitcommit: fb047f9450b41b24afc43d9512a5db2a2b750a2a -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/11/2022 -ms.locfileid: "145084294" ---- -密钥 | 类型 | 说明 +Key | Type | Description ----|------|------------- -`action`|`string` | 执行的操作内容. 可以是以下选项之一：
  • `assigned`
  • `auto_merge_disabled`
  • `auto_merge_enabled`
  • `closed`：如果操作为 `closed`，并且 `merged` 键为 `false`，则拉取请求随未合并的提交而关闭。 如果操作为 `closed`，并且 `merged` 键为 `true`，则合并拉取请求。
  • `converted_to_draft`
  • `edited`
  • `labeled`
  • `locked`
  • `opened`
  • `ready_for_review`
  • `reopened`
  • `review_request_removed`
  • `review_requested`
  • `synchronize`：更新拉取请求的主分支时触发。 例如，当头部分支从基础分支更新时，当新提交被推送到头部分支时，或者当基础分支更改时。
  • `unassigned`
  • `unlabeled`
  • `unlocked`
+`action`|`string` | The action that was performed. Can be one of:
  • `assigned`
  • `auto_merge_disabled`
  • `auto_merge_enabled`
  • `closed`: If the action is `closed` and the `merged` key is `false`, the pull request was closed with unmerged commits. If the action is `closed` and the `merged` key is `true`, the pull request was merged.
  • `converted_to_draft`
    • {% ifversion fpt or ghec %}
  • `dequeued`: Triggered when a pull request is removed from a merge queue
    • {% endif %}
  • `edited`
    • {% ifversion fpt or ghec %}
  • `enqueued`: Triggered when a pull request is added to a merge queue
    • {% endif %}
  • `labeled`
  • `locked`
  • `opened`
  • `ready_for_review`
  • `reopened`
  • `review_request_removed`
  • `review_requested`
  • `synchronize`: Triggered when a pull request's head branch is updated. For example, when the head branch is updated from the base branch, when new commits are pushed to the head branch, or when the base branch is changed.
  • `unassigned`
  • `unlabeled`
  • `unlocked`