diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md index 881c4b1c19..ca86371e9b 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md @@ -67,7 +67,7 @@ If you decide you don't want the changes in a topic branch to be merged to the u {% note %} - **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit. + **Note:** The email selector is not available for rebase merges, which do not create a merge commit{% ifversion squash-merge-email %}. For squash merges, the email selector is only shown if you are the pull request author and you have more than one email address associated with your account.{% else %}, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.{% endif %} {% endnote %} diff --git a/data/features/squash-merge-email.yml b/data/features/squash-merge-email.yml new file mode 100644 index 0000000000..3019077eb5 --- /dev/null +++ b/data/features/squash-merge-email.yml @@ -0,0 +1,7 @@ +# Reference: #7932 +# Show/choose commit author email address when squash merging a pull request +versions: + fpt: '*' + ghec: '*' + ghes: '>= 3.8' + ghae: 'issue-7932' diff --git a/translations/log/msft-cn-resets.csv b/translations/log/msft-cn-resets.csv index 8d873af18a..8466c4c156 100644 --- a/translations/log/msft-cn-resets.csv +++ b/translations/log/msft-cn-resets.csv @@ -316,6 +316,7 @@ translations/zh-CN/content/code-security/secret-scanning/managing-alerts-from-se translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md,broken liquid tags translations/zh-CN/content/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection.md,broken liquid tags translations/zh-CN/content/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts.md,rendering error +translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md,broken liquid tags translations/zh-CN/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md,broken liquid tags translations/zh-CN/content/codespaces/codespaces-reference/using-github-copilot-in-github-codespaces.md,broken liquid tags translations/zh-CN/content/codespaces/codespaces-reference/using-the-vs-code-command-palette-in-codespaces.md,broken liquid tags diff --git a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md index 676a5f6f41..0aa23654cd 100644 --- a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md +++ b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md @@ -25,7 +25,13 @@ Rather than copying and pasting from one workflow to another, you can make workf Reusing workflows avoids duplication. This makes workflows easier to maintain and allows you to create new workflows more quickly by building on the work of others, just as you do with actions. Workflow reuse also promotes best practice by helping you to use workflows that are well designed, have already been tested, and have been proven to be effective. Your organization can build up a library of reusable workflows that can be centrally maintained. -The diagram below shows three build jobs on the left of the diagram. After each of these jobs completes successfully a dependent job called "Deploy" runs. This job calls a reusable workflow that contains three jobs: "Staging", "Review", and "Production." The "Production" deployment job only runs after the "Staging" job has completed successfully. Using a reusable workflow to run deployment jobs allows you to run those jobs for each build without duplicating code in workflows. +The diagram below shows an in-progress workflow run that uses a reusable workflow. + +* After each of three build jobs on the left of the diagram completes successfully, a dependent job called "Deploy" is run. +* The "Deploy" job calls a reusable workflow that contains three jobs: "Staging", "Review", and "Production." +* The "Production" deployment job only runs after the "Staging" job has completed successfully. +* When a job targets an environment, the workflow run displays a progress bar that shows the number of steps in the job. In the diagram below, the "Production" job contains 8 steps, with step 6 currently being processed. +* Using a reusable workflow to run deployment jobs allows you to run those jobs for each build without duplicating code in workflows. ![Diagram of a reusable workflow for deployment](/assets/images/help/images/reusable-workflows-ci-cd.png) diff --git a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md index 52509934a0..3b4c1dc5f2 100644 --- a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md +++ b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md @@ -1,6 +1,6 @@ --- -title: 关于依赖关系图 -intro: 您可以使用依赖关系图来识别项目的所有依赖项。 依赖关系图支持一系列流行的软件包生态系统。 +title: About the dependency graph +intro: You can use the dependency graph to identify all your project's dependencies. The dependency graph supports a range of popular package ecosystems. redirect_from: - /github/visualizing-repository-data-with-graphs/about-the-dependency-graph - /code-security/supply-chain-security/about-the-dependency-graph @@ -15,85 +15,101 @@ topics: - Dependencies - Repositories shortTitle: Dependency graph -ms.openlocfilehash: bb8e802210da132d51e4c926ac9085a6790ba683 -ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5 -ms.translationtype: HT -ms.contentlocale: zh-CN -ms.lasthandoff: 09/05/2022 -ms.locfileid: '147578624' --- -## 关于依赖关系图 +## About the dependency graph {% data reusables.dependabot.about-the-dependency-graph %} -向 {% data variables.product.product_name %} 推送提交以更改支持的清单或锁定文件或将其添加到默认分支时，依赖项关系图会自动更新。{% ifversion fpt or ghec %}此外，当有人向某个依赖项的存储库推送更改时，该关系图也会更新。{% endif %}有关支持的生态系统和清单文件的信息，请参阅下面的“[支持的包生态系统](#supported-package-ecosystems)”。 +When you push a commit to {% data variables.product.product_name %} that changes or adds a supported manifest or lock file to the default branch, the dependency graph is automatically updated.{% ifversion fpt or ghec %} In addition, the graph is updated when anyone pushes a change to the repository of one of your dependencies.{% endif %} For information on the supported ecosystems and manifest files, see "[Supported package ecosystems](#supported-package-ecosystems)" below. -{% ifversion dependency-submission-api %} {% data reusables.dependency-submission.dependency-submission-link %} {% endif %} +{% ifversion dependency-submission-api %} +{% data reusables.dependency-submission.dependency-submission-link %} +{% endif %} -当创建包含针对默认分支的依赖项更改的拉取请求时，{% data variables.product.prodname_dotcom %} 使用依赖关系图向拉取请求添加依赖项审查。 它们指示依赖项是否包含漏洞，如果是，则指示已修复漏洞的依赖项版本。 有关详细信息，请参阅“[关于依赖项审查](/code-security/supply-chain-security/about-dependency-review)”。 +When you create a pull request containing changes to dependencies that targets the default branch, {% data variables.product.prodname_dotcom %} uses the dependency graph to add dependency reviews to the pull request. These indicate whether the dependencies contain vulnerabilities and, if so, the version of the dependency in which the vulnerability was fixed. For more information, see "[About dependency review](/code-security/supply-chain-security/about-dependency-review)." -## 依赖关系图可用性 +## Dependency graph availability -{% ifversion fpt or ghec %}依赖关系图可用于使用支持的文件格式在支持的包生态系统中定义依赖关系的每个公共存储库。 存储库管理员还可以为私有存储库设置依赖项关系图。 有关详细信息，请参阅“[配置依赖项关系图](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph)”。{% endif %} +{% ifversion fpt or ghec %}The dependency graph is available for every public repository that defines dependencies in a supported package ecosystem using a supported file format. Repository administrators can also set up the dependency graph for private repositories. For more information, see "[Configuring the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph)."{% endif %} {% data reusables.dependabot.dependabot-alerts-dependency-graph-enterprise %} -## 包含的依赖项 +## Dependencies included -依赖项关系图包含支持的生态系统中的清单和锁定文件（或等效文件）中详述的存储库的所有依赖项{% ifversion dependency-submission-api %}，以及任何使用依赖项提交 API (beta) 提交的依赖项{% endif %}。 这包括： +The dependency graph includes all the dependencies of a repository that are detailed in the manifest and lock files, or their equivalent, for supported ecosystems{% ifversion dependency-submission-api %}, as well as any dependencies that are submitted using the Dependency submission API (beta){% endif %}. This includes: -- 直接依赖项，这些依赖项是在清单或锁定文件中显式定义的{% ifversion dependency-submission-api %}或是已使用依赖项提交 API (beta) 提交的{% endif %} -- 这些直接依赖项的间接依赖项，也称为过渡依赖项或子依赖项 +- Direct dependencies, that are explicitly defined in a manifest or lock file {% ifversion dependency-submission-api %} or have been submitted using the Dependency submission API (beta){% endif %} +- Indirect dependencies of these direct dependencies, also known as transitive dependencies or sub-dependencies -依赖项关系图通过锁定文件显式标识间接依赖项{% ifversion fpt or ghec %}或者通过检查直接依赖项的依赖项来标识间接依赖项。 对于最可靠的依赖关系图， 您应该使用锁定文件（或其等效项），因为它们准确地定义了您当前使用的直接和间接依赖项版本。 如果您使用锁定文件，还要确保仓库的所有贡献者都使用相同的版本，这样更便于您{% else %}从锁定文件{% endif %} 测试和调试代码。 +The dependency graph identifies indirect dependencies{% ifversion fpt or ghec %} either explicitly from a lock file or by checking the dependencies of your direct dependencies. For the most reliable graph, you should use lock files (or their equivalent) because they define exactly which versions of the direct and indirect dependencies you currently use. If you use lock files, you also ensure that all contributors to the repository are using the same versions, which will make it easier for you to test and debug code{% else %} from the lock files{% endif %}. -有关 {% data variables.product.product_name %} 如何帮助你了解环境中的依赖项的详细信息，请参阅“[关于供应链安全性](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)”。 +For more information on how {% data variables.product.product_name %} helps you understand the dependencies in your environment, see "[About supply chain security](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)." {% ifversion fpt or ghec %} -## 包含的依赖关系 +## Dependents included -对于公共仓库，仅报告依赖于它或它发布的包的公共仓库。 对于私有仓库，不报告此信息。{% endif %} +For public repositories, only public repositories that depend on it or on packages that it publishes are reported. This information is not reported for private repositories.{% endif %} -## 使用依赖关系图 +## Using the dependency graph -您可以使用依赖关系图： +You can use the dependency graph to: -- 浏览代码所依赖的存储库{% ifversion fpt or ghec %}，以及依赖于它的存储库{% endif %}。 有关详细信息，请参阅“[探索存储库的依赖项](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)”。 {% ifversion ghec %} -- 在单个仪表板中查看组织仓库中使用的依赖项摘要。 有关详细信息，请参阅“[查看组织的见解](/articles/viewing-insights-for-your-organization#viewing-organization-dependency-insights)”。{% endif %} -- 查看和更新仓库中有漏洞的依赖项。 有关详细信息，请参阅“[关于 {% data variables.product.prodname_dependabot_alerts %}](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)。”{% ifversion fpt or ghes or ghec %} -- 查看拉取请求中有漏洞依赖项的相关信息。 有关详细信息，请参阅“[查看拉取请求中的依赖项更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)”。{% endif %} +- Explore the repositories your code depends on{% ifversion fpt or ghec %}, and those that depend on it{% endif %}. For more information, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)." {% ifversion ghec %} +- View a summary of the dependencies used in your organization's repositories in a single dashboard. For more information, see "[Viewing insights for your organization](/articles/viewing-insights-for-your-organization#viewing-organization-dependency-insights)."{% endif %} +- View and update vulnerable dependencies for your repository. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)."{% ifversion fpt or ghes or ghec %} +- See information about vulnerable dependencies in pull requests. For more information, see "[Reviewing dependency changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)."{% endif %} -## 支持的包生态系统 +## Supported package ecosystems -建议的格式明确定义哪些版本用于所有直接和所有间接依赖项。 如果使用这些格式，依赖项关系图会更准确。 它还反映当前的生成设置，并且使依赖项关系图能够报告直接和间接依赖项中的漏洞。{% ifversion fpt or ghec %}从清单文件（或等效文件）推断的间接依赖项将不包括在不安全的依赖项检查中。{% endif %} +The recommended formats explicitly define which versions are used for all direct and all indirect dependencies. If you use these formats, your dependency graph is more accurate. It also reflects the current build set up and enables the dependency graph to report vulnerabilities in both direct and indirect dependencies.{% ifversion fpt or ghec %} Indirect dependencies that are inferred from a manifest file (or equivalent) are excluded from the checks for insecure dependencies.{% endif %} -| 程序包管理器 | 语言 | 推荐格式 | 所有支持的格式 | +| Package manager | Languages | Recommended formats | All supported formats | | --- | --- | --- | ---| -{%- ifversion dependency-graph-rust-support %} | Cargo{% ifversion ghes = 3.6 or ghae-issue-7563 %}[*]{% endif %} | Rust | `Cargo.lock` | `Cargo.toml`, `Cargo.lock` | {%- endif %} | Composer | PHP | `composer.lock` | `composer.json`, `composer.lock` | | NuGet | .NET 语言（C#、F#、VB）、C++ | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj` | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj`, `packages.config` | {%- ifversion github-actions-in-dependency-graph %} | {% data variables.product.prodname_actions %} 工作流[†] | YAML | `.yml`, `.yaml` | `.yml`, `.yaml` | {%- endif %} {%- ifversion fpt or ghec or ghes > 3.2 or ghae %} | Go 模块 | Go | `go.sum` | `go.mod`, `go.sum` | {%- elsif ghes = 3.2 %} | Go 模块 | Go | `go.mod` | `go.mod` | {%- endif %} | Maven | Java, Scala | `pom.xml` | `pom.xml` | | npm | JavaScript | `package-lock.json` | `package-lock.json`, `package.json`| | pip | Python | `requirements.txt`, `pipfile.lock` | `requirements.txt`, `pipfile`, `pipfile.lock`, `setup.py`[‡] | {%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4752 %} | Python Poetry | Python | `poetry.lock` | `poetry.lock`, `pyproject.toml` | {%- endif %} | RubyGems | Ruby | `Gemfile.lock` | `Gemfile.lock`, `Gemfile`, `*.gemspec` | | Yarn | JavaScript | `yarn.lock` | `package.json`, `yarn.lock` | +{%- ifversion dependency-graph-rust-support %} +| Cargo | Rust | `Cargo.lock` | `Cargo.toml`, `Cargo.lock` | +{%- endif %} +| Composer | PHP | `composer.lock` | `composer.json`, `composer.lock` | +| NuGet | .NET languages (C#, F#, VB), C++ | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj` | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj`, `packages.config` | +{%- ifversion github-actions-in-dependency-graph %} +| {% data variables.product.prodname_actions %} workflows[†] | YAML | `.yml`, `.yaml` | `.yml`, `.yaml` | +{%- endif %} +{%- ifversion fpt or ghec or ghes > 3.2 or ghae %} +| Go modules | Go | `go.sum` | `go.mod`, `go.sum` | +{%- elsif ghes = 3.2 %} +| Go modules | Go | `go.mod` | `go.mod` | +{%- endif %} +| Maven | Java, Scala | `pom.xml` | `pom.xml` | +| npm | JavaScript | `package-lock.json` | `package-lock.json`, `package.json`| +| pip | Python | `requirements.txt`, `pipfile.lock` | `requirements.txt`, `pipfile`, `pipfile.lock`, `setup.py`[‡] | +{%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-4752 %} +| Python Poetry | Python | `poetry.lock` | `poetry.lock`, `pyproject.toml` | +{%- endif %} +| RubyGems | Ruby | `Gemfile.lock` | `Gemfile.lock`, `Gemfile`, `*.gemspec` | +| Yarn | JavaScript | `yarn.lock` | `package.json`, `yarn.lock` | -{% ifversion ghes = 3.6 or ghae-issue-7563 %} [*] 对于 Rust 支持的初始发布，依赖项关系图没有检测可传递的依赖项所需的元数据和映射。 当 `Cargo.lock` 文件中定义了可传递的依赖项时，依赖项关系图将显示这些依赖项（一个级别深度）。 {% data variables.product.prodname_dependabot_alerts %}和 {% data variables.product.prodname_dependabot_security_updates %}可用于 `Cargo.lock` 文件中定义的易受攻击的依赖项。 -{% endif %} - -{% ifversion github-actions-in-dependency-graph %} [†] {% data reusables.enterprise.3-5-missing-feature %} {% data variables.product.prodname_actions %} 工作流必须位于要识别为清单的存储库的 `.github/workflows/` 目录中。 使用 `jobs[*].steps[*].uses` 或 `jobs..uses` 语法引用的任何操作或工作流都将被分析为依赖项。 有关详细信息，请参阅“[{% data variables.product.prodname_actions %} 的工作流语法](/actions/using-workflows/workflow-syntax-for-github-actions)”。 +{% ifversion github-actions-in-dependency-graph %} +[†] {% data reusables.enterprise.3-5-missing-feature %} {% data variables.product.prodname_actions %} workflows must be located in the `.github/workflows/` directory of a repository to be recognized as manifests. Any actions or workflows referenced using the syntax `jobs[*].steps[*].uses` or `jobs..uses` will be parsed as dependencies. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/using-workflows/workflow-syntax-for-github-actions)." {% endif %} -[‡] 如果你在 `setup.py` 文件中列出你的 Python 依赖项，我们可能无法分析和列出你项目中的每个依赖项。 +[‡] If you list your Python dependencies within a `setup.py` file, we may not be able to parse and list every dependency in your project. -{% ifversion github-actions-in-dependency-graph %} {% note %} +{% ifversion github-actions-in-dependency-graph %} +{% note %} -注意：{% data variables.product.prodname_actions %} 工作流程依赖项显示在依赖项关系图中，以供参考。 {% data variables.product.prodname_actions %} 工作流程目前不支持 Dependabot 警报。 +**Note:** {% data variables.product.prodname_actions %} workflow dependencies are displayed in the dependency graph for informational purposes. Dependabot alerts are not currently supported for {% data variables.product.prodname_actions %} workflows. -{% endnote %} {% endif %} +{% endnote %} +{% endif %} -{% ifversion dependency-submission-api %}你可以使用依赖项提交 API (beta) 将所选的包管理器或生态系统中的依赖项添加到依赖项关系图，即使所选的生态系统不在上述受支持的生态系统列表中也可如此。 依赖项关系图将显示按生态系统分组的已提交依赖项，但与从清单或锁定文件解析的依赖项是分开的。 你只会收到来自 {% data variables.product.prodname_advisory_database %} [支持的生态系统](https://github.com/github/advisory-database#supported-ecosystems)之一的依赖项的 {% data variables.product.prodname_dependabot_alerts %}。 有关依赖项提交 API 的详细信息，请参阅“[使用依赖项提交 API](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)”。{% endif %} -## 延伸阅读 +{% ifversion dependency-submission-api %}You can use the Dependency submission API (beta) to add dependencies from the package manager or ecosystem of your choice to the dependency graph, even if the ecosystem is not in the supported ecosystem list above. The dependency graph will display the submitted dependencies grouped by ecosystem, but separately from the dependencies parsed from manifest or lock files. You will only get {% data variables.product.prodname_dependabot_alerts %} for dependencies that are from one of the [supported ecosystems](https://github.com/github/advisory-database#supported-ecosystems) of the {% data variables.product.prodname_advisory_database %}. For more information on the Dependency submission API, see "[Using the Dependency submission API](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)."{% endif %} +## Further reading -- Wikipedia 上的“[依赖项关系图](https://en.wikipedia.org/wiki/Dependency_graph)” -- [探索存储库的依赖项](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository) -- [查看和更新 {% data variables.product.prodname_dependabot_alerts %}](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts) -- [漏洞依赖项检测疑难解答](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies) +- "[Dependency graph](https://en.wikipedia.org/wiki/Dependency_graph)" on Wikipedia +- "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)" +- "[Viewing and updating {% data variables.product.prodname_dependabot_alerts %}](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts)" +- "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)" diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md index 6dfc8e8970..c25339d791 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md @@ -69,6 +69,8 @@ You can create a codespace for a particular task and then safely delete the code If you try to delete a codespace with unpushed git commits, your editor will notify you that you have changes that have not been pushed to a remote branch. You can push any desired changes and then delete your codespace, or continue to delete your codespace and any uncommitted changes. You can also export your code to a new branch without creating a new codespace. For more information, see "[Exporting changes to a branch](/codespaces/troubleshooting/exporting-changes-to-a-branch)." +Codespaces that have been stopped and remain inactive for a specified period of time will be deleted automatically. By default, inactive codespaces are deleted after 30 days, but you can customize your codespace retention period. For more information, see "[Configuring automatic deletion of your codespaces](/codespaces/customizing-your-codespace/configuring-automatic-deletion-of-your-codespaces)." + You will be charged for the storage of all your codespaces. When you delete a codespace, you will no longer be charged. For more information on deleting a codespace, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace)." diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/deleting-a-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/deleting-a-codespace.md index a3297c9082..5a9bb4271a 100644 --- a/translations/zh-CN/content/codespaces/developing-in-codespaces/deleting-a-codespace.md +++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/deleting-a-codespace.md @@ -123,4 +123,5 @@ For more information, click the "{% data variables.product.prodname_cli %}" tab You can also use the REST API to delete codespaces for your organization. For more information, see "[Codespaces organizations](/rest/codespaces/organizations#delete-a-codespace-from-the-organization)." ## Further reading -- "[Codespaces lifecycle](/codespaces/developing-in-codespaces/codespaces-lifecycle)" \ No newline at end of file +- "[Codespaces lifecycle](/codespaces/developing-in-codespaces/codespaces-lifecycle)" +- "[Configuring automatic deletion of your codespaces](/codespaces/customizing-your-codespace/configuring-automatic-deletion-of-your-codespaces)" \ No newline at end of file diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch.md index 5b8281892e..536cf9c559 100644 --- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch.md +++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch.md @@ -1,7 +1,7 @@ --- title: 更改默认分支 intro: 如果仓库中有多个分支，您可以将任何分支配置为默认分支。 -permissions: People with admin permissions to a repository can change the default branch for the repository. +permissions: People with admin access for a repository can change the default branch for the repository. versions: fpt: '*' ghes: '*' diff --git a/translations/zh-CN/content/rest/teams/external-groups.md b/translations/zh-CN/content/rest/teams/external-groups.md index 85f97e357b..c78eae9d0f 100644 --- a/translations/zh-CN/content/rest/teams/external-groups.md +++ b/translations/zh-CN/content/rest/teams/external-groups.md @@ -3,6 +3,7 @@ title: 外部组 intro: 外部组 API 允许查看可用于组织的外部标识提供者组，并管理组织中外部组和团队之间的连接。 versions: fpt: '*' + ghes: '>=3.6' ghae: '*' ghec: '*' topics: