From 5d01a00c519b404d776238b0e672db98af7e71b8 Mon Sep 17 00:00:00 2001 From: Flash Sheridan Date: Wed, 9 Feb 2022 18:10:20 -0500 Subject: [PATCH 01/41] Document optional install [user] argument --- ...nfiguring-the-self-hosted-runner-application-as-a-service.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md index 64f8750f4a..9bed155ebb 100644 --- a/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md +++ b/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md @@ -79,6 +79,8 @@ You can manage the runner service in the Windows **Services** application, or yo ``` {% endmac %} +The command takes an optional argument to install as a different user. + ## Starting the service Start the service with the following command: From cbb32c592861be2038b354bedaa46b37e93cf389 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Tue, 15 Feb 2022 13:33:40 +1300 Subject: [PATCH 02/41] Explain that GITHUB_SHA may not always be the commit that was pushed Fixes https://github.com/github/docs/issues/15302 --- content/actions/learn-github-actions/environment-variables.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/actions/learn-github-actions/environment-variables.md b/content/actions/learn-github-actions/environment-variables.md index 315f0e46a1..09bc1a22b6 100644 --- a/content/actions/learn-github-actions/environment-variables.md +++ b/content/actions/learn-github-actions/environment-variables.md @@ -156,7 +156,7 @@ We strongly recommend that actions use environment variables to access the files | `GITHUB_RUN_ID` | {% data reusables.github-actions.run_id_description %} For example, `1658821493`. | | `GITHUB_RUN_NUMBER` | {% data reusables.github-actions.run_number_description %} For example, `3`. | | `GITHUB_SERVER_URL`| The URL of the {% data variables.product.product_name %} server. For example: `https://{% data variables.product.product_url %}`. -| `GITHUB_SHA` | The commit SHA that triggered the workflow. For example, `ffac537e6cbbf934b08745a378932722df287a53`. | +| `GITHUB_SHA` | The commit SHA that triggered the workflow. The value of this commit depends on the event that triggered the workflow. For more information, see [Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows). For example, `ffac537e6cbbf934b08745a378932722df287a53`. | | `GITHUB_WORKFLOW` | The name of the workflow. For example, `My test workflow`. If the workflow file doesn't specify a `name`, the value of this variable is the full path of the workflow file in the repository. | | `GITHUB_WORKSPACE` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. For example, `/home/runner/work/my-repo-name/my-repo-name`. | {%- if actions-runner-arch-envvars %} @@ -202,4 +202,4 @@ In this example, the two `if` statements check the `os` property of the `runner` If you generate a value in one step of a job, you can use the value in subsequent steps of the same job by assigning the value to an existing or new environment variable and then writing this to the `GITHUB_ENV` environment file. The environment file can be used directly by an action, or from a shell command in the workflow file by using the `run` keyword. For more information, see "[Workflow commands for {% data variables.product.prodname_actions %}](/actions/reference/workflow-commands-for-github-actions/#setting-an-environment-variable)." If you want to pass a value from a step in one job in a workflow to a step in another job in the workflow, you can define the value as a job output. You can then reference this job output from a step in another job. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_idoutputs)." - \ No newline at end of file + From 6798775cd249e145b5d8a1cc0920d89d8c878854 Mon Sep 17 00:00:00 2001 From: Mike Carey <32496966+mike-carey@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:25:33 -0600 Subject: [PATCH 03/41] Update contexts.md --- content/actions/learn-github-actions/contexts.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/actions/learn-github-actions/contexts.md b/content/actions/learn-github-actions/contexts.md index bf23322ffd..649af6fac4 100644 --- a/content/actions/learn-github-actions/contexts.md +++ b/content/actions/learn-github-actions/contexts.md @@ -183,6 +183,7 @@ The `github` context contains information about the workflow run and the event t | `github.action_path` | `string` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. | | `github.action_ref` | `string` | For a step executing an action, this is the ref of the action being executed. For example, `v2`. | `github.action_repository` | `string` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`. +| `github.action_status` | `string` | When within a composite action, the current status of the action. | | `github.actor` | `string` | The username of the user that initiated the workflow run. | | `github.api_url` | `string` | The URL of the {% data variables.product.prodname_dotcom %} REST API. | | `github.base_ref` | `string` | The `base_ref` or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either `pull_request` or `pull_request_target`. | From e103e625cff1fb93d087156107bf17d5defebfa5 Mon Sep 17 00:00:00 2001 From: Mike Carey <32496966+mike-carey@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:37:17 -0600 Subject: [PATCH 04/41] Rewords the description --- content/actions/learn-github-actions/contexts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/learn-github-actions/contexts.md b/content/actions/learn-github-actions/contexts.md index 649af6fac4..dbeec8a7c3 100644 --- a/content/actions/learn-github-actions/contexts.md +++ b/content/actions/learn-github-actions/contexts.md @@ -183,7 +183,7 @@ The `github` context contains information about the workflow run and the event t | `github.action_path` | `string` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. | | `github.action_ref` | `string` | For a step executing an action, this is the ref of the action being executed. For example, `v2`. | `github.action_repository` | `string` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`. -| `github.action_status` | `string` | When within a composite action, the current status of the action. | +| `github.action_status` | `string` | For a composite action, the current result of the composite action. | | `github.actor` | `string` | The username of the user that initiated the workflow run. | | `github.api_url` | `string` | The URL of the {% data variables.product.prodname_dotcom %} REST API. | | `github.base_ref` | `string` | The `base_ref` or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either `pull_request` or `pull_request_target`. | From f8a3538ecbd6e80676599052cd8aa7c9e987e246 Mon Sep 17 00:00:00 2001 From: Deepansh Mathur Date: Fri, 25 Feb 2022 17:23:44 +0530 Subject: [PATCH 05/41] Update duplicating-a-repository.md When I pull a`bare` clone of a repository, the name of the folder that gets created is `old-repository.git` whereas the name specified in the docs is just `old-repository`. Updated the same --- .../duplicating-a-repository.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md b/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md index 0c90178f10..133488a738 100644 --- a/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md @@ -35,13 +35,13 @@ Before you can push the original repository to your new copy, or _mirror_, of th ``` 3. Mirror-push to the new repository. ```shell - $ cd old-repository + $ cd old-repository.git $ git push --mirror https://{% data variables.command_line.codeblock %}/exampleuser/new-repository.git ``` 4. Remove the temporary local repository you created earlier. ```shell $ cd .. - $ rm -rf old-repository + $ rm -rf old-repository.git ``` ## Mirroring a repository that contains {% data variables.large_files.product_name_long %} objects @@ -53,7 +53,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th ``` 3. Navigate to the repository you just cloned. ```shell - $ cd old-repository + $ cd old-repository.git ``` 4. Pull in the repository's {% data variables.large_files.product_name_long %} objects. ```shell @@ -70,7 +70,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th 7. Remove the temporary local repository you created earlier. ```shell $ cd .. - $ rm -rf old-repository + $ rm -rf old-repository.git ``` ## Mirroring a repository in another location From 0512c172531e1c0cbab38453f509a1c3db98b632 Mon Sep 17 00:00:00 2001 From: Reginaldo Junior Date: Tue, 1 Mar 2022 19:57:08 +0000 Subject: [PATCH 06/41] Add new pricing calculator urls --- data/reusables/dotcom_billing/pricing_cal.md | 1 - data/reusables/dotcom_billing/pricing_calculator/base_text.md | 1 + .../dotcom_billing/pricing_calculator/pricing_cal_actions.md | 1 + .../dotcom_billing/pricing_calculator/pricing_cal_codespaces.md | 1 + .../dotcom_billing/pricing_calculator/pricing_cal_packages.md | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 data/reusables/dotcom_billing/pricing_cal.md create mode 100644 data/reusables/dotcom_billing/pricing_calculator/base_text.md create mode 100644 data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md create mode 100644 data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md create mode 100644 data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md diff --git a/data/reusables/dotcom_billing/pricing_cal.md b/data/reusables/dotcom_billing/pricing_cal.md deleted file mode 100644 index 6509379b28..0000000000 --- a/data/reusables/dotcom_billing/pricing_cal.md +++ /dev/null @@ -1 +0,0 @@ -To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} pricing calculator. For more information, go to https://github.com/pricing/calculator. diff --git a/data/reusables/dotcom_billing/pricing_calculator/base_text.md b/data/reusables/dotcom_billing/pricing_calculator/base_text.md new file mode 100644 index 0000000000..2e25629c99 --- /dev/null +++ b/data/reusables/dotcom_billing/pricing_calculator/base_text.md @@ -0,0 +1 @@ +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} \ No newline at end of file diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md new file mode 100644 index 0000000000..7c56ed5fd4 --- /dev/null +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md @@ -0,0 +1 @@ +{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=actions). diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md new file mode 100644 index 0000000000..e4ff574d31 --- /dev/null +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md @@ -0,0 +1 @@ +{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces). diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md new file mode 100644 index 0000000000..2c79edbefd --- /dev/null +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md @@ -0,0 +1 @@ +{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=packages). From 4d98adafca0c806371172566e73d2e6bba3ba06c Mon Sep 17 00:00:00 2001 From: Reginaldo Junior Date: Tue, 1 Mar 2022 20:27:01 +0000 Subject: [PATCH 07/41] Update docs with new pricing calculator urls --- .../about-billing-for-github-actions.md | 2 +- .../about-billing-for-codespaces.md | 2 +- .../about-billing-for-github-packages.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md index 452709c48f..56794f90c1 100644 --- a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md +++ b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md @@ -69,7 +69,7 @@ The number of jobs you can run concurrently across all repositories in your user ## Calculating minute and storage spending -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_actions %} At the end of the month, {% data variables.product.prodname_dotcom %} calculates the cost of minutes and storage used over the amount included in your account. diff --git a/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md b/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md index 40f4bb10c9..48ec342918 100644 --- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md +++ b/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md @@ -38,7 +38,7 @@ Your {% data variables.product.prodname_codespaces %} usage shares your account' If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_codespaces %} usage. For more information, see "[Connecting an Azure subscription to your enterprise](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)." {% endif %} -{% data reusables.dotcom_billing.pricing_cal %} +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_codespaces %} ### Billing for {% data variables.product.prodname_codespaces %} prebuilds diff --git a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md index 27867b71cb..590f28befa 100644 --- a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -51,7 +51,7 @@ Storage usage is shared with build artifacts produced by {% data variables.produ {% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage and $0.50 USD per GB of data transfer. -For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_cal %} +For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. From 2682eeb7231c3706f468141c05eaae47b0075826 Mon Sep 17 00:00:00 2001 From: Sarah Edwards Date: Wed, 2 Mar 2022 16:35:14 -0800 Subject: [PATCH 08/41] add word --- content/actions/learn-github-actions/environment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/learn-github-actions/environment-variables.md b/content/actions/learn-github-actions/environment-variables.md index 09bc1a22b6..4a3e2ed9cc 100644 --- a/content/actions/learn-github-actions/environment-variables.md +++ b/content/actions/learn-github-actions/environment-variables.md @@ -156,7 +156,7 @@ We strongly recommend that actions use environment variables to access the files | `GITHUB_RUN_ID` | {% data reusables.github-actions.run_id_description %} For example, `1658821493`. | | `GITHUB_RUN_NUMBER` | {% data reusables.github-actions.run_number_description %} For example, `3`. | | `GITHUB_SERVER_URL`| The URL of the {% data variables.product.product_name %} server. For example: `https://{% data variables.product.product_url %}`. -| `GITHUB_SHA` | The commit SHA that triggered the workflow. The value of this commit depends on the event that triggered the workflow. For more information, see [Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows). For example, `ffac537e6cbbf934b08745a378932722df287a53`. | +| `GITHUB_SHA` | The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see [Events that trigger workflows](/actions/using-workflows/events-that-trigger-workflows). For example, `ffac537e6cbbf934b08745a378932722df287a53`. | | `GITHUB_WORKFLOW` | The name of the workflow. For example, `My test workflow`. If the workflow file doesn't specify a `name`, the value of this variable is the full path of the workflow file in the repository. | | `GITHUB_WORKSPACE` | The default working directory on the runner for steps, and the default location of your repository when using the [`checkout`](https://github.com/actions/checkout) action. For example, `/home/runner/work/my-repo-name/my-repo-name`. | {%- if actions-runner-arch-envvars %} From 7cd968b87c6259a0f3545e05fa6e3c21be4fe0b0 Mon Sep 17 00:00:00 2001 From: Flash Sheridan Date: Wed, 2 Mar 2022 19:43:48 -0500 Subject: [PATCH 09/41] state the argument name/give an example Suggestion from skedwards88. Co-authored-by: Sarah Edwards --- ...uring-the-self-hosted-runner-application-as-a-service.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md index 9bed155ebb..6925ad2ba0 100644 --- a/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md +++ b/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md @@ -79,7 +79,11 @@ You can manage the runner service in the Windows **Services** application, or yo ``` {% endmac %} -The command takes an optional argument to install as a different user. +The command takes an optional `user` argument to install the service as a different user. + +```shell +./svc.sh install --user USERNAME +``` ## Starting the service From 0eeae0b799b21db219733be29242ce8730135afa Mon Sep 17 00:00:00 2001 From: Mahmoud Hanafy Date: Thu, 3 Mar 2022 16:11:02 +0100 Subject: [PATCH 10/41] Correct link for reviewing dependency changes in a pull request --- .../reviewing-proposed-changes-in-a-pull-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md index 3635048c07..39ec13a08c 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request.md @@ -66,7 +66,7 @@ For more information on reviewing pull requests in {% data variables.product.pro {% data reusables.dependency-review.beta %} -If the pull request contains changes to dependencies you can use the dependency review for a manifest or lock file to see what has changed and check whether the changes introduce security vulnerabilities. For more information, see "[Reviewing dependency changes in a pull request](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request)." +If the pull request contains changes to dependencies you can use the dependency review for a manifest or lock file to see what has changed and check whether the changes introduce security vulnerabilities. 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)." {% data reusables.repositories.changed-files %} From 4e8f7ea6384ba7772b5fa8f9e69b34ee35514a1b Mon Sep 17 00:00:00 2001 From: Reginaldo Junior Date: Thu, 3 Mar 2022 21:58:09 -0300 Subject: [PATCH 11/41] Move data tag to new line Co-authored-by: Laura Coursen --- .../about-billing-for-github-packages.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md index 590f28befa..d9247cd964 100644 --- a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -51,7 +51,9 @@ Storage usage is shared with build artifacts produced by {% data variables.produ {% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.25 USD per GB of storage and $0.50 USD per GB of data transfer. -For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} +For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.25 USD per GB or $37 USD. The overage for data transfer would cost $0.50 USD per GB or $20 USD. + +{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} At the end of the month, {% data variables.product.prodname_dotcom %} rounds your data transfer to the nearest GB. From 6ec82754f8cddb00690edabe04720bcee33c52a0 Mon Sep 17 00:00:00 2001 From: Reginaldo Junior Date: Fri, 4 Mar 2022 01:31:02 +0000 Subject: [PATCH 12/41] Remove partial sentences from reusables --- .../dotcom_billing/pricing_calculator/pricing_cal_actions.md | 2 +- .../dotcom_billing/pricing_calculator/pricing_cal_codespaces.md | 2 +- .../dotcom_billing/pricing_calculator/pricing_cal_packages.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md index 7c56ed5fd4..c8e8d5628c 100644 --- a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_actions.md @@ -1 +1 @@ -{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=actions). +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=actions). diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md index e4ff574d31..6d8a5f5451 100644 --- a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md @@ -1 +1 @@ -{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces). +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces). diff --git a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md index 2c79edbefd..690f270d1b 100644 --- a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md +++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_packages.md @@ -1 +1 @@ -{% data reusables.dotcom_billing.pricing_calculator.base_text %} [pricing calculator](https://github.com/pricing/calculator?feature=packages). +To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=packages). From db9b7ad35d2e51cbaeee2fef2af61a3054fa4711 Mon Sep 17 00:00:00 2001 From: Reginaldo Junior Date: Mon, 7 Mar 2022 13:24:23 +0000 Subject: [PATCH 13/41] Delete unused pricing calculator file --- data/reusables/dotcom_billing/pricing_calculator/base_text.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 data/reusables/dotcom_billing/pricing_calculator/base_text.md diff --git a/data/reusables/dotcom_billing/pricing_calculator/base_text.md b/data/reusables/dotcom_billing/pricing_calculator/base_text.md deleted file mode 100644 index 2e25629c99..0000000000 --- a/data/reusables/dotcom_billing/pricing_calculator/base_text.md +++ /dev/null @@ -1 +0,0 @@ -To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} \ No newline at end of file From ccc50c4b9554e2022baf882bdfd74ac5690ad2a5 Mon Sep 17 00:00:00 2001 From: Mike Surowiec Date: Mon, 7 Mar 2022 15:32:28 -0600 Subject: [PATCH 14/41] enable OS contributions of components,lib,middleware,pages, and stylesheets code (#25982) --- .github/workflows/azure-preview-env-deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml index 6813eb3132..a653ba63e8 100644 --- a/.github/workflows/azure-preview-env-deploy.yml +++ b/.github/workflows/azure-preview-env-deploy.yml @@ -162,6 +162,11 @@ jobs: rsync -rptovR ./user-code/content/./**/*.md ./content rsync -rptovR ./user-code/assets/./**/*.png ./assets rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data + rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components + rsync -rptovR ./user-code/lib/./**/*.{js,ts,json} ./lib + rsync -rptovR ./user-code/middleware/./**/*.{js,ts} ./middleware + rsync -rptovR ./user-code/pages/./**/*.{tsx} ./pages + rsync -rptovR ./user-code/stylesheets/./**/*.{scss} ./stylesheets # In addition to making the final image smaller, we also save time by not sending unnecessary files to the docker build context - name: 'Prune for preview env' From 8fa4444de60a2a40f8feb4e08fd2a3d3ab4c81a3 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Mon, 7 Mar 2022 15:27:01 -0800 Subject: [PATCH 15/41] New translation batch for pt (#25985) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/fix-translation-errors.js * Run script/i18n/lint-translation-files.js --check parsing * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=pt * run script/i18n/reset-known-broken-translation-files.js * Check in pt CSV report Co-authored-by: Peter Bengtsson --- translations/log/pt-resets.csv | 1 - .../viewing-your-subscriptions.md | 2 +- ...analysis-settings-for-your-user-account.md | 4 +- ...on-levels-for-a-user-account-repository.md | 2 +- .../creating-actions/about-custom-actions.md | 2 +- .../creating-a-docker-container-action.md | 2 +- .../creating-a-javascript-action.md | 2 +- .../about-continuous-deployment.md | 2 +- ...-security-hardening-with-openid-connect.md | 2 +- ...ess-to-self-hosted-runners-using-groups.md | 12 +- .../actions/learn-github-actions/contexts.md | 2 +- .../learn-github-actions/expressions.md | 2 +- .../understanding-github-actions.md | 8 +- .../removing-workflow-artifacts.md | 2 +- .../security-guides/encrypted-secrets.md | 26 +-- .../security-hardening-for-github-actions.md | 12 +- .../events-that-trigger-workflows.md | 20 +-- .../using-workflows/triggering-a-workflow.md | 18 +- .../workflow-syntax-for-github-actions.md | 2 +- ...guring-code-scanning-for-your-appliance.md | 2 +- ...ring-secret-scanning-for-your-appliance.md | 2 +- .../managing-github-connect.md | 63 ++++--- .../about-github-actions-for-enterprises.md | 8 +- ...arted-with-github-actions-for-github-ae.md | 2 +- ...ub-actions-for-github-enterprise-server.md | 4 +- ...self-hosted-runners-for-your-enterprise.md | 40 ++--- ...ucing-github-actions-to-your-enterprise.md | 6 +- .../about-using-actions-in-your-enterprise.md | 2 +- ...saml-single-sign-on-for-your-enterprise.md | 2 - ...le-sign-on-for-enterprise-managed-users.md | 6 +- ...-for-enterprise-managed-users-with-okta.md | 2 + ...ovisioning-for-enterprise-managed-users.md | 2 + .../overview/about-enterprise-accounts.md | 4 +- ...or-security-settings-in-your-enterprise.md | 2 +- ...n-organization-owned-by-your-enterprise.md | 38 ++-- .../restoring-a-deleted-organization.md | 4 +- ...viting-people-to-manage-your-enterprise.md | 7 +- .../removing-a-member-from-your-enterprise.md | 26 +-- .../roles-in-an-enterprise.md | 10 +- ...updating-your-github-access-credentials.md | 2 +- .../checking-for-existing-gpg-keys.md | 4 +- .../telling-git-about-your-signing-key.md | 2 +- .../about-billing-for-codespaces.md | 2 +- .../downgrading-your-github-subscription.md | 7 + ...io-subscriptions-with-github-enterprise.md | 2 + ...rise-server-and-github-enterprise-cloud.md | 6 +- .../about-code-scanning-with-codeql.md | 2 +- ...tting-up-code-scanning-for-a-repository.md | 2 +- .../sarif-support-for-code-scanning.md | 6 +- .../github-security-features.md | 6 +- ...g-secret-scanning-for-your-repositories.md | 6 +- ...ing-custom-patterns-for-secret-scanning.md | 16 +- .../managing-alerts-from-secret-scanning.md | 4 +- ...ltering-alerts-in-the-security-overview.md | 16 +- .../viewing-the-security-overview.md | 4 +- ...owed-ip-addresses-for-your-organization.md | 6 +- ...analysis-settings-for-your-organization.md | 2 +- .../repository-roles-for-an-organization.md | 168 +++++++++--------- ...om-repository-roles-for-an-organization.md | 2 + ...ml-single-sign-on-for-your-organization.md | 2 - translations/pt-BR/content/packages/index.md | 4 +- .../configuring-tag-protection-rules.md | 27 +++ .../managing-repository-settings/index.md | 1 + .../reusables/actions/actions-on-examples.md | 8 +- .../runner-group-assign-policy-repo.md | 2 +- .../self-hosted-runner-add-to-enterprise.md | 2 +- ...ip-allow-lists-example-and-restrictions.md | 2 +- .../cannot-update-existing-saml-settings.md | 5 - .../reusables/scim/emu-scim-rate-limit.md | 5 + 69 files changed, 362 insertions(+), 316 deletions(-) create mode 100644 translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md delete mode 100644 translations/pt-BR/data/reusables/saml/cannot-update-existing-saml-settings.md create mode 100644 translations/pt-BR/data/reusables/scim/emu-scim-rate-limit.md diff --git a/translations/log/pt-resets.csv b/translations/log/pt-resets.csv index f2af85c50a..4782e401f3 100644 --- a/translations/log/pt-resets.csv +++ b/translations/log/pt-resets.csv @@ -5,7 +5,6 @@ translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-r translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md,broken liquid tags translations/pt-BR/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md,broken liquid tags translations/pt-BR/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md,Listed in localization-support#489 -translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md,broken liquid tags translations/pt-BR/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md,broken liquid tags translations/pt-BR/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md,broken liquid tags translations/pt-BR/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md,broken liquid tags diff --git a/translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/viewing-your-subscriptions.md b/translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/viewing-your-subscriptions.md index eb470fb6c6..d5d8ce920a 100644 --- a/translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/viewing-your-subscriptions.md +++ b/translations/pt-BR/content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/viewing-your-subscriptions.md @@ -72,7 +72,7 @@ Muitas pessoas esquecem os repositórios que eles escolheram inspecionar no pass {% tip %} - **Tip:** Instead of watching a repository, consider only receiving notifications when there are updates to {% data reusables.notifications-v2.custom-notification-types %} (if enabled for the repository), or any combination of these options, or completely unwatching a repository. + **Dica:** Em vez de inspecionar um repositório, considere receber notificações apenas quando houver atualizações para {% data reusables.notifications-v2.custom-notification-types %} (se habilitado para o repositório), qualquer combinação dessas opções, ou cancelar por completo a inspeção de um repositório. Quando você deixa de inspecionar um repositório, você ainda pode ser notificado quando for @mencionado ou estiver participando de um thread. Ao definir a configuração para receber notificações de certos tipos de evento, você só será notificado quando houver atualizações desses tipos de eventos no repositório, quando você estiver participando de um tópico ou quando você ou a sua equipe for @mentioned. diff --git a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-security-and-analysis-settings-for-your-user-account.md b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-security-and-analysis-settings-for-your-user-account.md index d9ad665dc3..78305fdf52 100644 --- a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-security-and-analysis-settings-for-your-user-account.md +++ b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-security-and-analysis-settings-for-your-user-account.md @@ -31,7 +31,7 @@ Para obter uma visão geral da segurança do repositório, consulte "[Proteger s {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.security-analysis %} -3. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. +3. Em "Código de segurança e análise" à direita do recurso, clique em **Desabilitar tudo** ou **Habilitar tudo**. {% ifversion ghes > 3.2 %}!["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/enterprise/3.3/settings/security-and-analysis-disable-or-enable-all.png){% else %}!["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/settings/security-and-analysis-disable-or-enable-all.png){% endif %} 6. Opcionalmente, habilite o recurso por padrão para novos repositórios que você possui. {% ifversion ghes > 3.2 %}!["Enable by default" option for new repositories](/assets/images/enterprise/3.3/settings/security-and-analysis-enable-by-default-in-modal.png){% else %}!["Enable by default" option for new repositories](/assets/images/help/settings/security-and-analysis-enable-by-default-in-modal.png){% endif %} @@ -44,7 +44,7 @@ Para obter uma visão geral da segurança do repositório, consulte "[Proteger s {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.security-analysis %} -3. Under "Code security and analysis", to the right of the feature, enable or disable the feature by default for new repositories that you own. +3. Na opção "Código de segurança e análise", à direita do recurso, habilite ou desabilite o recurso por padrão para novos repositórios que você possui. {% ifversion ghes > 3.2 %}![Checkbox for enabling or disabling a feature for new repositories](/assets/images/enterprise/3.3/settings/security-and-analysis-enable-or-disable-feature-checkbox.png){% else %}![Checkbox for enabling or disabling a feature for new repositories](/assets/images/help/settings/security-and-analysis-enable-or-disable-feature-checkbox.png){% endif %} ## Leia mais diff --git a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/permission-levels-for-a-user-account-repository.md b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/permission-levels-for-a-user-account-repository.md index 6b19167b5a..dd4e45d9fa 100644 --- a/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/permission-levels-for-a-user-account-repository.md +++ b/translations/pt-BR/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/permission-levels-for-a-user-account-repository.md @@ -37,7 +37,7 @@ O proprietário do repositório tem controle total do repositório. Além das a | "[Convidar colaboradores para um repositório pessoal](/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository)" | | | Alterar a visibilidade do repositório | "[Configurar a visibilidade do repositório](/github/administering-a-repository/setting-repository-visibility)" {% ifversion fpt or ghec %} | Limitar interações com o repositório | "[Limitar interações no seu repositório](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)",{% endif %} -| Renomear um branch, incluindo o branch padrão | "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)" | +| Renomear um branch, incluindo o branch padrão | "[Renomeando um branch](/github/administering-a-repository/renaming-a-branch)" | | Fazer merge de uma pull request em um branch protegido, mesmo sem revisões de aprovação | "[Sobre branches protegidos](/github/administering-a-repository/about-protected-branches)" | | Excluir o repositório | "[Excluir um repositório](/repositories/creating-and-managing-repositories/deleting-a-repository)" | | Gerenciar tópicos do repositório | "[Classificar seu repositório com tópicos](/github/administering-a-repository/classifying-your-repository-with-topics)" {% ifversion fpt or ghec %} diff --git a/translations/pt-BR/content/actions/creating-actions/about-custom-actions.md b/translations/pt-BR/content/actions/creating-actions/about-custom-actions.md index 3e80839b7a..63d77c449d 100644 --- a/translations/pt-BR/content/actions/creating-actions/about-custom-actions.md +++ b/translations/pt-BR/content/actions/creating-actions/about-custom-actions.md @@ -129,7 +129,7 @@ etapas: ### Usar um SHA do commit para o gerenciamento de versão -Cada commit do Git recebe um valor SHA calculado, que é único e imutável. Os usuários da sua ação podem preferir depender de um valor SHA do commit, uma vez que esta abordagem pode ser mais confiável do que especificar uma tag, que pode ser excluída ou movida. No entanto, isso significa que os usuários não receberão mais atualizações realizadas na ação. You must use a commit's full SHA value, and not an abbreviated value. +Cada commit do Git recebe um valor SHA calculado, que é único e imutável. Os usuários da sua ação podem preferir depender de um valor SHA do commit, uma vez que esta abordagem pode ser mais confiável do que especificar uma tag, que pode ser excluída ou movida. No entanto, isso significa que os usuários não receberão mais atualizações realizadas na ação. Você deve usar o valor SHA completo de um commit e não um valor abreviado. ```yaml etapas: diff --git a/translations/pt-BR/content/actions/creating-actions/creating-a-docker-container-action.md b/translations/pt-BR/content/actions/creating-actions/creating-a-docker-container-action.md index ba4e8679fc..3fbf697697 100644 --- a/translations/pt-BR/content/actions/creating-actions/creating-a-docker-container-action.md +++ b/translations/pt-BR/content/actions/creating-actions/creating-a-docker-container-action.md @@ -237,7 +237,7 @@ trabalhos: ``` {% endraw %} -No seu repositório, clique na aba **Ações** e selecione a última execução do fluxo de trabalho. Under **Jobs** or in the visualization graph, click **A job to say hello**. Você deverá ver "Hello Mona the Octocat" ou o nome que você usou como entrada em `who-to-greet` e o horário impresso no log. +No seu repositório, clique na aba **Ações** e selecione a última execução do fluxo de trabalho. Em **Trabalhos** ou no gráfico de visualização, clique em **A job to say hello**. Você deverá ver "Hello Mona the Octocat" ou o nome que você usou como entrada em `who-to-greet` e o horário impresso no log. ![Uma captura de tela de sua ação em um fluxo de trabalho](/assets/images/help/repository/docker-action-workflow-run-updated.png) diff --git a/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md b/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md index 8feff4647e..ce3ba72215 100644 --- a/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md +++ b/translations/pt-BR/content/actions/creating-actions/creating-a-javascript-action.md @@ -263,6 +263,6 @@ trabalhos: ``` {% endraw %} -No seu repositório, clique na aba **Ações** e selecione a última execução do fluxo de trabalho. Under **Jobs** or in the visualization graph, click **A job to say hello**. Você deverá ver "Hello Mona the Octocat" ou o nome que você usou como entrada em `who-to-greet` e o horário impresso no log. +No seu repositório, clique na aba **Ações** e selecione a última execução do fluxo de trabalho. Em **Trabalhos** ou no gráfico de visualização, clique em **A job to say hello**. Você deverá ver "Hello Mona the Octocat" ou o nome que você usou como entrada em `who-to-greet` e o horário impresso no log. ![Uma captura de tela de sua ação em um fluxo de trabalho](/assets/images/help/repository/javascript-action-workflow-run-updated-2.png) diff --git a/translations/pt-BR/content/actions/deployment/about-deployments/about-continuous-deployment.md b/translations/pt-BR/content/actions/deployment/about-deployments/about-continuous-deployment.md index dcd41119f9..b629bd496d 100644 --- a/translations/pt-BR/content/actions/deployment/about-deployments/about-continuous-deployment.md +++ b/translations/pt-BR/content/actions/deployment/about-deployments/about-continuous-deployment.md @@ -29,7 +29,7 @@ A implentação contínua é frequentemente acompanhada da integração contínu Você pode configurar seu fluxo de trabalho do CD para ser executado quando ocorrer um evento de {% data variables.product.product_name %} (por exemplo, quando o novo código é enviado para o branch padrão do seu repositório), em um cronograma definido, manualmente ou quando ocorre um evento externo usando o webhook de envio do repositório. Para obter mais informações sobre quando seu fluxo de trabalho pode ser executado, consulte "[Eventos que acionam fluxos de trabalho](/actions/reference/events-that-trigger-workflows)". -{% data variables.product.prodname_actions %} fornece funcionalidades que dão mais controle sobre implantações. Por exemplo, você pode usar ambientes para exigir aprovação para um trabalho prosseguir, restringir quais branches podem acionar um fluxo de trabalho, ou limitar o acesso a segredos. {% ifversion fpt or ghae or ghes > 3.1 or ghec %}Você pode usar a simultaneidade para limitar o pipeline do CD a um máximo de uma implantação em andamento e uma implantação pendente. {% endif %}For more information about these features, see "[Deploying with GitHub Actions](/actions/deployment/deploying-with-github-actions)" and "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)." +{% data variables.product.prodname_actions %} fornece funcionalidades que dão mais controle sobre implantações. Por exemplo, você pode usar ambientes para exigir aprovação para um trabalho prosseguir, restringir quais branches podem acionar um fluxo de trabalho, ou limitar o acesso a segredos. {% ifversion fpt or ghae or ghes > 3.1 or ghec %}Você pode usar a simultaneidade para limitar o pipeline do CD a um máximo de uma implantação em andamento e uma implantação pendente. {% endif %}Para obter mais informações sobre essas funcionalidades, consulte "[Implantando com GitHub Actions](/actions/deployment/deploying-with-github-actions)" e "[Usando ambientes para implantação](/actions/deployment/using-environments-for-deployment)". {% ifversion fpt or ghec or ghae-issue-4856 %} diff --git a/translations/pt-BR/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md b/translations/pt-BR/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md index aa9aa56f58..db3bddc4cd 100644 --- a/translations/pt-BR/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md +++ b/translations/pt-BR/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md @@ -164,7 +164,7 @@ Você pode configurar um assunto que filtra um nome de [ambiente](/actions/deplo #### Filtrando eventos `pull_request` -The subject claim includes the `pull_request` string when the workflow is triggered by a pull request event, but only if the job doesn't reference an environment. +A reivindicação do titular inclui a string `pull_request` quando o fluxo de trabalho é acionado por um evento de pull request, mas apenas se o trabalho não fizer referência a um ambiente. Você pode configurar um assunto que filtra o evento [`pull_request`](/actions/learn-github-actions/events-that-trigger-workflows#pull_request). Neste exemplo, a execução do fluxo de trabalho deve ter sido acionada por um evento `pull_request` em um repositório denominado `octo-repo` que pertence à organização `octo-org`: diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md b/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md index a1dd176b1c..3ea326d0a5 100644 --- a/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md +++ b/translations/pt-BR/content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md @@ -69,12 +69,12 @@ Ao criar um grupo, você deverá escolher uma política que defina quais reposit ![Adicionar grupo de executor](/assets/images/help/settings/actions-org-add-runner-group.png) 1. Insira um nome para o seu grupo de executor e atribua uma política para acesso ao repositório. - You can configure a runner group to be accessible to a specific list of repositories, or to all repositories in the organization.{% ifversion ghec or ghes %} By default, only private repositories can access runners in a runner group, but you can override this. Esta configuração não pode ser substituída se configurar o grupo de executores da organização que foi compartilhado por uma empresa.{% endif %} + É possível configurar o grupo de um executor para ser acessível a uma lista específica de repositórios ou a todos os repositórios na organização.{% ifversion ghec or ghes %} Por padrão, apenas repositórios privados podem acessar executores no grupo do executor, mas você pode substituir isso. Esta configuração não pode ser substituída se configurar o grupo de executores da organização que foi compartilhado por uma empresa.{% endif %} {%- ifversion ghes %} {% warning %} - **Warning**: + **Aviso**: {% indented_data_reference reusables.actions.self-hosted-runner-security spaces=3 %} @@ -96,12 +96,12 @@ Os executores auto-hospedados são automaticamente atribuídos ao grupo-padrão Ao criar um grupo, você deve escolher uma política que defina quais organizações têm acesso ao grupo de executores. {% data reusables.actions.self-hosted-runner-groups-add-to-enterprise-first-steps %} -1. To choose a policy for organization access, select the **Organization access** drop-down, and click a policy. You can configure a runner group to be accessible to a specific list of organizations, or all organizations in the enterprise.{% ifversion ghes %} By default, only private repositories can access runners in a runner group, but you can override this.{% endif %} +1. Para escolher uma política para o acesso da organização, selecione a lista suspensa **Organização** e clique em uma política. Você pode configurar um grupo de executor para que possa ser acessado por uma lista específica de organizações ou a todas as organizações da empresa.{% ifversion ghes %} Por padrão, apenas repositórios privados podem acessar executores no grupo de um executor, mas você pode substituir isso.{% endif %} {%- ifversion ghec or ghes %} {% warning %} - **Warning**: + **Aviso**: {% indented_data_reference reusables.actions.self-hosted-runner-security spaces=3 %} @@ -131,7 +131,7 @@ Você pode atualizar a política de acesso de um grupo de executores ou renomear {%- ifversion fpt or ghec or ghes %} {% warning %} - **Warning**: + **Aviso**: {% indented_data_reference reusables.actions.self-hosted-runner-security spaces=3 %} @@ -165,7 +165,7 @@ Se você não especificar o grupo de um executor durante o processo de registro, {% data reusables.actions.self-hosted-runner-navigate-to-org-enterprise %} {% ifversion ghec or ghes > 3.3 or ghae-issue-5091 %} 1. Na lista de "Executores", clique no executor que você deseja configurar. -2. Select the **Runner group** drop-down. +2. Selecione o menu suspenso **Grupo do executor**. 3. Em "Transferir executor para o grupo", escolha um grupo de destino para o executor. {% elsif ghae or ghes < 3.4 %} 1. Na seção {% ifversion ghes > 3.1 or ghae %}"Grupos de executores"{% elsif ghes < 3.2 %}"Executores auto-hospedados"{% endif %} da página de configurações, localize o grupo atual do executor que deseja mover e expandir a lista de integrantes do grupo. ![Visualizar integrantes do grupo de executores](/assets/images/help/settings/actions-org-runner-group-members.png) diff --git a/translations/pt-BR/content/actions/learn-github-actions/contexts.md b/translations/pt-BR/content/actions/learn-github-actions/contexts.md index 712fb7299f..11a2f4f6bc 100644 --- a/translations/pt-BR/content/actions/learn-github-actions/contexts.md +++ b/translations/pt-BR/content/actions/learn-github-actions/contexts.md @@ -198,7 +198,7 @@ O contexto `github` context contém informações sobre a execução do fluxo de {%- ifversion fpt or ghec or ghes > 3.5 or ghae-issue-4722 %} | `github.run_attempt` | `string` | Um número exclusivo para cada tentativa de execução de um fluxo de trabalho específico em um repositório. Este número começa em 1 para a primeira tentativa de execução do fluxo de trabalho e aumenta a cada nova execução. | {%- endif %} -| `github.server_url` | `string` | The URL of the GitHub server. Por exemplo: `https://github.com`. | | `github.sha` | `string` | O SHA do commit que acionou a execução do fluxo de trabalho. | | `github.token` | `string` | Um token para efetuar a autenticação em nome do aplicativo instalado no seu repositório. Isso é funcionalmente equivalente ao segredo `GITHUB_TOKEN`. Para obter mais informações, consulte "[Autenticação automática de tokens](/actions/security-guides/automatic-token-authentication)". | | `github.workflow` | `string` | O nome do fluxo de trabalho. Se o fluxo de trabalho não determina um `name` (nome), o valor desta propriedade é o caminho completo do arquivo do fluxo de trabalho no repositório. | | `github.workspace` | `string` | O diretório de trabalho padrão no executor para as etapas e a localidade padrão do seu repositório ao usar a ação [`checkout`](https://github.com/actions/checkout). | +| `github.server_url` | `string` | A URL do servidor do GitHub. Por exemplo: `https://github.com`. | | `github.sha` | `string` | O SHA do commit que acionou a execução do fluxo de trabalho. | | `github.token` | `string` | Um token para efetuar a autenticação em nome do aplicativo instalado no seu repositório. Isso é funcionalmente equivalente ao segredo `GITHUB_TOKEN`. Para obter mais informações, consulte "[Autenticação automática de tokens](/actions/security-guides/automatic-token-authentication)". | | `github.workflow` | `string` | O nome do fluxo de trabalho. Se o fluxo de trabalho não determina um `name` (nome), o valor desta propriedade é o caminho completo do arquivo do fluxo de trabalho no repositório. | | `github.workspace` | `string` | O diretório de trabalho padrão no executor para as etapas e a localidade padrão do seu repositório ao usar a ação [`checkout`](https://github.com/actions/checkout). | ### Exemplo de conteúdo do contexto `github` diff --git a/translations/pt-BR/content/actions/learn-github-actions/expressions.md b/translations/pt-BR/content/actions/learn-github-actions/expressions.md index bd2bef2ac2..1ac6d24797 100644 --- a/translations/pt-BR/content/actions/learn-github-actions/expressions.md +++ b/translations/pt-BR/content/actions/learn-github-actions/expressions.md @@ -252,7 +252,7 @@ jobs: `hashFiles(path)` -Retorna um único hash para o conjunto de arquivos que correspondem ao padrão do `caminho`. Você pode fornecer um único padrão de `caminho` ou vários padrões de `caminho` separados por vírgulas. O `caminho` é relativo ao diretório `GITHUB_WORKSPACE` e pode incluir apenas arquivos dentro do `GITHUB_WORKSPACE`. Essa função calcula uma hash SHA-256 individual para cada arquivo correspondente e, em seguida, usa esses hashes para calcular um hash SHA-256 final para o conjunto de arquivos. If the `path` pattern does not match any files, this returns an empty string. Para obter mais informações sobre o SHA-256, consulte "[SHA-2](https://en.wikipedia.org/wiki/SHA-2)". +Retorna um único hash para o conjunto de arquivos que correspondem ao padrão do `caminho`. Você pode fornecer um único padrão de `caminho` ou vários padrões de `caminho` separados por vírgulas. O `caminho` é relativo ao diretório `GITHUB_WORKSPACE` e pode incluir apenas arquivos dentro do `GITHUB_WORKSPACE`. Essa função calcula uma hash SHA-256 individual para cada arquivo correspondente e, em seguida, usa esses hashes para calcular um hash SHA-256 final para o conjunto de arquivos. Se o padrão `caminho ` não corresponder a nenhum arquivo, ele irá retornar uma string vazia. Para obter mais informações sobre o SHA-256, consulte "[SHA-2](https://en.wikipedia.org/wiki/SHA-2)". Você pode usar a correspondência de padrão de caracteres para corresponder os nomes dos arquivos. No Windows, a correspondência do padrão diferencia maiúsculas e minúsculas. Para obter mais informações sobre caracteres de correspondência de padrões suportados, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/using-workflows/workflow-syntax-for-github-actions/#filter-pattern-cheat-sheet)". diff --git a/translations/pt-BR/content/actions/learn-github-actions/understanding-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/understanding-github-actions.md index e35458bfcf..fb5ca7e63f 100644 --- a/translations/pt-BR/content/actions/learn-github-actions/understanding-github-actions.md +++ b/translations/pt-BR/content/actions/learn-github-actions/understanding-github-actions.md @@ -32,13 +32,13 @@ topics: {% elsif ghes or ghae %} -You must host your own Linux, Windows, or macOS virtual machines to run workflows for {% data variables.product.product_location %}. {% data reusables.actions.self-hosted-runner-locations %} +Você deve hospedar suas próprias máquinas virtuais do Linux, Windows ou macOS para executar fluxos de trabalho para {% data variables.product.product_location %}. {% data reusables.actions.self-hosted-runner-locations %} {% endif %} {% ifversion ghec or ghes or ghae %} -For more information about introducing {% data variables.product.prodname_actions %} to your enterprise, see "[Introducing {% data variables.product.prodname_actions %} to your enterprise](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise)." +Para obter informações mais informações sobre a introdução de {% data variables.product.prodname_actions %} à sua empresa, consulte "[Apresentando {% data variables.product.prodname_actions %} à sua empresa](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise). " {% endif %} @@ -52,7 +52,7 @@ For more information about introducing {% data variables.product.prodname_action Um fluxo de trabalho é um processo automatizado configurável que executa um ou mais trabalhos. Os fluxos de trabalho são definidos por um arquivo YAML verificado no seu repositório e será executado quando acionado por um evento no repositório, ou eles podem ser acionados manualmente ou de acordo com um cronograma definido. -You can have multiple workflows in a repository, each of which can perform a different set of steps. Por exemplo, você pode ter um fluxo de trabalho para criar e testar pull requests, outro fluxo de trabalho para implantar seu aplicativo toda vez que uma versão for criada, e outro fluxo de trabalho que adiciona uma etiqueta toda vez que alguém abre um novo problema. +É possível ter vários fluxos de trabalho em um repositório, cada um dos quais pode executar um conjunto diferente de etapas. Por exemplo, você pode ter um fluxo de trabalho para criar e testar pull requests, outro fluxo de trabalho para implantar seu aplicativo toda vez que uma versão for criada, e outro fluxo de trabalho que adiciona uma etiqueta toda vez que alguém abre um novo problema. {% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %}Você pode consultar um fluxo de trabalho dentro de outro fluxo de trabalho. Consulte "[Reutilizando fluxos de trabalho](/actions/learn-github-actions/reusing-workflows)"{% endif %} @@ -239,7 +239,7 @@ Neste diagrama, você pode ver o arquivo de fluxo de trabalho que acabou de cria ## Visualizando a atividade do fluxo de trabalho -Once your workflow has started running, you can see a visualization graph of the run's progress and view each step's activity on {% data variables.product.prodname_dotcom %}. +Uma vez que seu fluxo de trabalho começou a ser executado, você poderá ver um gráfico de visualização do progresso da execução e ver a atividade de cada etapa em {% data variables.product.prodname_dotcom %}. {% data reusables.repositories.navigate-to-repo %} 1. No nome do seu repositório, clique em **Ações**. ![Acesse o repositório](/assets/images/help/images/learn-github-actions-repository.png) diff --git a/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md b/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md index a096e6ef7c..7f42c80adb 100644 --- a/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md +++ b/translations/pt-BR/content/actions/managing-workflow-runs/removing-workflow-artifacts.md @@ -28,7 +28,7 @@ shortTitle: Remover artefatos de fluxo de trabalho {% data reusables.repositories.actions-tab %} {% data reusables.repositories.navigate-to-workflow %} {% data reusables.repositories.view-run %} -1. Under **Artifacts**, click {% octicon "trash" aria-label="The trash icon" %} next to the artifact you want to remove. +1. Em **Artefatos**, clique em {% octicon "trash" aria-label="The trash icon" %} ao lado do artefato que você deseja remover. ![Menu suspenso para excluir o artefato](/assets/images/help/repository/actions-delete-artifact-updated.png) diff --git a/translations/pt-BR/content/actions/security-guides/encrypted-secrets.md b/translations/pt-BR/content/actions/security-guides/encrypted-secrets.md index 3cb951cdb5..4251ab38ab 100644 --- a/translations/pt-BR/content/actions/security-guides/encrypted-secrets.md +++ b/translations/pt-BR/content/actions/security-guides/encrypted-secrets.md @@ -1,6 +1,6 @@ --- title: Segredos criptografados -intro: 'Encrypted secrets allow you to store sensitive information in your organization{% ifversion fpt or ghes or ghec %}, repository, or repository environments{% else %} or repository{% endif %}.' +intro: 'Segredos criptografados permitem que você armazene informações confidenciais na organização{% ifversion fpt or ghes or ghec %}, repositório ou ambientes de repositórios{% else %} ou repositório{% endif %}.' redirect_from: - /github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets - /actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets @@ -19,7 +19,7 @@ versions: ## Sobre os segredos encriptados -Secrets are encrypted environment variables that you create in an organization, repository, or repository environment. Os segredos que você cria estão disponíveis para utilização nos fluxos de trabalho em {% data variables.product.prodname_actions %}. {% data variables.product.prodname_dotcom %} usa uma [caixa selada libsodium](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes) para ajudar a garantir que os segredos sejam criptografados antes de chegarem a {% data variables.product.prodname_dotcom %} e permaneçam criptografados até que você os use em um fluxo de trabalho. +Os segredos são variáveis de ambiente criptografadas que você cria em uma organização, repositório ou ambiente de repositório. Os segredos que você cria estão disponíveis para utilização nos fluxos de trabalho em {% data variables.product.prodname_actions %}. {% data variables.product.prodname_dotcom %} usa uma [caixa selada libsodium](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes) para ajudar a garantir que os segredos sejam criptografados antes de chegarem a {% data variables.product.prodname_dotcom %} e permaneçam criptografados até que você os use em um fluxo de trabalho. {% data reusables.actions.secrets-org-level-overview %} @@ -39,15 +39,15 @@ Para segredos armazenados no nível do ambiente, você pode habilitar os revisor {% data reusables.codespaces.secrets-naming %} - For example, a secret created at the environment level must have a unique name in that environment, a secret created at the repository level must have a unique name in that repository, and a secret created at the organization level must have a unique name at that level. + Por exemplo, um segredo criado no nível de ambiente deve ter um nome exclusivo nesse ambiente, um segredo criado no nível do repositório deve ter um nome exclusivo nesse repositório, e um segredo criado no nível da organização deve ter um nome exclusivo nesse nível. - {% data reusables.codespaces.secret-precedence %} Similarly, if an organization, repository, and environment all have a secret with the same name, the environment-level secret takes precedence. + {% data reusables.codespaces.secret-precedence %} Da mesma forma, se uma organização, repositório e ambiente tiverem um mesmo nome, o segredo do nível de ambiente terá prioridade. Para ajudar a garantir que {% data variables.product.prodname_dotcom %} remova o seu segredo dos registros, evite usar dados estruturados como valores dos segredos. Por exemplo, evite criar segredos que contêm JSON ou blobs do Git. ### Acessar os seus segredos -Para disponibilizar um segredo para uma ação, você deve configurá-lo como uma entrada ou variável de ambiente no arquivo do fluxo de trabalho. Revise o arquivo README da ação para saber quais entradas e variáveis de ambientes a ação exige. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions/#jobsjob_idstepsenv)." +Para disponibilizar um segredo para uma ação, você deve configurá-lo como uma entrada ou variável de ambiente no arquivo do fluxo de trabalho. Revise o arquivo README da ação para saber quais entradas e variáveis de ambientes a ação exige. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions/#jobsjob_idstepsenv)". Você pode usar e ler segredos encriptados em um arquivo de fluxo de trabalho se tiver permissão para editar o arquivo. Para obter mais informações, consulte "[Permissões de acesso em {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/access-permissions-on-github)." @@ -55,11 +55,11 @@ Você pode usar e ler segredos encriptados em um arquivo de fluxo de trabalho se Os segredos da organização e do repositório são lidos quando uma execução de fluxo de trabalho é enfileirada e os segredos de ambiente são lidos quando um trabalho que faz referência ao ambiente é iniciado. -Você também pode gerenciar segredos usando o API REST. For more information, see "[Secrets](/rest/reference/actions#secrets)." +Você também pode gerenciar segredos usando o API REST. Para obter mais informações, consulte "[Segredos](/rest/reference/actions#secrets)". ### Permissões limitadas de credenciais -Ao gerar credenciais, recomendamos que você conceda as permissões mínimas possíveis. For example, instead of using personal credentials, use [deploy keys](/developers/overview/managing-deploy-keys#deploy-keys) or a service account. Considere conceder permissões somente leitura se isso o necessário e limite o acesso tanto quanto possível. Ao gerar um token de acesso pessoal (PAT), selecione o menor escopo necessário. +Ao gerar credenciais, recomendamos que você conceda as permissões mínimas possíveis. Por exemplo, em vez de usar credenciais pessoais, use [chaves de implantação](/developers/overview/managing-deploy-keys#deploy-keys) ou uma conta de serviço. Considere conceder permissões somente leitura se isso o necessário e limite o acesso tanto quanto possível. Ao gerar um token de acesso pessoal (PAT), selecione o menor escopo necessário. {% note %} @@ -81,7 +81,7 @@ Ao gerar credenciais, recomendamos que você conceda as permissões mínimas pos 1. Insira o valor para o seu segredo. 1. Clique em **Add secret** (Adicionar segredo). -If your repository has environment secrets or can access secrets from the parent organization, then those secrets are also listed on this page. +Se o seu repositório tiver segredos de ambiente ou puder acessar segredos da organização principal, esses segredos também serão listados nesta página. {% endwebui %} @@ -209,7 +209,7 @@ Você pode verificar quais políticas de acesso são aplicadas a um segredo na s {% note %} -**Note:** {% data reusables.actions.forked-secrets %} +**Observação:** {% data reusables.actions.forked-secrets %} {% endnote %} @@ -226,7 +226,7 @@ steps: ``` {% endraw %} -Evite a transmissão de segredos entre processos da linha de comando sempre que possível. Command-line processes may be visible to other users (using the `ps` command) or captured by [security audit events](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). Para ajudar a proteger os segredos, considere o uso de variáveis de ambiente, `STDIN`, ou outros mecanismos compatíveis com o processo de destino. +Evite a transmissão de segredos entre processos da linha de comando sempre que possível. Os processos da linha de comando podem ser visíveis para outros usuários (usando o comando `ps`) ou capturado por [eventos de auditoria de segurança](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). Para ajudar a proteger os segredos, considere o uso de variáveis de ambiente, `STDIN`, ou outros mecanismos compatíveis com o processo de destino. Se você passar segredos dentro de uma linha de comando, inclua-os dentro das regras de aspas corretas. Muitas vezes, os segredos contêm caracteres especiais que não intencionalmente podem afetar o seu shell. Para escapar desses caracteres especiais, use aspas com suas variáveis de ambiente. Por exemplo: @@ -271,19 +271,19 @@ etapas: ## Limites para segredos -You can store up to 1,000 organization secrets, 100 repository secrets, and 100 environment secrets. +Você pode armazenar até 1.000 segredos da organização, 100 segredos de repositório e 100 segredos de ambiente. Um fluxo de trabalho criado em um repositório pode acessar o seguinte número de segredos: * Todos os 100 segredos do repositório. * Se o repositório tiver acesso a mais de 100 segredos da organização, o fluxo de trabalho só poderá usar os primeiros 100 segredos da organização (ordem alfabética por nome de segredo). -* All 100 environment secrets. +* Todos os 100 segredos de ambiente. Os segredos são limitados a 64 kB. Para usar segredos maiores que 64 kB, você pode armazenar segredos criptografados no seu repositório e salvar a frase secreta de descodificação como um segredo no {% data variables.product.prodname_dotcom %}. Por exemplo, você pode usar `gpg` para criptografar suas credenciais localmente antes de colocar o arquivo no repositório do {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte a "[página do manual gpg](https://www.gnupg.org/gph/de/manual/r1023.html)". {% warning %} -**Warning**: Be careful that your secrets do not get printed when your action runs. Quando usar essa alternativa, o {% data variables.product.prodname_dotcom %} não eliminará segredos que estão impressos nos logs. +**Aviso**: Tenha vuidado para seus segredos não serem impressos quando a ação é executada. Quando usar essa alternativa, o {% data variables.product.prodname_dotcom %} não eliminará segredos que estão impressos nos logs. {% endwarning %} diff --git a/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md index 999ffd6a14..c5a0213d87 100644 --- a/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md +++ b/translations/pt-BR/content/actions/security-guides/security-hardening-for-github-actions.md @@ -25,7 +25,7 @@ Este guia explica como configurar o fortalecimento de segurança para certos rec ## Usar segredos -Valores sensíveis nunca devem ser armazenados como texto simples em arquivos de fluxo de trabalho, mas como segredos. [Secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets) can be configured at the organization, repository, or environment level, and allow you to store sensitive information in {% data variables.product.product_name %}. +Valores sensíveis nunca devem ser armazenados como texto simples em arquivos de fluxo de trabalho, mas como segredos. [Segredos](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets) podem ser configurados no nível de organização, repositório ou ambiente e permitir que você armazene informações confidenciais em {% data variables.product.product_name %}. Os segredos usam [caixas fechadas de Libsodium](https://libsodium.gitbook.io/doc/public-key_cryptography/sealed_boxes) de modo que sejam criptografadas antes de atingir {% data variables.product.product_name %}. Isso ocorre quando o segredo é enviado [usando a interface de usuário](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets-for-a-repository) ou através da [API REST](/rest/reference/actions#secrets). Esta criptografia do lado do cliente ajuda a minimizar os riscos relacionados ao registro acidental (por exemplo, registros de exceções e de solicitação, entre outros) dentro da infraestrutura do {% data variables.product.product_name %}. Uma vez realizado o upload do segredo, o {% data variables.product.product_name %} poderá descriptografá-lo para que possa ser injetado no tempo de execução do fluxo de trabalho. @@ -261,9 +261,9 @@ Esta lista descreve as abordagens recomendadas para acessar os dados do reposit Os executores ** hospedados em {% data variables.product.prodname_dotcom %}** executam o código dentro de máquinas virtuais efêmeras e limpas e isoladas. Isso quer isto dizer que não há maneira de comprometer persistentemente este ambiente ou obter, de outra forma, acesso a mais informações do que foram colocadas neste ambiente durante o processo de inicialização. {% endif %} -{% ifversion fpt or ghec %}**Self-hosted**{% elsif ghes or ghae %}Self-hosted{% endif %} runners for {% data variables.product.product_name %} do not have guarantees around running in ephemeral clean virtual machines, and can be persistently compromised by untrusted code in a workflow. +{% ifversion fpt or ghec %}**Auto-hospedados**{% elsif ghes or ghae %}Auto-hospedados{% endif %} executores para {% data variables.product.product_name %} não tem garantias para serem executados em máquinas virtuais efêmeas limpas, e podem ser comprometidos persistentemente por um código não confiável em um fluxo de trabalho. -{% ifversion fpt or ghec %}As a result, self-hosted runners should almost [never be used for public repositories](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) on {% data variables.product.product_name %}, because any user can open pull requests against the repository and compromise the environment. Similarly, be{% elsif ghes or ghae %}Be{% endif %} cautious when using self-hosted runners on private or internal repositories, as anyone who can fork the repository and open a pull request (generally those with read access to the repository) are able to compromise the self-hosted runner environment, including gaining access to secrets and the `GITHUB_TOKEN` which{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, depending on its settings, can grant {% else %} grants {% endif %}write access to the repository. Embora os fluxos de trabalho possam controlar o acesso a segredos de ambiente usando os ambientes e revisões necessários, estes fluxos de trabalho não são executados em um ambiente isolado e continuam sendo susceptíveis aos mesmos riscos quando são executados por um executor auto-hospedado. +{% ifversion fpt or ghec %}Como resultado, os executores auto-hospedados quase [nunca devem ser usados para repositórios públicos](/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories) em {% data variables.product.product_name %}, porque qualquer usuário pode abrir pull requests contra o repositório e comprometer o ambiente. Da mesma forma,{% elsif ghes or ghae %}Tenha{% endif %} cuidado ao usar executores auto-hospedados em repositórios privados ou internos, como qualquer pessoa que puder bifurcar o repositório e abrir um pull request (geralmente aqueles com acesso de leitura ao repositório) são capazes de comprometer o ambiente de runner auto-hospedado. incluindo obter acesso a segredos e o `GITHUB_TOKEN` que{% ifversion fpt or ghes > 3.1 or ghae or ghec %}, dependendo de suas configurações, pode conceder ao {% else %} concede ao repositório {% endif %}acesso de gravação. Embora os fluxos de trabalho possam controlar o acesso a segredos de ambiente usando os ambientes e revisões necessários, estes fluxos de trabalho não são executados em um ambiente isolado e continuam sendo susceptíveis aos mesmos riscos quando são executados por um executor auto-hospedado. Quando um executor auto-hospedado é definido no nível da organização ou empresa, {% data variables.product.product_name %} pode programar fluxos de trabalho de vários repositórios para o mesmo executor. Consequentemente, um compromisso de segurança destes ambientes pode ter um grande impacto. Para ajudar a reduzir o escopo de um compromisso, você pode criar limites organizando seus executores auto-hospedados em grupos separados. Para obter mais informações, consulte "[Gerenciando acesso a runners auto-hospedados usando grupos](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)". @@ -277,12 +277,12 @@ Alguns clientes podem tentar mitigar parcialmente esses riscos implementando sis Um executor auto-hospedado pode ser adicionado aos vários níveis na sua hierarquia de {% data variables.product.prodname_dotcom %}: empresa, organização ou repositório. Este posicionamento determina quem será poderá de gerenciar o executor: -**Centralized management:** +**Gerenciamento centralizado:** - Se você planeja ter uma equipe centralizada que detém os executores auto-hospedados, recomenda-se adicionar seus executores ao nível mais alto da organização mútua ou da empresa. Isto fornece à sua equipe um único local para visualizar e gerenciar seus executores. - Se você tiver apenas uma única organização, adicionar seus executores ao nível da organização é, de fato, a mesma abordagem, mas você pode encontrar dificuldades se você adicionar outra organização no futuro. -**Decentralized management:** - - If each team will manage their own self-hosted runners, then the recommendation is to add the runners at the highest level of team ownership. Por exemplo, se cada equipe possui sua própria organização, será mais simples se os executores também forem adicionados ao nível da organização. +**Gerenciamento descentralizado:** + - Se cada equipe gerenciar seus próprios corredores hospedados, a recomendação será adicionar os executores ao mais alto nível de propriedade da equipe. Por exemplo, se cada equipe possui sua própria organização, será mais simples se os executores também forem adicionados ao nível da organização. - Você também pode adicionar executores no nível de repositório, mas isso adicionará uma sobrecarga de gerenciamento e também aumentará o número de executores necessários já que você não pode compartilhar executores entre repositórios. {% ifversion fpt or ghec or ghae-issue-4856 %} diff --git a/translations/pt-BR/content/actions/using-workflows/events-that-trigger-workflows.md b/translations/pt-BR/content/actions/using-workflows/events-that-trigger-workflows.md index f24fd8fed2..32277b7441 100644 --- a/translations/pt-BR/content/actions/using-workflows/events-that-trigger-workflows.md +++ b/translations/pt-BR/content/actions/using-workflows/events-that-trigger-workflows.md @@ -624,7 +624,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a pull request that includes a change to a JavaScript (`.js`) file is opened on a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um pull request que inclui uma mudança para um arquivo (`.js`) do JavaScript for aberto em um branch cujo nome começa com `releases/`: ```yaml on: @@ -669,7 +669,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a pull request that includes a change to a JavaScript (`.js`) file is opened on a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um pull request que inclui uma mudança para um arquivo (`.js`) do JavaScript for aberto em um branch cujo nome começa com `releases/`: ```yaml on: @@ -684,9 +684,9 @@ on: {% endnote %} -#### Running your workflow when a pull request merges +#### Executando o fluxo de trabalho quando um executado um merge de pull request -When a pull request merges, the pull request is automatically closed. To run a workflow when a pull request merges, use the `pull_request` `closed` event type along with a conditional that checks the `merged` value of the event. For example, the following workflow will run whenever a pull request closes. The `if_merged` job will only run if the pull request was also merged. +Quando um pull request faz merge, o pull request é automaticamente fechado. Para executar um fluxo de trabalho quando um pull request é mesclado, use o tipo de evento `pull_request` `fechado` junto com uma condição que verifica o valor de `merged` do evento. Por exemplo, o fluxo de trabalho a seguir será executado sempre que um pull request for fechado. O trabalho `if_merged` só será executado se o pull request também tiver sido mesclado. ```yaml on: @@ -827,7 +827,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a pull request that includes a change to a JavaScript (`.js`) file is opened on a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um pull request que inclui uma mudança para um arquivo (`.js`) do JavaScript for aberto em um branch cujo nome começa com `releases/`: ```yaml on: @@ -872,7 +872,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a pull request that includes a change to a JavaScript (`.js`) file is opened on a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um pull request que inclui uma mudança para um arquivo (`.js`) do JavaScript for aberto em um branch cujo nome começa com `releases/`: ```yaml on: @@ -887,9 +887,9 @@ on: {% endnote %} -#### Running your workflow when a pull request merges +#### Executando o fluxo de trabalho quando um executado um merge de pull request -When a pull request merges, the pull request is automatically closed. To run a workflow when a pull request merges, use the `pull_request_target` `closed` event type along with a conditional that checks the `merged` value of the event. For example, the following workflow will run whenever a pull request closes. The `if_merged` job will only run if the pull request was also merged. +Quando um pull request faz merge, o pull request é automaticamente fechado. Para executar um fluxo de trabalho quando um pull request é mesclado, use o tipo de evento `pull_request_target` `fechado` junto com uma condição que verifica o valor de `merged` do evento. Por exemplo, o fluxo de trabalho a seguir será executado sempre que um pull request for fechado. O trabalho `if_merged` só será executado se o pull request também tiver sido mesclado. ```yaml on: @@ -949,7 +949,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a push that includes a change to a JavaScript (`.js`) file is made to a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um push que inclui uma mudança para um arquivo (`.js`) do JavaScript é feito em um branch cujo nome começa com `releases/`: ```yaml on: @@ -990,7 +990,7 @@ on: {% note %} -**Note:** {% data reusables.actions.branch-paths-filter %} For example, the following workflow will only run when a push that includes a change to a JavaScript (`.js`) file is made to a branch whose name starts with `releases/`: +**Observação:** {% data reusables.actions.branch-paths-filter %} Por exemplo, o fluxo de trabalho a seguir será executado somente quando um push que inclui uma mudança para um arquivo (`.js`) do JavaScript é feito em um branch cujo nome começa com `releases/`: ```yaml on: diff --git a/translations/pt-BR/content/actions/using-workflows/triggering-a-workflow.md b/translations/pt-BR/content/actions/using-workflows/triggering-a-workflow.md index 6cc4d4614c..ad4a7c04fe 100644 --- a/translations/pt-BR/content/actions/using-workflows/triggering-a-workflow.md +++ b/translations/pt-BR/content/actions/using-workflows/triggering-a-workflow.md @@ -41,7 +41,7 @@ As etapas a seguir ocorrem para acionar a execução de um fluxo de trabalho: ### Acionando um fluxo de trabalho a partir de um fluxo de trabalho -{% data reusables.actions.actions-do-not-trigger-workflows %} For more information, see "[Authenticating with the GITHUB_TOKEN](/actions/configuring-and-managing-workflows/authenticating-with-the-github_token)." +{% data reusables.actions.actions-do-not-trigger-workflows %} Para obter mais informações, consulte "[Efetuando a autenticação com o GITHUB_TOKEN](/actions/configuring-and-managing-workflows/authenticating-with-the-github_token)". Se você deseja acionar um fluxo de trabalho de dentro de uma execução de fluxo de trabalho, você pode usar um token de acesso pessoal em vez de `GITHUB_TOKEN` para acionar eventos que exigem um token. Você deverá criar um token de acesso pessoal e armazená-lo como um segredo. Para minimizar seus custos de uso {% data variables.product.prodname_actions %}, certifique-se de que você não cria execução de fluxo de trabalho recursivo ou não intencional. Para obter mais informações sobre a criação de um token de acesso pessoal, consulte[Criando um token de acesso pessoal](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)." Para mais informações sobre como armazenar um token de acesso pessoal como segredo, consulte "[Criar e armazenar segredos criptografados](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)". @@ -87,15 +87,15 @@ jobs: Use a chave `on` para especificar quais eventos acionam o seu fluxo de trabalho. Para obter mais informações sobre eventos que você pode usar, consulte "[Eventos que acionam fluxos de trabalho](/actions/using-workflows/events-that-trigger-workflows)." -### Using a single event +### Usando um evento único {% data reusables.actions.on-single-example %} -### Using multiple events +### Usando eventos múltiplos {% data reusables.actions.on-multiple-example %} -### Using activity types and filters with multiple events +### Usando tipos de atividade e filtros com vários eventos É possível usar tipos de atividade e filtros para controlar ainda mais quando o fluxo de trabalho será executado. Para obter mais informações, consulte [Usando tipos de atividade do evento](#using-event-activity-types) e [Usando filtros](#using-filters). {% data reusables.actions.actions-multiple-types %} @@ -103,7 +103,7 @@ Use a chave `on` para especificar quais eventos acionam o seu fluxo de trabalho. {% data reusables.actions.actions-activity-types %} -## Using filters +## Usando filtros {% data reusables.actions.actions-filters %} @@ -197,7 +197,7 @@ Se você quiser mais controle granular do que os eventos, tipos de atividade do Você pode usar condicionais para controlar ainda mais se os trabalhos ou etapas no seu fluxo de trabalho serão executados. -#### Example using a value in the event payload +#### Exemplo de uso de um valor na carga do evento Se você quiser, por exemplo, que o fluxo de trabalho seja executado quando uma etiqueta específica for adicionada a um problema, você poderá acionar o tipo de atividade do evento `issues labeled` e usar uma condicional para verificar qual etiqueta acionou o fluxo de trabalho. O fluxo de trabalho a seguir será executado quando qualquer etiqueta for adicionada a um problema no repositório do fluxo de trabalho, mas a o trabalho `run_if_label_matches` só será executado se a etiqueta tiver o nome de `bug`. @@ -215,9 +215,9 @@ jobs: - run: echo 'The label was bug' ``` -#### Example using event type +#### Exemplo de uso do tipo de evento -For example, if you want to run different jobs or steps depending on what event triggered the workflow, you can use a conditional to check whether a specific event type exists in the event context. The following workflow will run whenever an issue or pull request is closed. If the workflow ran because an issue was closed, the `github.event` context will contain a value for `issue` but not for `pull_request`. Therefore, the `if_issue` step will run but the `if_pr` step will not run. Conversely, if the workflow ran because a pull request was closed, the `if_pr` step will run but the `if_issue` step will not run. +Por exemplo, se você deseja executar diferentes tarefas ou etapas, dependendo de qual evento acionou o fluxo de trabalho, você poderá usar uma condicional para verificar se um tipo de evento específico existe no contexto do evento. O fluxo de trabalho seguinte será executado sempre que um problema ou pull request for fechado. Se o fluxo de trabalho foi executado porque um problema foi fechado, o `github.event` conterá um valor para `problema` mas não para `pull_request`. Portanto, a etapa `if_issue` será executada mas oa etapa `if_pr` não será executada. Por outro lado, se o fluxo de trabalho foi executado porque um pull request foi fechado, a etapa `if_pr` será executada mas a etapa `if_issue` não será executada. ```yaml on: @@ -242,7 +242,7 @@ jobs: echo A pull request was closed ``` -For more information about what information is available in the event context, see "[Using event information](#using-event-information)." For more information about how to use conditionals, see "[Expressions](/actions/learn-github-actions/expressions)." +Para obter mais informações sobre quais informações estão disponíveis no contexto do evento, consulte "[Usando informações do evento](#using-event-information)". Para obter mais informações sobre como usar condicionais, consulte "[Expressões](/actions/learn-github-actions/expressions)". {% ifversion fpt or ghae or ghes > 3.1 or ghec %} diff --git a/translations/pt-BR/content/actions/using-workflows/workflow-syntax-for-github-actions.md b/translations/pt-BR/content/actions/using-workflows/workflow-syntax-for-github-actions.md index 383077d29b..c1bdf25d87 100644 --- a/translations/pt-BR/content/actions/using-workflows/workflow-syntax-for-github-actions.md +++ b/translations/pt-BR/content/actions/using-workflows/workflow-syntax-for-github-actions.md @@ -185,7 +185,7 @@ Um booleano que especifica se o segredo deve ser fornecido. Um `mapa` das variáveis de ambiente que estão disponíveis para as etapas de todos os trabalhos do fluxo de trabalho. Também é possível definir variáveis de ambiente que estão disponíveis apenas para as etapas de um único trabalho ou para uma única etapa. Para obter mais informações, consulte [`jobs..env`](#jobsjob_idenv) e [`jobs..steps[*].env`](#jobsjob_idstepsenv). -Variables in the `env` map cannot be defined in terms of other variables in the map. +As variáveis no mapa `env` não podem ser definidas em termos de outras variáveis no mapa. {% data reusables.repositories.actions-env-var-note %} diff --git a/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md b/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md index 5fd946ea33..b2493ae528 100644 --- a/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md +++ b/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md @@ -34,7 +34,7 @@ Você pode configurar {% data variables.product.prodname_code_scanning %} para e ## Pré-requisitos para {% data variables.product.prodname_code_scanning %} -- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} +- Uma licença para {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (consulte "[Sobre cobrança para {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} - {% data variables.product.prodname_code_scanning_capc %} habilitado no console de gerenciamento (consulte "[Habilitando {% data variables.product.prodname_GH_advanced_security %} para a sua empresa](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)") diff --git a/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md b/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md index 687900ef56..8ca2c921cf 100644 --- a/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md +++ b/translations/pt-BR/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md @@ -31,7 +31,7 @@ Se alguém verificar um segredo com um padrão conhecido em um repositório, {% - É necessário habilitar o sinalizador de CPU das [SSSE3](https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf#G3.1106470) (Extensões SIMD de Streaming Suplementar 3) no VM/KVM que executa {% data variables.product.product_location %}. -- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} +- Uma licença para {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (consulte "[Sobre cobrança para {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} - {% data variables.product.prodname_secret_scanning_caps %} habilitado no console de gerenciamento (consulte "[Habilitando {% data variables.product.prodname_GH_advanced_security %} para a sua empresa](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)") diff --git a/translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md b/translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md index c81bf7b862..121e2b4a7b 100644 --- a/translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md +++ b/translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md @@ -1,7 +1,7 @@ --- -title: Managing GitHub Connect -shortTitle: Manage GitHub Connect -intro: 'You can enable {% data variables.product.prodname_github_connect %} to access additional features and workflows for {% data variables.product.product_location %}.' +title: Gerenciando o GitHub Connect +shortTitle: Gerenciar o GitHub Connect +intro: 'Você pode habilitar {% data variables.product.prodname_github_connect %} para acessar funcionalidades adicionais e fluxos de trabalho para {% data variables.product.product_location %}.' redirect_from: - /enterprise/admin/guides/developer-workflow/connecting-github-enterprise-to-github-com - /enterprise/admin/guides/developer-workflow/connecting-github-enterprise-server-to-github-com @@ -24,63 +24,62 @@ topics: {% data reusables.github-connect.beta %} -## About {% data variables.product.prodname_github_connect %} +## Sobre o {% data variables.product.prodname_github_connect %} -You can access additional features and workflows on {% data variables.product.product_location %} by enabling {% data variables.product.prodname_github_connect %}. For more information, see "[About {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/about-github-connect)." +Você pode acessar funcionalidades e fluxos de trabalho adicionais em {% data variables.product.product_location %}, habilitando o {% data variables.product.prodname_github_connect %}. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/about-github-connect)." -When you enable {% data variables.product.prodname_github_connect %}, you configure a connection between {% data variables.product.product_location %} and an organization or enterprise account on {% data variables.product.prodname_ghe_cloud %}. Enabling {% data variables.product.prodname_github_connect %} creates a {% data variables.product.prodname_github_app %} owned by the organization or enterprise account on {% data variables.product.prodname_ghe_cloud %}. {% data variables.product.product_name %} uses the {% data variables.product.prodname_github_app %}'s credentials to make requests to {% data variables.product.prodname_ghe_cloud %}. +Ao habilitar {% data variables.product.prodname_github_connect %}, você configura uma conexão entre {% data variables.product.product_location %} e uma conta de organização ou empresa em {% data variables.product.prodname_ghe_cloud %}. A habilitação de {% data variables.product.prodname_github_connect %} cria um {% data variables.product.prodname_github_app %} pertencente à organização ou conta corporativa em {% data variables.product.prodname_ghe_cloud %}. O {% data variables.product.product_name %} usa as credenciais do {% data variables.product.prodname_github_app %} para fazer solicitações ao {% data variables.product.prodname_ghe_cloud %}. {% ifversion ghes %} -{% data variables.product.prodname_ghe_server %} stores credentials from the {% data variables.product.prodname_github_app %}. The following credentials will be replicated to all nodes in a high availability or cluster environment, and stored in any backups, including snapshots created by {% data variables.product.prodname_enterprise_backup_utilities %}. -- An authentication token, which is valid for one hour -- A private key, which is used to generate a new authentication token +O {% data variables.product.prodname_ghe_server %} armazena as credenciais do {% data variables.product.prodname_github_app %}. As credenciais a seguir serão replicadas em todos os nós em um ambiente de alta disponibilidade ou de agrupamento e armazenadas em qualquer backup, incluindo instantâneos criados por {% data variables.product.prodname_enterprise_backup_utilities %}. +- Um token de autenticação válido por uma hora; +- Uma chave privada usada para gerar um novo token de autenticação. {% endif %} -## Prerequisites +## Pré-requisitos -To use {% data variables.product.prodname_github_connect %}, you must have an organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that uses {% data variables.product.prodname_ghe_cloud %}. You may already have {% data variables.product.prodname_ghe_cloud %} included in your plan. {% data reusables.enterprise.link-to-ghec-trial %} +Para usar {% data variables.product.prodname_github_connect %}, você deve ter uma conta corporativa em {% data variables.product.prodname_dotcom_the_website %} que use {% data variables.product.prodname_ghe_cloud %}. Você pode já ter {% data variables.product.prodname_ghe_cloud %} incluído no seu plano. {% data reusables.enterprise.link-to-ghec-trial %} {% ifversion ghes %} -To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. For more information, see "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)." +If your organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} uses IP allow lists, you must add the IP address or network for {% data variables.product.product_location %} to your IP allow list on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Managing allowed IP addresses for your organization](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)" and "[Enforcing policies for security settings in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation. + +Para configurar a conexão, a configuração de proxy deverá permitir conectividade em `github.com`, `api.github.com` e `uploads.github.com`. For more information, see "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)." {% endif %} -## Enabling {% data variables.product.prodname_github_connect %} +## Habilitar o {% data variables.product.prodname_github_connect %} -Enterprise owners who are also owners of an organization or enterprise account that uses {% data variables.product.prodname_ghe_cloud %} can enable {% data variables.product.prodname_github_connect %}. +Os proprietários corporativos que também são proprietários da conta de uma organização ou empresa que usa {% data variables.product.prodname_ghe_cloud %} podem habilitar {% data variables.product.prodname_github_connect %}. -If you're connecting {% data variables.product.product_location %} to an organization on {% data variables.product.prodname_ghe_cloud %} that is not owned by an enterprise account, you must sign into {% data variables.product.prodname_dotcom_the_website %} as an organization owner. +Se você estiver conectando {% data variables.product.product_location %} a uma organização em {% data variables.product.prodname_ghe_cloud %} que não seja propriedade de uma conta corporativa você deveverá efetuar o login em {% data variables.product.prodname_dotcom_the_website %} como proprietário da organização. -If you're connecting {% data variables.product.product_location %} to an organization on {% data variables.product.prodname_ghe_cloud %} that is owned by an enterprise account or to an enterprise account itself, you must sign into {% data variables.product.prodname_dotcom_the_website %} as an enterprise owner. +Se você estiver conectando {% data variables.product.product_location %} a uma organização em {% data variables.product.prodname_ghe_cloud %} que pertence a uma conta corporativa ou a uma própria conta corporativa, você deveverá efetuar o login em {% data variables.product.prodname_dotcom_the_website %} como proprietário de uma empresa. {% ifversion ghes %} -1. Sign in to {% data variables.product.product_location %} and {% data variables.product.prodname_dotcom_the_website %}. +1. Entre na {% data variables.product.product_location %} e no {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.github-connect-tab %}{% else %} -1. Sign in to {% data variables.product.product_location %} and {% data variables.product.prodname_dotcom_the_website %}. +1. Entre na {% data variables.product.product_location %} e no {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.access-enterprise %}{% data reusables.enterprise-accounts.github-connect-tab %}{% endif %} -1. Under "{% data variables.product.prodname_github_connect %} is not enabled yet", click **Enable {% data variables.product.prodname_github_connect %}**. By clicking **Enable {% data variables.product.prodname_github_connect %}**, you agree to the "{% data variables.product.prodname_dotcom %} Terms for Additional Products and Features." +1. Em "{% data variables.product.prodname_github_connect %} ainda não está habilitado", clique em **Habilitar {% data variables.product.prodname_github_connect %}**. Ao clicar em **Habilitar {% data variables.product.prodname_github_connect %}**, você concorda com os "Termos para Produtos e Funcionalidades adicionais de {% data variables.product.prodname_dotcom %}.". {% ifversion ghes %} - ![Enable GitHub Connect button](/assets/images/enterprise/business-accounts/enable-github-connect-button.png){% else %} - ![Enable GitHub Connect button](/assets/images/enterprise/github-ae/enable-github-connect-button.png) +![Enable GitHub Connect button](/assets/images/enterprise/business-accounts/enable-github-connect-button.png){% else %} +![Enable GitHub Connect button](/assets/images/enterprise/github-ae/enable-github-connect-button.png) {% endif %} -1. Next to the enterprise account or organization you'd like to connect, click **Connect**. - ![Connect button next to an enterprise account or business](/assets/images/enterprise/business-accounts/choose-enterprise-or-org-connect.png) +1. Ao lado da conta corporativa ou organização que você pretende conectar, clique em **Connect** (Conectar). ![Botão Connect (Conectar) ao lado de uma conta corporativa ou empresa](/assets/images/enterprise/business-accounts/choose-enterprise-or-org-connect.png) -## Disabling {% data variables.product.prodname_github_connect %} +## Desabilitar {% data variables.product.prodname_github_connect %} -Enterprise owners can disable {% data variables.product.prodname_github_connect %}. +Os proprietários das empresas podem desabilitar {% data variables.product.prodname_github_connect %}. When you disconnect from {% data variables.product.prodname_ghe_cloud %}, the {% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} is deleted from your enterprise account or organization and credentials stored on {% data variables.product.product_location %} are deleted. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.github-connect-tab %} -1. Next to the enterprise account or organization you'd like to disconnect, click **Disable {% data variables.product.prodname_github_connect %}**. +1. Ao lado da conta corporativa ou organização que você deseja desconectar, clique em **Desabilitar {% data variables.product.prodname_github_connect %}**. {% ifversion ghes %} - ![Disable GitHub Connect button next to an enterprise account or organization name](/assets/images/enterprise/business-accounts/disable-github-connect-button.png) -1. Read the information about disconnecting and click **Disable {% data variables.product.prodname_github_connect %}**. - ![Modal with warning information about disconnecting and confirmation button](/assets/images/enterprise/business-accounts/confirm-disable-github-connect.png) + ![Desabilitar o botão GitHub Connect ao lado do nome de uma conta corporativa ou organização](/assets/images/enterprise/business-accounts/disable-github-connect-button.png) +1. Leia as informações sobre desconexão e clique em **Desabilitar {% data variables.product.prodname_github_connect %}**. ![Botão Modal com informações de aviso sobre desconexão e confirmação](/assets/images/enterprise/business-accounts/confirm-disable-github-connect.png) {% else %} - ![Disable GitHub Connect button next to an enterprise account or organization name](/assets/images/enterprise/github-ae/disable-github-connect-button.png) -1. Read the information about disconnecting and click **Disable {% data variables.product.prodname_github_connect %}**. - ![Modal with warning information about disconnecting and confirmation button](/assets/images/enterprise/github-ae/confirm-disable-github-connect.png) + ![Desabilitar o botão GitHub Connect ao lado do nome de uma conta corporativa ou organização](/assets/images/enterprise/github-ae/disable-github-connect-button.png) +1. Leia as informações sobre desconexão e clique em **Desabilitar {% data variables.product.prodname_github_connect %}**. ![Botão Modal com informações de aviso sobre desconexão e confirmação](/assets/images/enterprise/github-ae/confirm-disable-github-connect.png) {% endif %} diff --git a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md index 95ed0742a1..9e763f278f 100644 --- a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md +++ b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md @@ -39,21 +39,21 @@ Você pode criar suas próprias automações exclusivas ou você pode usar e ada {% ifversion ghec %}Você pode desfrutar da conveniência de executores hospedados em {% data variables.product.company_short %}, que são mantidos e atualizados por {% data variables.product.company_short %} ou você{% else %}{% endif %} pode controlar a sua própria infraestrutura privada de CI/CD usando executores auto-hospedados. Os executores auto-hospedados permitem que você determine o ambiente exato e os recursos que completam suas compilações, testes e implantações sem expor o seu ciclo de desenvolvimento de software à internet. Para obter mais informações, consulte {% ifversion ghec %}"[Sobre executores auto-hospedados em {% data variables.product.company_short %}](/actions/using-github-hosted-runners/about-github-hosted-runners)" e {% endif %} "[Sobre executores auto-hospedados](/actions/hosting-your-own-runners/about-self-hosted-runners)." -{% data variables.product.prodname_actions %} provides greater control over deployments. Por exemplo, você pode usar ambientes para exigir aprovação para um trabalho prosseguir ou restringir quais branches podem acionar um fluxo de trabalho, ou limitar o acesso a segredos.{% ifversion ghec or ghae-issue-4856 %} Se os seus fluxos de trabalho precisarem acessar recursos de um provedor de nuvem compatível com o OpenID Connect (OIDC), você poderá configurar seus fluxos de trabalho para efetuar a autenticação diretamente no provedor de nuvem. OIDC provides security benefits such as eliminating the need to store credentials as long-lived secrets. Para obter mais informações, consulte[Sobre segurança fortalecida com OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."{% endif %} +{% data variables.product.prodname_actions %} fornece maior controle sobre implantações. Por exemplo, você pode usar ambientes para exigir aprovação para um trabalho prosseguir ou restringir quais branches podem acionar um fluxo de trabalho, ou limitar o acesso a segredos.{% ifversion ghec or ghae-issue-4856 %} Se os seus fluxos de trabalho precisarem acessar recursos de um provedor de nuvem compatível com o OpenID Connect (OIDC), você poderá configurar seus fluxos de trabalho para efetuar a autenticação diretamente no provedor de nuvem. OIDC fornece benefícios de segurança, como eliminar a necessidade de armazenar credenciais como segredos de longa duração. Para obter mais informações, consulte[Sobre segurança fortalecida com OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."{% endif %} {% data variables.product.prodname_actions %} também inclui ferramentas para governar o ciclo de desenvolvimento de software da sua empresa e atender às obrigações de conformidade. Para obter mais informações, consulte "[Aplicar políticas para {% data variables.product.prodname_actions %} na sua empresa](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise)". -## About getting started with {% data variables.product.prodname_actions %} +## Sobre como dar os primeiros passos com {% data variables.product.prodname_actions %} {% data reusables.actions.introducing-enterprise %} {% data reusables.actions.migrating-enterprise %} {% ifversion ghes %} -{% data reusables.actions.ghes-actions-not-enabled-by-default %} After you finish planning, you can follow the instructions for enabling {% data variables.product.prodname_actions %}. For example, you may need to upgrade the CPU and memory resources for {% data variables.product.product_location %}. Para obter mais informações, consulte "[Primeiros passos com {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server)". +{% data reusables.actions.ghes-actions-not-enabled-by-default %} Depois de terminar o planejamento, você pode seguir as instruções para habilitar {% data variables.product.prodname_actions %}. Por exemplo, talvez você precise atualizar os recursos de CPU e memória para {% data variables.product.product_location %}. Para obter mais informações, consulte "[Primeiros passos com {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server)". {% else %} -After you finish planning, you can follow the instructions for getting started with {% data variables.product.prodname_actions %}. For more information, see {% ifversion ghec %}"[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_cloud %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-cloud)."{% elsif ghae %}"[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_managed %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae)."{% endif %} +Após terminar o planejamento, você pode seguir as instruções para dar os primeiros passos com {% data variables.product.prodname_actions %}. Para obter mais informações, consulte {% ifversion ghec %}"[Primeiros passos com {% data variables.product.prodname_actions %} para {% data variables.product.prodname_ghe_cloud %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-cloud).{% elsif ghae %}"[Primeiros passos com {% data variables.product.prodname_actions %} para {% data variables.product.prodname_ghe_managed %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae)."{% endif %} {% endif %} diff --git a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae.md b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae.md index e1ee8b68b8..68f4620813 100644 --- a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae.md +++ b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae.md @@ -29,6 +29,6 @@ Você pode usar políticas para gerenciar o acesso a {% data variables.product.p ## Adicionar executores -You must configure and host your own machines to run jobs for your enterprise on {% data variables.product.product_name %}. {% data reusables.actions.about-self-hosted-runners %} For more information, see "[Getting started with self-hosted runners for your enterprise](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise)" and "[Hosting your own runners](/actions/hosting-your-own-runners)." +Você deve configurar e hospedar suas próprias máquinas para executar trabalhos para sua empresa em {% data variables.product.product_name %}. {% data reusables.actions.about-self-hosted-runners %} Para obter mais informações, consulte "[Primeiros passos com executores auto-hospedados para a sua empresa](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise)" e "[Hospedando seus próprios executores](/actions/hosting-your-own-runners)." {% data reusables.actions.general-security-hardening %} diff --git a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md index 81c0ccaddc..f8bbbb7922 100644 --- a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md +++ b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md @@ -26,7 +26,7 @@ Este artigo explica como os administradores do site podem configurar {% data var {% data reusables.enterprise.upgrade-ghes-for-actions %} -{% data reusables.actions.ghes-actions-not-enabled-by-default %} You'll need to determine whether your instance has adequate CPU and memory resources to handle the load from {% data variables.product.prodname_actions %} without causing performance loss, and possibly increase those resources. Você também deverá decidir qual provedor de armazenamento você usará para o armazenamento do blob necessário para armazenar os artefatos gerados pela execução do fluxo de trabalho. Em seguida, você irá habilitar {% data variables.product.prodname_actions %} para a sua empresa, gerenciar permissões de acesso e adicionar executores auto-hospedados para executar fluxos de trabalho. +{% data reusables.actions.ghes-actions-not-enabled-by-default %} Você deberá determinar se a sua instância possui recursos adequados de CPU e memória para lidar com a carga do {% data variables.product.prodname_actions %} sem causar perda de desempenho e possivelmente aumentar esses recursos. Você também deverá decidir qual provedor de armazenamento você usará para o armazenamento do blob necessário para armazenar os artefatos gerados pela execução do fluxo de trabalho. Em seguida, você irá habilitar {% data variables.product.prodname_actions %} para a sua empresa, gerenciar permissões de acesso e adicionar executores auto-hospedados para executar fluxos de trabalho. {% data reusables.actions.introducing-enterprise %} @@ -149,6 +149,6 @@ Para obter mais informações, consulte "[Sobre o uso de ações na sua empresa] {% endif %} -## Reserved names +## Nomes reservados Ao habilitar {% data variables.product.prodname_actions %} para a sua empresa, serão criadas duas organizações: `github` e `actions`. Se sua empresa já usa o nome da organização `github`, `github-org` (ou `github-github-org` se `github-org` também estiver em uso) será usado. Se sua empresa já usa o nome da organização `actions`, `github-actions` (ou `github-actions-org` se `github-actions` também estiver em uso) será usado. Uma vez que as ações são habilitadas, você não poderá usar mais esses nomes. diff --git a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md index ec84b4382d..3d75c55c47 100644 --- a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md +++ b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md @@ -1,7 +1,7 @@ --- -title: Getting started with self-hosted runners for your enterprise +title: Primeiros passos vom executores auto-hospedados da sua empresa shortTitle: Executores auto-hospedados -intro: 'You can configure a runner machine for your enterprise so your developers can start automating workflows with {% data variables.product.prodname_actions %}.' +intro: 'Você pode configurar a máquina de um exeucutor para sua empresa para que seus desenvolvedores possam começar a automatizar fluxos de trabalho com {% data variables.product.prodname_actions %}.' versions: ghec: '*' ghes: '*' @@ -16,47 +16,47 @@ topics: ## Sobre executores auto-hospedados para {% data variables.product.prodname_actions %} -{% data reusables.actions.about-actions-for-enterprises %} For more information, see "[About {% data variables.product.prodname_actions %} for enterprises](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises)." +{% data reusables.actions.about-actions-for-enterprises %} Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_actions %} para empresas](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises). -With {% data variables.product.prodname_actions %}, developers can write and combine individual tasks called actions to create custom workflows. {% ifversion ghes or ghae %}To enable {% data variables.product.prodname_actions %} for {% ifversion ghae %}your enterprise{% elsif ghes %} {% data variables.product.product_location %}{% endif %}, you must host at least one machine to execute jobs.{% endif %} {% ifversion ghec %}You can host your own runner machine to execute jobs, and this{% elsif ghes or ghae %}This{% endif %} machine is called a self-hosted runner. {% data reusables.actions.self-hosted-runner-locations %} {% data reusables.actions.self-hosted-runner-architecture %} {% ifversion ghec %}All{% elsif ghes or ghae %}Self-hosted{% endif %} runners can run Linux, Windows, or macOS. Para obter mais informações, consulte "[Sobre os executores auto-hospedados](/actions/hosting-your-own-runners/about-self-hosted-runners)." +Com {% data variables.product.prodname_actions %}, os desenvolvedores podem escrever e combinar tarefas individuais denominadas ações para criar fluxos de trabalho personalizados. {% ifversion ghes or ghae %}Para habilitar {% data variables.product.prodname_actions %} para {% ifversion ghae %}sua empresa{% elsif ghes %} {% data variables.product.product_location %}{% endif %}, você deverá hospedar pelo menos uma máquina para executar trabalhos.{% endif %} {% ifversion ghec %}Você pode hospedar sua própria máquina de executores para executar esses trabalhos e essa{% elsif ghes or ghae %}Esta{% endif %} máquina é denominada um executor auto-hospedado. {% data reusables.actions.self-hosted-runner-locations %} {% data reusables.actions.self-hosted-runner-architecture %} {% ifversion ghec %}Todos{% elsif ghes or ghae %}Os executores auto-hospedados{% endif %} podem ser executados no Linux, Windows ou macOS. Para obter mais informações, consulte "[Sobre os executores auto-hospedados](/actions/hosting-your-own-runners/about-self-hosted-runners)." {% ifversion ghec %} -Alternatively, you can use runner machines that {% data variables.product.company_short %} hosts. {% data variables.product.company_short %}-hosted runners are outside the scope of this guide. Para obter mais informações, consulte "[Sobre executores hospedados em {% data variables.product.company_short %}](/actions/using-github-hosted-runners/about-github-hosted-runners)". +Como alternativa, você pode usar máquinas de executores que {% data variables.product.company_short %} hospeda. Os executores hospedados em {% data variables.product.company_short %} estão fora do escopo deste guia. Para obter mais informações, consulte "[Sobre executores hospedados em {% data variables.product.company_short %}](/actions/using-github-hosted-runners/about-github-hosted-runners)". {% endif %} -This guide shows you how to apply a centralized management approach to self-hosted runners for {% data variables.product.prodname_actions %} in your enterprise. In the guide, you'll complete the following tasks. +Este guia mostra como aplicar uma abordagem de gerenciamento centralizada para os executores auto-hospedados para {% data variables.product.prodname_actions %} na sua empresa. No guia, você realizará as seguintes tarefas. -1. Configure a limited policy to restrict the actions that can run within your enterprise -1. Deploy a self-hosted runner for your enterprise -1. Create a group to manage access to the runners available to your enterprise -1. Optionally, further restrict the repositories that can use the runner +1. Configurar uma política limitada para restringir as ações que podem ser executadas dentro da sua empresa +1. Implantar um executor auto-hospedado para a sua empresa +1. Criar um grupo para gerenciar o acesso aos executores disponíveis para sua empresa +1. Opcionalmente, restringir ainda mais os repositórios que podem usar o executor {%- ifversion ghec or ghae-issue-4462 or ghes > 3.2 %} -1. Optionally, build custom tooling to automatically scale your self-hosted runners +1. Opcionalmente, crie ferramentas personalizadas para dimensionar automaticamente seus executores auto-hospedados {% endif %} -You'll also find additional information about how to monitor and secure your self-hosted runners,{% ifversion ghes or ghae %} how to access actions from {% data variables.product.prodname_dotcom_the_website %},{% endif %} and how to customize the software on your runner machines. +Você também encontrará informações adicionais sobre como monitorar e proteger seus executores auto-hospedados,{% ifversion ghes or ghae %} como acessar ações de {% data variables.product.prodname_dotcom_the_website %},{% endif %} e como personalizar o software nas máquinas dos seus executores. -After you finish the guide, {% ifversion ghec or ghae %}members of your enterprise{% elsif ghes %}users of {% data variables.product.product_location %}{% endif %} will be able to run workflow jobs from {% data variables.product.prodname_actions %} on a self-hosted runner machine. +Depois de terminar o guia, {% ifversion ghec or ghae %}os integrantes da sua empresa{% elsif ghes %}usuários de {% data variables.product.product_location %}{% endif %} poderão executar trabalhos do fluxo de trabalho de {% data variables.product.prodname_actions %} na máquina de um executor auto-hospedado. ## Pré-requisitos {% data reusables.actions.self-hosted-runners-prerequisites %} -- Your enterprise must own at least one organization. For more information, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" and "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." +- Sua empresa deve possuir pelo menos uma organização. Para obter mais informações, consulte "[Sobre as organizações](/organizations/collaborating-with-groups-in-organizations/about-organizations)" e[Criando uma nova organização do zero](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)". -## 1. Configure policies for {% data variables.product.prodname_actions %} +## 1. Configurar políticas para {% data variables.product.prodname_actions %} -First, enable {% data variables.product.prodname_actions %} for all organizations, and configure a policy to restrict the actions that can run {% ifversion ghec or ghae%}within your enterprise on {% data variables.product.product_name %}{% elsif ghes %}on {% data variables.product.product_location %}{% endif %}. Optionally, organization owners can further restrict these policies for each organization. +Primeiro, habilite {% data variables.product.prodname_actions %} para todas as organizações, e configure uma política para restringir as ações que podem executar {% ifversion ghec or ghae%}dentro da sua empresa em {% data variables.product.product_name %}{% elsif ghes %}em {% data variables.product.product_location %}{% endif %}. Opcionalmente, os proprietários da organização podem restringir ainda mais essas políticas para cada organização. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} -1. Under "Policies", select **Enable for all organizations**. +1. Em "Políticas", selecione **Habilitar para todas as organizações**. - ![Screenshot of "Enable for all organizations" policy for {% data variables.product.prodname_actions %}](/assets/images/help/settings/actions-policy-enable-for-all-organizations.png) -1. Select **Allow select actions** and **Allow actions created by GitHub** to allow local actions and actions created by {% data variables.product.company_short %}. + ![Captura de tela da política "Habilitar para todas as organizações" para {% data variables.product.prodname_actions %}](/assets/images/help/settings/actions-policy-enable-for-all-organizations.png) +1. Selecione **Permitir ações** e **Permitir ações criadas pelo GitHub** para permitir ações e ações locais criadas por {% data variables.product.company_short %}. ![Screenshot of "Allow select actions" and "Allow actions created by {% data variables.product.company_short %}" for {% data variables.product.prodname_actions %}](/assets/images/help/settings/actions-policy-allow-select-actions-and-actions-from-github.png) 1. Clique em **Salvar**. @@ -88,7 +88,7 @@ You can create a runner group to manage access to the runner that you added to y {% warning %} - **Warning**: + **Aviso**: {% indented_data_reference reusables.actions.self-hosted-runner-security spaces=3 %} diff --git a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md index 476d1e208a..e9a9846a29 100644 --- a/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md +++ b/translations/pt-BR/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md @@ -56,7 +56,7 @@ Você deveria planejar onde você armazenará seus segredos. Recomendamos armaze Em {% data variables.product.prodname_dotcom %}, você pode armazenar segredos no nível do repositório ou da organização. Os segredos no nível do repositório podem estar limitados a fluxos de trabalho em certos ambientes, como produção ou teste. Para obter mais informações, consulte "[Segredos criptografados](/actions/security-guides/encrypted-secrets)". -![Captura de tela de uma lista de segredos](/assets/images/help/settings/actions-org-secrets-list.png) Você deve considerar adicionar proteção manual de aprovação para ambientes sensíveis, para que os fluxos de trabalho devam ser aprovados antes de ter acesso aos segredos do ambiente. For more information, see "[Using environments for deployments](/actions/deployment/targeting-different-environments/using-environments-for-deployment)." +![Captura de tela de uma lista de segredos](/assets/images/help/settings/actions-org-secrets-list.png) Você deve considerar adicionar proteção manual de aprovação para ambientes sensíveis, para que os fluxos de trabalho devam ser aprovados antes de ter acesso aos segredos do ambiente. Para obter mais informações, consulte "[Usando ambientes para implantações](/actions/deployment/targeting-different-environments/using-environments-for-deployment)". ### Considerações de segurança para ações de terceiros @@ -84,9 +84,9 @@ Sempre que seus desenvolvedores de fluxo de trabalho quiserem usar uma ação qu Você deve planejar como você gerenciará os recursos necessários para usar o {% data variables.product.prodname_actions %}. {% ifversion ghes %} -### Hardware requirements +### Requisitos de hardware -You may need to upgrade the CPU and memory resources for {% data variables.product.product_location %} to handle the load from {% data variables.product.prodname_actions %} without causing performance loss. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-requirements)." +É possível que você tenha de atualizar os recursos de CPU e memória para o {% data variables.product.product_location %} administrar a carga de {% data variables.product.prodname_actions %} sem causar perda de desempenho. Para obter mais informações, consulte "[Primeiros passos com {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-requirements)". {% endif %} ### Executores diff --git a/translations/pt-BR/content/admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise.md b/translations/pt-BR/content/admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise.md index 9b17de33de..622a1f2668 100644 --- a/translations/pt-BR/content/admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise.md +++ b/translations/pt-BR/content/admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise.md @@ -37,7 +37,7 @@ Cada ação é um repositório na organização de `ações`, e cada repositóri **Notas:** - Ao usar ações de configuração (como `actions/setup-LANGUAGE`) em {% data variables.product.product_name %} com executores auto-hospedados, você pode precisar configurar o armazenamento de ferramentas em executores que não possuem acesso à internet. Para obter mais informações, consulte "[Configurar o cache da ferramenta em executores auto-hospedados sem acesso à internet](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)". -- Upgrades to {% data variables.product.product_name %} will not result in the bundled actions being updated. +- As atualizações para {% data variables.product.product_name %} não a atualização de ações agregadas. {% endnote %} diff --git a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md index d3f54ccbec..8338f8bc06 100644 --- a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md +++ b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md @@ -33,8 +33,6 @@ redirect_from: {% data reusables.saml.about-saml-access-enterprise-account %} Para obter mais informações, consulte "[Visualizar e gerenciar o acesso de SAML de um usuário à sua conta corporativa](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise)". -{% data reusables.saml.cannot-update-existing-saml-settings %} - {% data reusables.saml.saml-disabled-linked-identities-removed %} {% data reusables.scim.enterprise-account-scim %} diff --git a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md index b8be31c2f1..00eae02f62 100644 --- a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md +++ b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md @@ -25,7 +25,11 @@ Com {% data variables.product.prodname_emus %}, a sua empresa usa o SAML SSO par Depois de configurar o SAM SSO, recomendamos armazenar seus códigos de recuperação para que você possa recuperar o acesso à sua empresa no caso de o seu provedor de identidade não estar disponível. -{% data reusables.saml.cannot-update-existing-saml-settings %} +{% note %} + +**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings. + +{% endnote %} ## Configurando o logon único da SAML para {% data variables.product.prodname_emus %} diff --git a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md index 661ce8d9ee..5da2ae0844 100644 --- a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md +++ b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md @@ -76,6 +76,8 @@ Para configurar o provisionamento, o usuário configurado com o nome de usuário Depois de configurar o SAML SSO e o provisionamento, você poderá fornecer novos usuários no {% data variables.product.prodname_dotcom_the_website %} atribuindo usuários ao aplicativo de {% data variables.product.prodname_emu_idp_application %}. +{% data reusables.scim.emu-scim-rate-limit %} + Você também pode gerenciar automaticamente a associação da organização ao atribuir grupos ao aplicativo e adicioná-los à aba "Grupos de Push" no Okta. Quando o grupo for provisionado com sucesso, ele estará disponível para conectar-se a equipes das organizações da empresa. Para obter mais informações sobre gerenciamento de equipes, consulte "[Gerenciando associações de equipe com grupos de provedores de identidade](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)". Ao atribuir aos usuários, você poderá usar o atributo "Funções" no aplicativo de {% data variables.product.prodname_emu_idp_application %} para definir a função de um usuário na sua empresa em {% data variables.product.product_name %}. Para obter mais informações sobre funções, consulte "[Funções em uma empresa](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise)". diff --git a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md index f3594cede9..883fcafc20 100644 --- a/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md +++ b/translations/pt-BR/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md @@ -51,6 +51,8 @@ Para configurar o provisionamento para o seu {% data variables.product.prodname_ Depois de criar seu token de acesso pessoal e armazená-lo com segurança, você pode configurar o provisionamento no seu provedor de identidade. +{% data reusables.scim.emu-scim-rate-limit %} + Para configurar o Diretório Ativo do Azure para fornecer aos usuários do seu {% data variables.product.prodname_emu_enterprise %}, consulte [Tutorial: Configurar o usuário gerenciado do GitHub Enterprise para provisionamento automático de usuário](https://docs.microsoft.com/en-us/azure/active-directory/saas-apps/github-enterprise-managed-user-provisioning-tutorial) na documentação do Azure AD. Para configurar o Okta para prover usuários para seu {% data variables.product.prodname_emu_enterprise %}, consulte "[Configurando o provisionamento de SCIM para Usuários Corporativos Gerenciados com o Okta](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta)". diff --git a/translations/pt-BR/content/admin/overview/about-enterprise-accounts.md b/translations/pt-BR/content/admin/overview/about-enterprise-accounts.md index 23e044604a..3e2735ee0c 100644 --- a/translations/pt-BR/content/admin/overview/about-enterprise-accounts.md +++ b/translations/pt-BR/content/admin/overview/about-enterprise-accounts.md @@ -50,7 +50,7 @@ Para obter mais informações sobre o gerenciamento de políticas para a conta c {% ifversion ghes or ghae %} -From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view{% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}. +Na sua conta corporativa em {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}uma instância de {% data variables.product.prodname_ghe_server %}{% endif %}, os administradores podem visualizar{% if remove-enterprise-members %} e gerenciar{% endif %} membros corporativos{% if enterprise-owner-join-org %}, gerenciar seus próprios integrantes em organizações pertencentes à empresa,{% endif %} e gerenciar o seguinte para a instância da {% ifversion ghes %}{% data variables.product.prodname_ghe_server %}{% elsif ghae %}empresa em {% data variables.product.prodname_ghe_managed %}{% endif %}. {% ifversion ghes %} - Uso da licença{% endif %} @@ -65,7 +65,7 @@ From your enterprise account on {% ifversion ghae %}{% data variables.product.pr {% endif %} -{% ifversion ghec or ghes %}Ao experimentar ou comprar {% data variables.product.prodname_enterprise %}, você também pode{% ifversion ghes %}{% endif %} criar uma conta corporativa para {% data variables.product.prodname_ghe_cloud %} em {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view {% if remove-enterprise-members %} and manage{% endif %} enterprise membership{% if enterprise-owner-join-org %}, manage their own membership in organizations owned by the enterprise,{% endif %} and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. +{% ifversion ghec or ghes %}Ao experimentar ou comprar {% data variables.product.prodname_enterprise %}, você também pode{% ifversion ghes %}{% endif %} criar uma conta corporativa para {% data variables.product.prodname_ghe_cloud %} em {% data variables.product.prodname_dotcom_the_website %}. Os administradores da conta corporativa em {% data variables.product.prodname_dotcom_the_website %} podem ver {% if remove-enterprise-members %} e gerenciar{% endif %} a assoviação corporativa{% if enterprise-owner-join-org %}, gerenciar seus próprios integrantes em organizações pertencentes à empresa,{% endif %} e gerenciae o seguinte para a conta corporativa{% ifversion ghes %} em {% data variables.product.prodname_dotcom_the_website %}{% endif %}. - Cobrança e uso (serviços em {% data variables.product.prodname_dotcom_the_website %}, {% data variables.product.prodname_GH_advanced_security %}, licenças de usuários) - Segurança (logon único, listas de permissão de IP, autoridades de certificação SSH, autenticação de dois fatores) diff --git a/translations/pt-BR/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/pt-BR/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md index 988e5de138..e85adf112c 100644 --- a/translations/pt-BR/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md +++ b/translations/pt-BR/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md @@ -67,7 +67,7 @@ Você pode restringir o tráfego de rede para a sua empresa em {% data variables {% elsif ghec %} -Os proprietários de empresas podem restringir o acesso a ativos pertencentes a organizações em uma empresa, configurando uma lista de permissão de endereços IP específicos. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} +Enterprise owners can restrict access to private assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %} diff --git a/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md b/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md index 25d75c155e..1684df26a9 100644 --- a/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md +++ b/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md @@ -1,6 +1,6 @@ --- -title: Managing your role in an organization owned by your enterprise -intro: You can manage your membership in any organization owned by your enterprise and change your role within the organization. +title: Gerenciando sua função em uma organização pertencente à sua empresa +intro: Você pode gerenciar a sua ssoviação em qualquer organização pertencente à sua empresa e mudar sua função dentro da organização. permissions: Enterprise owners can manage their role in an organization owned by the enterprise. versions: feature: enterprise-owner-join-org @@ -9,46 +9,46 @@ topics: - Administrator - Enterprise - Organizations -shortTitle: Manage your organization roles +shortTitle: Gerenciar as funções da sua organização --- {% note %} -**Note:** The ability for enterprise owners to manage their role in an organization owned by the enterprise is in beta and subject to change. +**Observação:** A habilidade dos proprietários da empresa de gerenciar sua função em uma organização que pertence à empresa está em fase beta e sujeita a alterações. {% endnote %} -## About role management +## Sobre o gerenciamento de funções -You can choose to join an organization owned by your enterprise as a member or as an organization owner, change your role within the organization, or leave the organization. +Você pode optar por participar de uma organização pertencente à sua empresa como integrante ou como proprietário da organização, mudar a sua função dentro da organização ou sair da organização. {% warning %} -**Warning**: If an organization uses SCIM to provision users, joining the organization this way could have unintended consequences. Para obter mais informações, consulte "[Sobre o SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)". +**Aviso**: Se uma organização usar o SCIM para fornecer usuários, entrar na organização desta forma poderia ter consequências não desejadas. Para obter mais informações, consulte "[Sobre o SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)". {% endwarning %} -## Managing your role with the enterprise settings +## Gerenciando seu papel com as configurações corporativas -You can join an organization owned by your enterprise and manage your role within the organization, directly from the settings for your enterprise account. +Você pode participar de uma organização pertencente à sua empresa e gerenciar sua função na organização, diretamente nas configurações da conta corporativa. -If an organization enforces SAML single sign-on (SSO), you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP). Then, you can manage your role in your enterprise settings. For more information, see "[Joining an organization that enforces SAML SSO](#joining-an-organization-that-enforces-saml-sso)." +Se uma organização aplivar o logon único do SAML (SSO), você não poderá usar as configurações corporativas para participar da organização. Em vez disso, você deve participar da organização usando o provedor de identidade (IdP) dessa organização. Em seguida, você pode gerenciar a sua função nas configurações da sua empresa. Para obter mais informações, consulte[Entrando para uma organização que apliva o SAML SSO](#joining-an-organization-that-enforces-saml-sso)". {% data reusables.enterprise-accounts.access-enterprise %} -1. On the **Organizations** tab, to the right of the organization you want to manage your role in, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click the action you want to take. +1. Na guia **Organizações**, à direita da organização em que você deseja gerenciar sua função, selecione o menu suspenso {% octicon "gear" aria-label="The gear icon" %} e clique na ação que você deseja assumir. - ![Screenshot of the dropdown menu for the gear icon for an organization](/assets/images/help/business-accounts/change-role-in-org.png) + ![Captura de tela do menu suspenso para o ícone de engrenagem de uma organização](/assets/images/help/business-accounts/change-role-in-org.png) -## Joining an organization that enforces SAML SSO +## Entrando para uma organização que apliva o SAML SSO -If an organization enforces SAML SSO, you cannot use the enterprise settings to join the organization. Instead, you must join the organization using that organization's identity provider (IdP). +Se uma organização aplicar o SSO SAML, você não poderá usar as configurações da empresa para participar da organização. Em vez disso, você deve participar da organização usando o provedor de identidade (IdP) dessa organização. -1. You must be assigned access in your IdP to the application for {% data variables.product.prodname_ghe_cloud %} that is used by the organization. If you're unable to configure your IdP yourself, contact your IdP administrator. -1. Authenticate to the organization using SAML SSO. +1. Você deve ter acesso no seu IdP para o aplicativo {% data variables.product.prodname_ghe_cloud %} que é usado pela organização. Se você não conseguir configurar seu IdP, entre em contato com o administrador do seu IdP. +1. Efetuar a autentivação na organização usando o SAML SSO. - - If the organization uses SCIM, accept the organization invitation that will be generated by the SCIM integration. - - If the organization does not use SCIM, visit the following URL, replacing ORGANIZATION with the name of the organization, then follow the prompts to authenticate. + - Se a organização usar o SCIM, aceite o convite da organização que será gerado pela integração do SCIM. + - Se a organização não usar o SCIM, acesse o URL a seguir, substituindo a ORGANIZAÇÃO pelo nome da organização e, em seguida, siga as instruções para efetuar a autenticação. `https://github.com/orgs/ORGANIZATION/sso` -After you've joined the organization, you can use the enterprise settings to manage your role in the organization, such as becoming an organization owner. For more information, see "[Managing your role with the enterprise settings](#managing-your-role-with-the-enterprise-settings)." +Depois de entrar na organização, você poderá usar as configurações corporativas para gerenciar a sua função na organização como, por exemplo, se tornar proprietário da organização. Para obter mais informações, consulte "[Gerenciando sua função com as configurações corporativas](#managing-your-role-with-the-enterprise-settings)". diff --git a/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md b/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md index f888f9b750..8f18c0f899 100644 --- a/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md +++ b/translations/pt-BR/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md @@ -1,6 +1,6 @@ --- -title: Restoring a deleted organization -intro: 'You can partially restore an organization that was previously deleted on {% data variables.product.product_location %}.' +title: Restaurando uma organização excluída +intro: 'Você pode restaurar parcialmente uma organização que foi anteriormente excluída em {% data variables.product.product_location %}.' versions: ghes: '*' type: how_to diff --git a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md index 2a2e434e26..683c327152 100644 --- a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md +++ b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md @@ -47,7 +47,7 @@ Se sua empresa usa {% data variables.product.prodname_emus %}, os proprietários {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -1. Na barra lateral esquerda, clique em **Administrators** (Administradores). ![Aba Administrators (Administradores) na barra lateral esquerda](/assets/images/help/business-accounts/administrators-tab.png) +{% data reusables.enterprise-accounts.administrators-tab %} 1. Acima da lista de administradores, clique em {% ifversion ghec %}**Convidar administrador**{% elsif ghes %}**Add proprietário**{% endif %}. {% ifversion ghec %} ![Botão "Convidar administrador" acima da lista de proprietários corporativos](/assets/images/help/business-accounts/invite-admin-button.png) @@ -65,10 +65,11 @@ Somente proprietários corporativos podem remover outros administradores corpora {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -1. Ao lado do nome de usuário da pessoa que você deseja remover, clique em {% octicon "gear" aria-label="The Settings gear" %} e, em seguida, clique em **Remover proprietário**{% ifversion ghec %} ou **Remover gerente de cobrança**{% endif %}. +{% data reusables.enterprise-accounts.administrators-tab %} +1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Convert to member**{% endif %}. {% ifversion ghec %} ![Ajuste de configurações com menu option (opções) para remover um administrador corporativo](/assets/images/help/business-accounts/remove-admin.png) {% elsif ghes %} ![Ajuste de configurações com menu option (opções) para remover um administrador corporativo](/assets/images/help/business-accounts/ghes-remove-owner.png) {% endif %} -1. Leia a confirmação, clique **Remover proprietário**{% ifversion ghec %} ou **Remover gerente de cobrança**{% endif %}. +1. Read the confirmation, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Yes, convert USERNAME to member**{% endif %}. diff --git a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md index afb676e298..a98ce1a363 100644 --- a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md +++ b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md @@ -1,39 +1,39 @@ --- -title: Removing a member from your enterprise -intro: 'You can remove a member from all organizations owned by your enterprise.' +title: Removendo um integrante da sua empresa +intro: Você pode remover um integrante de todas as organizações pertencentes à sua empresa. permissions: Enterprise owners can remove an enterprise member from the enterprise. versions: - feature: 'remove-enterprise-members' + feature: remove-enterprise-members type: how_to topics: - Enterprise -shortTitle: Remove member +shortTitle: Remover integrante --- {% note %} -**Note:** The ability to remove enterprise members is in beta and subject to change. +**Nota:** A capacidade de remover integrantes da empresa encontra-se em versão beta e está sujeita a alterações. {% endnote %} -## About removal of enterprise members +## Sobre a remoção de integrantes da empresa -When you remove an enterprise member from your enterprise, the member is removed from all organizations owned by your enterprise. +Ao remover um integrante da sua empresa, o integrante será removido de todas as organizações pertencentes à sua empresa. -If the enterprise member you're removing is the last owner of an organization owned by your enterprise, you will become an owner of that organization. +Se o integrante da empresa que você está removendo for o último proprietário de uma organização que pertence à sua empresa, você irá tornar-se o priprietário dessa organização. -If your enterprise or any of the organizations owned by your enterprise uses an identity provider (IdP) to manage organization membership, the member may be added back to the organization by the IdP. Make sure to also make any necessary changes in your IdP. +Se sua empresa ou qualquer uma das organizações pertencentes à sua empresa usar um provedor de identidade (IdP) para gerenciar a associação à organização, o integrante poderá ser adicionado de volta à organização pelo IdP. Certifique-se também de fazer as alterações necessárias no seu IdP. -## Removing a member from your enterprise +## Removendo um integrante da sua empresa {% note %} -**Note:** If an enterprise member uses only {% data variables.product.prodname_ghe_server %}, and not {% data variables.product.prodname_ghe_cloud %}, you cannot remove the enterprise member this way. +**Nota:** Se um integrante da empresa usar apenas {% data variables.product.prodname_ghe_server %} e não {% data variables.product.prodname_ghe_cloud %}, você não poderá remover o integrante da empresa desta maneira. {% endnote %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -1. To the right of the person you want to remove, select the {% octicon "gear" aria-label="The gear icon" %} dropdown menu and click **Remove from enterprise**. +1. À direita da pessoa que você deseja remover, selecione o menu suspenso {% octicon "gear" aria-label="The gear icon" %} e clique em **Remover da empresa**. - ![Screenshot of the "Remove from enterprise" option for an enterprise member](/assets/images/help/business-accounts/remove-member.png) \ No newline at end of file + ![Captura de tela da opção "Remover da empresade" para um integrante corporativo](/assets/images/help/business-accounts/remove-member.png) diff --git a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md index 793cb1c591..aff356c846 100644 --- a/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md +++ b/translations/pt-BR/content/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise.md @@ -30,20 +30,20 @@ Para obter mais informações sobre como adicionar pessoas à sua empresa, consu {% endif %} -## Enterprise owners +## Proprietários de empresas Os proprietários corporativos têm controle total da empresa e podem executar todas as ações, incluindo: - Gerenciar os administradores -- {% ifversion ghec %}Adding and removing {% elsif ghae or ghes %}Managing{% endif %} organizations {% ifversion ghec %}to and from {% elsif ghae or ghes %} in{% endif %} the enterprise{% if remove-enterprise-members %} -- Removing enterprise members from all organizations owned by the enterprise{% endif %} +- {% ifversion ghec %}Adicionando e removendo {% elsif ghae or ghes %}gerenciando{% endif %} organizações {% ifversion ghec %}de {% elsif ghae or ghes %} na{% endif %} empresa{% if remove-enterprise-members %} +- Removendo integrantes da empresa de todas as organizações pertencentes à empresa{% endif %} - Gerenciar as configurações da empresa - Aplicar a política nas organizações {% ifversion ghec %}- Managing billing settings{% endif %} {% if enterprise-owner-join-org %} -Enterprise owners do not have access to organization settings or content by default. To gain access, enterprise owners can join any organization owned by their enterprise. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)." +Os proprietários das empresas não têm acesso às configurações da organização ou ao conteúdo por padrão. Para obter acesso, os proprietários das empresas podem se juntar a qualquer organização pertencente à sua empresa. For more information, see "[Managing your role in an organization owned by your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)." -Owners of organizations in your enterprise do not have access to the enterprise itself unless you make them enterprise owners. +Os proprietários de organizações na sua empresa não têm acesso à empresa propriamente dita, a não ser que você os torne proprietários da empresa. {% else %} Os proprietários corporativos não podem acessar as configurações ou o conteúdo da organização, a menos que sejam incluídos como proprietário da organização ou recebam acesso direto a um repositório de propriedade da organização. Da mesma forma, os proprietários de organizações na sua empresa não têm acesso à empresa propriamente dita, a não ser que você os torne proprietários da empresa. {% endif %} diff --git a/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md b/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md index 2363a0df97..f83547ab56 100644 --- a/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md +++ b/translations/pt-BR/content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md @@ -57,7 +57,7 @@ Consulte "[Revisar integrações autorizadas](/articles/reviewing-your-authorize {% ifversion not ghae %} -If you have reset your account password and would also like to trigger a sign-out from the GitHub Mobile app, you can revoke your authorization of the "GitHub iOS" or "GitHub Android" OAuth App. For additional information, see "[Reviewing your authorized integrations](/authentication/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)." +Se você redefiniu sua senha de conta e também gostaria de acionar um logout do aplicativo GitHub Mobile, você pode revogar a sua autorização do aplicativo OAuth "GitHub iOS" ou "GitHub Android". Para obter mais informações, consulte "[Revisar integrações autorizadas](/authentication/keeping-your-account-and-data-secure/reviewing-your-authorized-integrations)". {% endif %} diff --git a/translations/pt-BR/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md b/translations/pt-BR/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md index 17aa0eb811..ca8936b1ee 100644 --- a/translations/pt-BR/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md +++ b/translations/pt-BR/content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md @@ -28,12 +28,12 @@ shortTitle: Chaves GPG existentes {% data reusables.gpg.list-keys-with-note %} 3. Verifique a saída do comando para ver se você tem um par de chaves GPG. * Se não houver pares de chaves GPG ou se você não quiser usar as que estiverem disponíveis para assinatura de commits e tags, [gere outra chave GPG](/articles/generating-a-new-gpg-key). - * If there's an existing GPG key pair and you want to use it to sign commits and tags, you can display the public key using the following command, substituting in the GPG key ID you'd like to use. Neste exemplo, o ID da chave GPG é `3AA5C34371567BD2`: + * Se houver um par de chaves GPG existente e você quiser usá-lo para assinar commits e tags, você poderá exibir a chave pública usando o comando a seguir, substituindo o ID da chave GPG que você gostaria de usar. Neste exemplo, o ID da chave GPG é `3AA5C34371567BD2`: ```shell $ gpg --armor --export 3AA5C34371567BD2 # Prints the GPG key ID, in ASCII armor format ``` - You can then [add your GPG key to your GitHub account](/articles/adding-a-new-gpg-key-to-your-github-account). + Você pode [adicionar a sua chave de GPG à sua conta do GitHub](/articles/adding-a-new-gpg-key-to-your-github-account). ## Leia mais diff --git a/translations/pt-BR/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md b/translations/pt-BR/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md index 67138b3707..94197ced34 100644 --- a/translations/pt-BR/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md +++ b/translations/pt-BR/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md @@ -45,7 +45,7 @@ Se você tiver várias chaves GPG, precisará informar ao Git qual deve ser usad $ if [ -r ~/.bash_profile ]; then echo 'export GPG_TTY=$(tty)' >> ~/.bash_profile; \ else echo 'export GPG_TTY=$(tty)' >> ~/.profile; fi ``` -1. Optionally, to prompt you to enter a PIN or passphrase when required, install `pinentry-mac`. For example, using [Homebrew](https://brew.sh/): +1. Opcionalmente, para solicitar que você digite um PIN ou senha quando necessário, instale `pinentry-mac`. Por exemplo, usando [Homebrew](https://brew.sh/): ```shell $ brew install pinentry-mac $ echo "pinentry-program $(which pinentry-mac)" >> ~/.gnupg/gpg-agent.conf diff --git a/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md b/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md index 6596217292..5d8ee48c74 100644 --- a/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md +++ b/translations/pt-BR/content/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces.md @@ -40,7 +40,7 @@ Se você comprou {% data variables.product.prodname_enterprise %} por meio de um {% data reusables.dotcom_billing.pricing_cal %} -### Billing for {% data variables.product.prodname_codespaces %} prebuilds +### Cobrnça para pré-compilações de {% data variables.product.prodname_codespaces %} {% data reusables.codespaces.prebuilds-beta-note %} diff --git a/translations/pt-BR/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/translations/pt-BR/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md index 97df46b655..4cdcc42a78 100644 --- a/translations/pt-BR/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md +++ b/translations/pt-BR/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md @@ -52,6 +52,13 @@ Se você fizer o downgrade da sua organização de {% data variables.product.pro Se você fizer o downgrade da sua organização de {% data variables.product.prodname_ghe_cloud %} para {% data variables.product.prodname_team %} ou {% data variables.product.prodname_free_team %}, a conta perderá o acesso a controles avançados de segurança, conformidade e implantação. {% data reusables.gated-features.more-info %} + +{% note %} + +**Note:** If you're currently trialing {% data variables.product.prodname_ghe_cloud %}, and you don't purchase {% data variables.product.prodname_enterprise %} before the trial ends, your organization will be automatically downgraded to {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}. Para obter mais informações, consulte "[Configurar uma versão de avaliação do {% data variables.product.prodname_ghe_cloud %}](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)". + +{% endnote %} + {% data reusables.organizations.billing-settings %} 1. Em "Plano atual", use o menu suspenso **Editar** e clique na opção de downgrade que você deseja. ![Botão Downgrade (Fazer downgrade)](/assets/images/help/billing/downgrade-option-button.png) {% data reusables.dotcom_billing.confirm_cancel_org_plan %} diff --git a/translations/pt-BR/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/translations/pt-BR/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md index 147258f9a7..b49fbde036 100644 --- a/translations/pt-BR/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md +++ b/translations/pt-BR/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md @@ -16,6 +16,8 @@ shortTitle: Configurar Este guia mostra como a sua equipe pode obter assinantes licenciados de {% data variables.product.prodname_vs %} e dar os primeiros passos com {% data variables.product.prodname_enterprise %}. +If you prefer video, you can watch [Setting up your {% data variables.product.prodname_enterprise %} licenses with {% data variables.product.prodname_vs %} subscriptions](https://www.youtube.com/watch?v=P_zBgp_BE_I) on Microsoft Visual Studio's YouTube channel. + ## Funções para {% data variables.product.prodname_vss_ghe %} Antes de configurar {% data variables.product.prodname_vss_ghe %}, é importante entender as funções para esta oferta combinada. diff --git a/translations/pt-BR/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md b/translations/pt-BR/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md index 99c35ded4a..79aef3a85f 100644 --- a/translations/pt-BR/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md +++ b/translations/pt-BR/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md @@ -16,9 +16,9 @@ shortTitle: Sincronizar uso da licença {% data reusables.enterprise-licensing.about-license-sync %} -To ensure that you see up-to-date license details on {% data variables.product.prodname_dotcom_the_website %}, you can sync license usage between the environments automatically, using {% data variables.product.prodname_github_connect %}. For more information about {% data variables.product.prodname_github_connect %}, see "[About {% data variables.product.prodname_github_connect %}]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/about-github-connect){% ifversion ghec %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}."{% endif %} +Para garantir que você irá ver os detalhes de licença atualizados sobre {% data variables.product.prodname_dotcom_the_website %}, você pode sincronizar o uso da licença entre os ambientes automaticamente, usando {% data variables.product.prodname_github_connect %}. Para obter mais informações sobre {% data variables.product.prodname_github_connect %}, consulte "[Sobre {% data variables.product.prodname_github_connect %}]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/about-github-connect){% ifversion ghec %}" na documentação de {% data variables.product.prodname_ghe_server %}.{% elsif ghes %}."{% endif %} -If you don't want to enable {% data variables.product.prodname_github_connect %}, you can manually sync license usage by uploading a file from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}. +Se você não deseja habilitar {% data variables.product.prodname_github_connect %}, você poderá sincronizar manualmente o uso de licença fazendo o upload de um arquivo de {% data variables.product.prodname_ghe_server %} para {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-licensing.view-consumed-licenses %} @@ -26,7 +26,7 @@ If you don't want to enable {% data variables.product.prodname_github_connect %} ## Sincronizar automaticamente o uso da licença -You can use {% data variables.product.prodname_github_connect %} to automatically synchronize user license count and usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. Para obter mais informações, consulte "[Habilitando a sincronização da licença de usuário para a sua empresa ]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise){% ifversion ghec %}" na documentação de {% data variables.product.prodname_ghe_server %}.{% elsif ghes %}."{% endif %} +É possível usar o {% data variables.product.prodname_github_connect %} para sincronizar automaticamente o uso e a contagem da licença de usuários entre o {% data variables.product.prodname_ghe_server %} e o {% data variables.product.prodname_ghe_cloud %}. Para obter mais informações, consulte "[Habilitando a sincronização da licença de usuário para a sua empresa ]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise){% ifversion ghec %}" na documentação de {% data variables.product.prodname_ghe_server %}.{% elsif ghes %}."{% endif %} ## Uso da licença sincronizado manualmente diff --git a/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql.md b/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql.md index 07ccd00280..185cfcf4a7 100644 --- a/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql.md +++ b/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql.md @@ -27,7 +27,7 @@ topics: Existem duas maneiras principais de usar {% data variables.product.prodname_codeql %} análise para {% data variables.product.prodname_code_scanning %}: - Adicione o fluxo de trabalho de {% data variables.product.prodname_codeql %} ao seu repositório. Isto usa o [github/codeql-action](https://github.com/github/codeql-action/) para executar o {% data variables.product.prodname_codeql_cli %}. Para obter mais informações, consulte "[Configurar {% data variables.product.prodname_code_scanning %} para um repositório](/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository#setting-up-code-scanning-using-actions)". -- Run the {% data variables.product.prodname_codeql %} CLI directly in an external CI system and upload the results to {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte "[Sobre a digitalização de código {% data variables.product.prodname_codeql %} no seu sistema de CI ](/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system)." +- Execute a CLI de {% data variables.product.prodname_codeql %} diretamente em um sistema dew CI externo e faça o upload dos resultados para {% data variables.product.prodname_dotcom %}. Para obter mais informações, consulte "[Sobre a digitalização de código {% data variables.product.prodname_codeql %} no seu sistema de CI ](/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system)." ## Sobre o {% data variables.product.prodname_codeql %} diff --git a/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md b/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md index e2da588dc7..f81c5f4e33 100644 --- a/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md +++ b/translations/pt-BR/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository.md @@ -79,7 +79,7 @@ Os proprietários da empresa, administradores de organização e repositórios p {% data reusables.code-scanning.billing %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -1. À direita dos " alertas de {% data variables.product.prodname_code_scanning_capc %}", clique em **Configurar {% data variables.product.prodname_code_scanning %}**. If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. Para mais informações consulte "[Gerenciar as configurações de segurança e análise para a sua organização](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" ou "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository). ![Botão "Configurar {% data variables.product.prodname_code_scanning %}" à direita de "{% data variables.product.prodname_code_scanning_capc %}" na Visão Geral de Segurança](/assets/images/help/security/overview-set-up-code-scanning.png) +1. À direita dos " alertas de {% data variables.product.prodname_code_scanning_capc %}", clique em **Configurar {% data variables.product.prodname_code_scanning %}**. Se {% data variables.product.prodname_code_scanning %} estiver faltando, você precisará perguntar a um proprietário ou administrador do repositório para habilitar o {% data variables.product.prodname_GH_advanced_security %}. Para mais informações consulte "[Gerenciar as configurações de segurança e análise para a sua organização](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" ou "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository). ![Botão "Configurar {% data variables.product.prodname_code_scanning %}" à direita de "{% data variables.product.prodname_code_scanning_capc %}" na Visão Geral de Segurança](/assets/images/help/security/overview-set-up-code-scanning.png) 4. Em "Começar com {% data variables.product.prodname_code_scanning %}", clique em **Configurar este fluxo de trabalho** no {% data variables.product.prodname_codeql_workflow %} ou em um fluxo de trabalho de terceiros. !["Set up this workflow" button under "Get started with {% data variables.product.prodname_code_scanning %}" heading](/assets/images/help/repository/code-scanning-set-up-this-workflow.png)Os fluxos de trabalho são exibidos apenas se forem relevantes para as linguagens de programação detectadas no repositório. O {% data variables.product.prodname_codeql_workflow %} é sempre exibido, mas o botão "Configurar este fluxo de trabalho" só é habilitado se a análise de {% data variables.product.prodname_codeql %} for compatível com as linguagens presentes no repositório. 5. Para personalizar como {% data variables.product.prodname_code_scanning %} faz a varredura do seu código, edite o fluxo de trabalho. diff --git a/translations/pt-BR/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md b/translations/pt-BR/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md index 88765f488b..1c40c8ccba 100644 --- a/translations/pt-BR/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md +++ b/translations/pt-BR/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md @@ -105,7 +105,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | `properties.tags[]` | **Optional.** An array of strings. {% data variables.product.prodname_code_scanning_capc %} uses `tags` to allow you to filter results on {% data variables.product.prodname_dotcom %}. For example, it is possible to filter to all results that have the tag `security`. | `properties.precision` | **Recommended.** A string that indicates how often the results indicated by this rule are true. For example, if a rule has a known high false-positive rate, the precision should be `low`. {% data variables.product.prodname_code_scanning_capc %} orders results by precision on {% data variables.product.prodname_dotcom %} so that the results with the highest `level`, and highest `precision` are shown first. Can be one of: `very-high`, `high`, `medium`, or `low`. {% ifversion fpt or ghes > 3.1 or ghae or ghec %} | `properties.problem.severity` | **Recommended.** A string that indicates the level of severity of any alerts generated by a non-security query. This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `problem.severity`, and highest `precision` are shown first. Can be one of: `error`, `warning`, or `recommendation`. -| `properties.security-severity` | **Recommended.** A score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9 is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %} +| `properties.security-severity` | **Recommended.** A string representing a score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9 is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %} ### `result` object @@ -114,7 +114,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr | Name | Description | |----|----| | `ruleId`| **Optional.** The unique identifier of the rule (`reportingDescriptor.id`). For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). {% data variables.product.prodname_code_scanning_capc %} uses the rule identifier to filter results by rule on {% data variables.product.prodname_dotcom %}. -| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). +| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). The allowed range for this property 0 to 2^63 - 1. | `rule`| **Optional.** A reference used to locate the rule (reporting descriptor) for this result. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). | `level`| **Optional.** The severity of the result. This level overrides the default severity defined by the rule. {% data variables.product.prodname_code_scanning_capc %} uses the level to filter results by severity on {% data variables.product.prodname_dotcom %}. | `message.text`| **Required.** A message that describes the result. {% data variables.product.prodname_code_scanning_capc %} displays the message text as the title of the result. Only the first sentence of the message will be displayed when visible space is limited. @@ -129,7 +129,7 @@ A location within a programming artifact, such as a file in the repository or a | Name | Description | |----|----| -| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. +| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. The allowed range for this property 0 to 2^63 - 1. | `location.physicalLocation` | **Required.** Identifies the artifact and region. For more information, see the [`physicalLocation`](#physicallocation-object). | `location.message.text` | **Optional.** A message relevant to the location. diff --git a/translations/pt-BR/content/code-security/getting-started/github-security-features.md b/translations/pt-BR/content/code-security/getting-started/github-security-features.md index ea55ef7474..2970b1343b 100644 --- a/translations/pt-BR/content/code-security/getting-started/github-security-features.md +++ b/translations/pt-BR/content/code-security/getting-started/github-security-features.md @@ -61,8 +61,8 @@ O gráfico de dependências permite explorar os ecossistemas e pacotes dos quais Você pode encontrar o gráfico de dependências na aba **Ideias** para o seu repositório. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)". {% endif %} -### Security overview for repositories -For all public repositories, the security overview shows which security features are enabled for the repository, and offers the option to configure any available security features that are not currently enabled. +### Visão geral de segurança para repositórios +Para todos os repositórios públicos, a visão geral de segurança mostra quais funcionalidades de segurança estão habilitadas no repositório e oferece a opção de configurar quaisquer recursos de segurança disponíveis que não estão habilitadas no momento. ## Disponível com {% data variables.product.prodname_GH_advanced_security %} @@ -86,7 +86,7 @@ Detectar automaticamente vulnerabilidades de segurança e erros de codificação {% ifversion fpt or ghec %} ### {% data variables.product.prodname_secret_scanning_partner_caps %} -Automatically detect leaked secrets across all public repositories. {% data variables.product.company_short %} informs the relevant service provider that the secret may be compromised. For details of the supported secrets and service providers, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns)." +Automatically detect leaked secrets across all public repositories. {% data variables.product.company_short %} informs the relevant service provider that the secret may be compromised. Para obter detalhes dos segredos e provedores de serviço compatíveis, consulte "[ Padrões de {% data variables.product.prodname_secret_scanning_caps %}](/code-security/secret-scanning/secret-scanning-patterns)". {% endif %} {% ifversion not fpt %} diff --git a/translations/pt-BR/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md b/translations/pt-BR/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md index d5ae8a0487..1e8db50a3b 100644 --- a/translations/pt-BR/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md +++ b/translations/pt-BR/content/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories.md @@ -1,6 +1,6 @@ --- title: Configurar a varredura de segredo para os seus repositórios -intro: 'You can configure how {% data variables.product.prodname_dotcom %} scans your repositories for secrets that match advanced security patterns.' +intro: 'Você pode configurar como {% data variables.product.prodname_dotcom %} digitaliza os seus repositórios vom relação a segredos que correspondem a padrões avançados de segurança.' product: '{% data reusables.gated-features.secret-scanning %}' permissions: 'People with admin permissions to a repository can enable {% data variables.product.prodname_secret_scanning_GHAS %} for the repository.' redirect_from: @@ -24,7 +24,7 @@ shortTitle: Configurar varreduras de segredos ## Habilitar o {% data variables.product.prodname_secret_scanning_GHAS %} -Você pode habilitar {% data variables.product.prodname_secret_scanning_GHAS %} para qualquer repositório que pertença a uma organização. Once enabled, {% data reusables.secret-scanning.secret-scanning-process %} +Você pode habilitar {% data variables.product.prodname_secret_scanning_GHAS %} para qualquer repositório que pertença a uma organização. Uma vez habilitado, {% data reusables.secret-scanning.secret-scanning-process %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} @@ -41,7 +41,7 @@ Você pode habilitar {% data variables.product.prodname_secret_scanning_GHAS %} 3. À direita de "{% data variables.product.prodname_secret_scanning_caps %}", clique em **Habilitar**. ![Habilitar {% data variables.product.prodname_secret_scanning %} para o seu repositório](/assets/images/enterprise/github-ae/repository/enable-secret-scanning-ghae.png) {% endif %} -## Excluding directories from {% data variables.product.prodname_secret_scanning_GHAS %} +## Excluindo diretórios de {% data variables.product.prodname_secret_scanning_GHAS %} Você pode usar um arquivo *secret_scanning.yml* para excluir diretórios do {% data variables.product.prodname_secret_scanning %}. Por exemplo, você pode excluir diretórios que contenham testes ou conteúdo gerado aleatoriamente. diff --git a/translations/pt-BR/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md b/translations/pt-BR/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md index b3af39bbe1..6cbfc40ca8 100644 --- a/translations/pt-BR/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md +++ b/translations/pt-BR/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md @@ -1,7 +1,7 @@ --- title: Definindo padrões personalizados para varredura de segredo shortTitle: Defina padrões personalizados -intro: 'You can extend {% data variables.product.prodname_secret_scanning_GHAS %} to detect secrets beyond the default patterns.' +intro: 'Você pode estender {% data variables.product.prodname_secret_scanning_GHAS %} para detectar segredos além dos padrões tradicionais.' product: '{% data reusables.gated-features.secret-scanning %}' redirect_from: - /code-security/secret-security/defining-custom-patterns-for-secret-scanning @@ -25,10 +25,10 @@ topics: ## Sobre padrões personalizados para {% data variables.product.prodname_secret_scanning %} -You can define custom patterns to identify secrets that are not detected by the default patterns supported by {% data variables.product.prodname_secret_scanning %}. Por exemplo, você pode ter um padrão de segredo que é interno da sua organização. For details of the supported secrets and service providers, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns)." +Você pode definir padrões personalizados para identificar segredos que não são detectados pelos padrões padrão compatíbeis com {% data variables.product.prodname_secret_scanning %}. Por exemplo, você pode ter um padrão de segredo que é interno da sua organização. Para obter detalhes dos segredos e provedores de serviço compatíveis, consulte "[ Padrões de {% data variables.product.prodname_secret_scanning_caps %}](/code-security/secret-scanning/secret-scanning-patterns)". -You can define custom patterns for your enterprise, organization, or repository. {% data variables.product.prodname_secret_scanning_caps %} supports up to -{%- ifversion fpt or ghec or ghes > 3.3 %} 500 custom patterns for each organization or enterprise account, and up to 100 custom patterns per repository. +É possível definir padrões personalizados para sua empresa, organização ou repositório. {% data variables.product.prodname_secret_scanning_caps %} é vompatível com até +{%- ifversion fpt or ghec or ghes > 3.3 %} 500 padrões personalizados para cada conta da organização ou empresa e até 100 padrões personalizados por repositório. {%- elsif ghes = 3.3 %} 100 padrões personalizados para cada organização ou conta corporativa, e 20 por repositório. {%- else %} 20 padrões personalizados para cada organização ou conta corporativa, e por repositório. {%- endif %} @@ -47,7 +47,7 @@ You can define custom patterns for your enterprise, organization, or repository. ## Sintaxe de expressão regular para padrões personalizados -You can specify custom patterns for {% data variables.product.prodname_secret_scanning_GHAS %} as one or more regular expressions. +Você pode especificar padrões personalizados para {% data variables.product.prodname_secret_scanning_GHAS %} como uma ou mais expressões regulares. - **Formato secreto:** uma expressão que descreve o formato do próprio segredo. - **Antes do segredo:** uma expressão que descreve os caracteres que vêm antes do segredo. Por padrão, isto é definido como `\A|[^0-9A-Za-z]`, o que significa que o segredo deve estar no início de uma linha ou ser precedido por um caractere não alfanumérico. @@ -108,7 +108,7 @@ aAAAe9 ## Definindo um padrão personalizado para uma organização -Before defining a custom pattern, you must ensure that you enable {% data variables.product.prodname_secret_scanning %} for the repositories that you want to scan in your organization. To enable {% data variables.product.prodname_secret_scanning %} on all repositories in your organization, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." +Antes de definir um padrão personalizado, você deverá habilitar {% data variables.product.prodname_secret_scanning %} para os repositórios que você deseja fazer a digitalização na organização. Para habilitar {% data variables.product.prodname_secret_scanning %} em todos os repositórios da sua organização, consulte "[gerenciar configurações de segurança e análise da sua organização](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)". {% note %} @@ -124,7 +124,7 @@ Before defining a custom pattern, you must ensure that you enable {% data variab {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %} {% data reusables.advanced-security.secret-scanning-create-custom-pattern %} -After your pattern is created, {% data variables.product.prodname_secret_scanning %} scans for any secrets in repositories in your organization, including their entire Git history on all branches. Organization owners and repository administrators will be alerted to any secrets found and can review the alert in the repository where the secret is found. Para obter mais informações sobre a visualização de alertas de {% data variables.product.prodname_secret_scanning %}, consulte "[Gerenciar alertas de {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/managing-alerts-from-secret-scanning)". +Depois que o padrão for criado, {% data variables.product.prodname_secret_scanning %} irá verificar todos os segredos nos repositórios na sua organização, incluindo todo seu histórico do Git em todos os branches. Os proprietários da organização e administradores do repositório receberão um alerta sobre todos os segredos encontrados e poderão revisar o alerta no repositório onde o segredo for encontrado. Para obter mais informações sobre a visualização de alertas de {% data variables.product.prodname_secret_scanning %}, consulte "[Gerenciar alertas de {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/managing-alerts-from-secret-scanning)". ## Definir um padrão personalizado para uma conta corporativa @@ -148,7 +148,7 @@ Antes de definir um padrão personalizado, você deverá garantir que você habi {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %} {% data reusables.advanced-security.secret-scanning-create-custom-pattern %} -After your pattern is created, {% data variables.product.prodname_secret_scanning %} scans for any secrets in repositories within your enterprise's organizations with {% data variables.product.prodname_GH_advanced_security %} enabled, including their entire Git history on all branches. Os proprietários da organização e administradores do repositório receberão um alerta sobre todos os segredos encontrados e poderão revisar o alerta no repositório onde o segredo for encontrado. Para obter mais informações sobre a visualização de alertas de {% data variables.product.prodname_secret_scanning %}, consulte "[Gerenciar alertas de {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/managing-alerts-from-secret-scanning)". +Depois que o seu padrão for criado, {% data variables.product.prodname_secret_scanning %} irá digitalizar qualquer segredo em repositórios nas organizações da sua empresa com {% data variables.product.prodname_GH_advanced_security %} habilitado, incluindo todo seu histórico do Git em todos os branches. Os proprietários da organização e administradores do repositório receberão um alerta sobre todos os segredos encontrados e poderão revisar o alerta no repositório onde o segredo for encontrado. Para obter mais informações sobre a visualização de alertas de {% data variables.product.prodname_secret_scanning %}, consulte "[Gerenciar alertas de {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/managing-alerts-from-secret-scanning)". {% ifversion fpt or ghes > 3.2 or ghec or ghae %} ## Editando um padrão personalizado diff --git a/translations/pt-BR/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md b/translations/pt-BR/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md index ed926725b3..12c9b874b7 100644 --- a/translations/pt-BR/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md +++ b/translations/pt-BR/content/code-security/secret-scanning/managing-alerts-from-secret-scanning.md @@ -25,7 +25,7 @@ shortTitle: Gerenciar alertas de segredos {% ifversion ghec %} {% note %} -**Note:** Alerts are created only for repositories with {% data variables.product.prodname_secret_scanning_GHAS %} enabled. Secrets found in public repositories using the free {% data variables.product.prodname_secret_scanning_partner%} service are reported directly to the partner, without creating an alert. +**Nota:** Os alertas são criados apenas para repositórios com {% data variables.product.prodname_secret_scanning_GHAS %} habilitado. Os segredos encontrados em repositórios públicos que usam o serviço gratuito de {% data variables.product.prodname_secret_scanning_partner%} são informados diretamente ao parceiro, sem criar um alerta. {% endnote %} {% endif %} @@ -67,7 +67,7 @@ Uma vez que um segredo tenha sido committed a um repositório, você deve consid {% ifversion ghec %} {% note %} -**Note:** If a secret is detected in a public repository on {% data variables.product.prodname_dotcom_the_website %} and the secret also matches a partner pattern, an alert is generated and the potential secret is reported to the service provider. For details of partner patterns, see "[Supported secrets for partner patterns](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets-for-partner-patterns)." +**Nota:** Se um segredo for detectado em um repositório público em {% data variables.product.prodname_dotcom_the_website %} e o segredo também corresponder ao padrão de um parceiro, será gerado um alerta e o segredo potencial será informado ao provedor de serviços. Para obter detalhes sobre os padrões de parceiros, consulte "[segredos compatíveis com os padrões de parceiro](/code-security/secret-scanning/secret-scanning-patterns#supported-secrets-for-partner-patterns)". {% endnote %} {% endif %} diff --git a/translations/pt-BR/content/code-security/security-overview/filtering-alerts-in-the-security-overview.md b/translations/pt-BR/content/code-security/security-overview/filtering-alerts-in-the-security-overview.md index 0e58bfe7d6..787c618fdb 100644 --- a/translations/pt-BR/content/code-security/security-overview/filtering-alerts-in-the-security-overview.md +++ b/translations/pt-BR/content/code-security/security-overview/filtering-alerts-in-the-security-overview.md @@ -122,16 +122,16 @@ Disponível na visualização de alerta de digitalização de código. Todos os Disponível nas visualizações de alerta de segredos. -| Qualifier | Descrição | -| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `secret-type:SERVICE_PROVIDER` | Exibe alertas para o segredo e provedor especificados. For more information, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns)." | -| `secret-type:CUSTOM-PATTERN` | Exibe alertas de segredos que correspondem ao padrão personalizado especificado. | -| {% ifversion not fpt %}Para obter mais informações, consulte "[Definindo padrões personalizados para digitalização de segredo](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning).{% endif %} | | +| Qualifier | Descrição | +| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `secret-type:SERVICE_PROVIDER` | Exibe alertas para o segredo e provedor especificados. Para obter mais informações, consulte "[Padrões de {% data variables.product.prodname_secret_scanning_caps %}](/code-security/secret-scanning/secret-scanning-patterns)." | +| `secret-type:CUSTOM-PATTERN` | Exibe alertas de segredos que correspondem ao padrão personalizado especificado. | +| {% ifversion not fpt %}Para obter mais informações, consulte "[Definindo padrões personalizados para digitalização de segredo](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning).{% endif %} | | ## Filtrar por provedor Disponível nas visualizações de alerta de segredos. -| Qualifier | Descrição | -| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `provider:PROVIDER_NAME` | Exibe alertas para todos os problemas de segredos por provedor especificado. For more information, see "[{% data variables.product.prodname_secret_scanning_caps %} patterns](/code-security/secret-scanning/secret-scanning-patterns)." | +| Qualifier | Descrição | +| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `provider:PROVIDER_NAME` | Exibe alertas para todos os problemas de segredos por provedor especificado. Para obter mais informações, consulte "[Padrões de {% data variables.product.prodname_secret_scanning_caps %}](/code-security/secret-scanning/secret-scanning-patterns)." | diff --git a/translations/pt-BR/content/code-security/security-overview/viewing-the-security-overview.md b/translations/pt-BR/content/code-security/security-overview/viewing-the-security-overview.md index bc6730f39e..f706e7740d 100644 --- a/translations/pt-BR/content/code-security/security-overview/viewing-the-security-overview.md +++ b/translations/pt-BR/content/code-security/security-overview/viewing-the-security-overview.md @@ -37,10 +37,10 @@ shortTitle: Ver visão geral de segurança 2. Opcionalmente, filtre a lista de alertas. Cada visualização tem sua própria seleção de filtros disponíveis. Você pode clicar em vários filtros nos menus suspensos de filtro para restringir a sua pesquisa. Você também pode digitar os qualificadores de busca no campo de busca. Para obter mais informações sobre os qualificados disponíveis, consulte "[Filtrando alertas na visão geral de segurança](/code-security/security-overview/filtering-alerts-in-the-security-overview)". ![Os menus de filtro suspenso e o campo de repositórios de pesquisa na visualização de digitalização de segredo](/assets/images/help/organizations/secret-scanning-filter-alerts.png) {% ifversion ghec or ghes > 3.4 or ghae-issue-6199 %} -## Viewing the security overview for an enterprise +## Visualizando a visão geral de segurança de uma empresa {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -1. In the left sidebar, click {% octicon "shield" aria-label="The shield icon" %} **Security**. +1. Na barra lateral esquerda, clique em {% octicon "shield" aria-label="The shield icon" %} **Segurança**. {% endif %} ## Visualizando alertas de um repositório diff --git a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md index f967c51b52..ed1ad38ab7 100644 --- a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md +++ b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md @@ -1,6 +1,6 @@ --- title: Gerenciar endereços IP permitidos para sua organização -intro: Você pode restringir o acesso aos ativos da sua organização configurando uma lista de endereços IP autorizados a se conectar. +intro: You can restrict access to your organization's private assets by configuring a list of IP addresses that are allowed to connect. product: '{% data reusables.gated-features.allowed-ip-addresses %}' redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization @@ -19,7 +19,7 @@ Os proprietários da organização podem gerenciar endereços IP permitidos para ## Sobre endereços IP permitidos -Você pode restringir o acesso a ativos da organização configurando uma lista de permissões para endereços IP específicos. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} +You can restrict access to private organization assets by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %} {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %} @@ -27,7 +27,7 @@ Você pode restringir o acesso a ativos da organização configurando uma lista Se você configurar uma lista de permissões, você também poderá optar por adicionar automaticamente à sua lista de permissões todos os endereços IP configurados em {% data variables.product.prodname_github_apps %} que você instalar na sua organização. O criador de um {% data variables.product.prodname_github_app %} pode configurar uma lista de permissões para o seu aplicativo, especificando os endereços IP em que o aplicativo é executado. Ao herdar a lista de permissões deles para a sua lista, você evita as solicitações de conexão do aplicativo que está sendo recusado. Para obter mais informações, consulte "[Permitir acesso por {% data variables.product.prodname_github_apps %}](#allowing-access-by-github-apps)". -Você também pode configurar endereços IP permitidos para as organizações em uma conta corporativa. Para obter mais informações, consulte "[Aplicando políticas de segurança na sua empresa](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)". +Você também pode configurar endereços IP permitidos para as organizações em uma conta corporativa. Para obter mais informações, consulte "[Aplicando políticas de segurança na sua empresa](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)". ## Adicionar endereços IP permitidos diff --git a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md index 7bedddb22f..a3cb1fa03d 100644 --- a/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md +++ b/translations/pt-BR/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md @@ -56,7 +56,7 @@ Você pode habilitar ou desabilitar funcionalidades para todos os repositórios. {% data reusables.advanced-security.note-org-enable-uses-seats %} 1. Acesse as configurações de segurança e análise da sua organização. Para obter mais informações, consulte "[Exibir as configurações de segurança e análise](#displaying-the-security-and-analysis-settings)". -2. Under "Code security and analysis", to the right of the feature, click **Disable all** or **Enable all**. {% ifversion ghes > 3.0 or ghec %}O controle para "{% data variables.product.prodname_GH_advanced_security %}" fica desabilitado se você não tiver estações disponíveis na sua licença de {% data variables.product.prodname_GH_advanced_security %}.{% endif %} +2. Em "Código de segurança e análise" à direita do recurso, clique em **Desabilitar tudo** ou **Habilitar tudo**. {% ifversion ghes > 3.0 or ghec %}O controle para "{% data variables.product.prodname_GH_advanced_security %}" fica desabilitado se você não tiver estações disponíveis na sua licença de {% data variables.product.prodname_GH_advanced_security %}.{% endif %} {% ifversion fpt %} ![Botão "Habilitar tudo" ou "Desabilitar tudo" para os recursos de "Configurar segurança e análise"](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-fpt.png) {% endif %} diff --git a/translations/pt-BR/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/translations/pt-BR/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md index d0b3815770..94153a96c2 100644 --- a/translations/pt-BR/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md +++ b/translations/pt-BR/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md @@ -60,94 +60,98 @@ Algumas das funcionalidades listadas abaixo estão limitadas a organizações qu {% endnote %} {% endif %} -| Ação no repositório | Leitura | Triagem | Gravação | Manutenção | Administrador | -|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-------:|:-------:|:--------:|:----------:|:---------------------------------------------:| -| Gerencie o acesso ao repositório de [equipes](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository), [individuais](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository) e [colaboradores externos](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | -| Fazer pull nos repositórios atribuídos ao usuário ou à equipe | **X** | **X** | **X** | **X** | **X** | -| Bifurcar os repositórios atribuídos ao usuário ou à equipe | **X** | **X** | **X** | **X** | **X** | -| Editar e excluir seus próprios comentários | **X** | **X** | **X** | **X** | **X** | -| Criar problemas | **X** | **X** | **X** | **X** | **X** | -| Fechar os problemas que eles criaram | **X** | **X** | **X** | **X** | **X** | -| Reabrir problemas que eles fecharam | **X** | **X** | **X** | **X** | **X** | -| Ter um problema atribuído a eles | **X** | **X** | **X** | **X** | **X** | -| Enviar pull requests de bifurcações dos repositórios atribuídos à equipe | **X** | **X** | **X** | **X** | **X** | -| Enviar revisões em pull requests | **X** | **X** | **X** | **X** | **X** | -| Exibir as versões publicadas | **X** | **X** | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| Visualizar [execuções de fluxo de trabalho no GitHub Actions](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run) | **X** | **X** | **X** | **X** | **X** +| Ação no repositório | Leitura | Triagem | Gravação | Manutenção | Administrador | +|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-------:|:-------:|:--------:|:----------:|:-------------------------------------------------------------------:| +| Gerencie o acesso ao repositório de [equipes](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository), [individuais](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository) e [colaboradores externos](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | +| Fazer pull nos repositórios atribuídos ao usuário ou à equipe | **X** | **X** | **X** | **X** | **X** | +| Bifurcar os repositórios atribuídos ao usuário ou à equipe | **X** | **X** | **X** | **X** | **X** | +| Editar e excluir seus próprios comentários | **X** | **X** | **X** | **X** | **X** | +| Criar problemas | **X** | **X** | **X** | **X** | **X** | +| Fechar os problemas que eles criaram | **X** | **X** | **X** | **X** | **X** | +| Reabrir problemas que eles fecharam | **X** | **X** | **X** | **X** | **X** | +| Ter um problema atribuído a eles | **X** | **X** | **X** | **X** | **X** | +| Enviar pull requests de bifurcações dos repositórios atribuídos à equipe | **X** | **X** | **X** | **X** | **X** | +| Enviar revisões em pull requests | **X** | **X** | **X** | **X** | **X** | +| Exibir as versões publicadas | **X** | **X** | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| Visualizar [execuções de fluxo de trabalho no GitHub Actions](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run) | **X** | **X** | **X** | **X** | **X** {% endif %} -| Editar wikis em repositórios públicos | **X** | **X** | **X** | **X** | **X** | -| Editar wikis em repositórios privados | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| [Denunciar conteúdo abusivo ou spam](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** +| Editar wikis em repositórios públicos | **X** | **X** | **X** | **X** | **X** | +| Editar wikis em repositórios privados | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| [Denunciar conteúdo abusivo ou spam](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** {% endif %} -| Aplicar/ignorar etiquetas | | **X** | **X** | **X** | **X** | -| Criar, editar, excluir etiquetas | | | **X** | **X** | **X** | -| Fechar, reabrir e atribuir todos os problemas e pull requests | | **X** | **X** | **X** | **X** | -| [Habilitar e desabilitar o merge automático em um pull request](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository) | | | **X** | **X** | **X** | -| Aplicar marcos | | **X** | **X** | **X** | **X** | -| Marcar [problemas e pull requests duplicados](/articles/about-duplicate-issues-and-pull-requests) | | **X** | **X** | **X** | **X** | -| Solicitar [revisões de pull requests](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) | | **X** | **X** | **X** | **X** | -| Fazer merge de um [pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges) | | | **X** | **X** | **X** | -| Fazer push (gravar) nos repositórios atribuídos ao usuário ou à equipe | | | **X** | **X** | **X** | -| Editar e excluir comentários de qualquer usuário em commits, pull request e problemas | | | **X** | **X** | **X** | -| [Ocultar comentários de qualquer usuário](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | | **X** | **X** | **X** | -| [Bloquear conversas](/communities/moderating-comments-and-conversations/locking-conversations) | | | **X** | **X** | **X** | -| Transferir problemas (consulte "[Transferir um problema para outro repositório](/articles/transferring-an-issue-to-another-repository)" para obter mais informações) | | | **X** | **X** | **X** | -| [Atuar como um proprietário do código designado de um repositório](/articles/about-code-owners) | | | **X** | **X** | **X** | -| [Marcar uma pull request de rascunho como pronta para revisão](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | -| [Converter um pull request em rascunho](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | -| Enviar revisões que afetam a capacidade de merge de uma pull request | | | **X** | **X** | **X** | -| [Aplicar alterações sugeridas](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) a pull requests | | | **X** | **X** | **X** | -| Criar [verificações de status](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} -| Criar, editar, executar, reexecutar e cancelar [fluxos de trabalho no GitHub Actions](/actions/automating-your-workflow-with-github-actions/) | | | **X** | **X** | **X** +| Aplicar/ignorar etiquetas | | **X** | **X** | **X** | **X** | +| Criar, editar, excluir etiquetas | | | **X** | **X** | **X** | +| Fechar, reabrir e atribuir todos os problemas e pull requests | | **X** | **X** | **X** | **X** | +| [Habilitar e desabilitar o merge automático em um pull request](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository) | | | **X** | **X** | **X** | +| Aplicar marcos | | **X** | **X** | **X** | **X** | +| Marcar [problemas e pull requests duplicados](/articles/about-duplicate-issues-and-pull-requests) | | **X** | **X** | **X** | **X** | +| Solicitar [revisões de pull requests](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) | | **X** | **X** | **X** | **X** | +| Fazer merge de um [pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges) | | | **X** | **X** | **X** | +| Fazer push (gravar) nos repositórios atribuídos ao usuário ou à equipe | | | **X** | **X** | **X** | +| Editar e excluir comentários de qualquer usuário em commits, pull request e problemas | | | **X** | **X** | **X** | +| [Ocultar comentários de qualquer usuário](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | | **X** | **X** | **X** | +| [Bloquear conversas](/communities/moderating-comments-and-conversations/locking-conversations) | | | **X** | **X** | **X** | +| Transferir problemas (consulte "[Transferir um problema para outro repositório](/articles/transferring-an-issue-to-another-repository)" para obter mais informações) | | | **X** | **X** | **X** | +| [Atuar como um proprietário do código designado de um repositório](/articles/about-code-owners) | | | **X** | **X** | **X** | +| [Marcar uma pull request de rascunho como pronta para revisão](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | +| [Converter um pull request em rascunho](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | | | **X** | **X** | **X** | +| Enviar revisões que afetam a capacidade de merge de uma pull request | | | **X** | **X** | **X** | +| [Aplicar alterações sugeridas](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) a pull requests | | | **X** | **X** | **X** | +| Criar [verificações de status](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) | | | **X** | **X** | **X** |{% ifversion fpt or ghec %} +| Criar, editar, executar, reexecutar e cancelar [fluxos de trabalho no GitHub Actions](/actions/automating-your-workflow-with-github-actions/) | | | **X** | **X** | **X** {% endif %} -| Criar e editar versões | | | **X** | **X** | **X** | -| Exibir versões de rascunho | | | **X** | **X** | **X** | -| Editar a descrição de um repositório | | | | **X** | **X** |{% ifversion fpt or ghae or ghec %} -| [Visualizar e instalar pacotes](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | -| [Publicar pacotes](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | -| [Excluir e restaurar pacotes](/packages/learn-github-packages/deleting-and-restoring-a-package) | | | | | **X** |{% endif %} -| Gerenciar [tópicos](/articles/classifying-your-repository-with-topics) | | | | **X** | **X** | -| Habilitar wikis e restringir editores de wiki | | | | **X** | **X** | -| Habilitar quadros de projeto | | | | **X** | **X** | -| Configurar [merges de pull request](/articles/configuring-pull-request-merges) | | | | **X** | **X** | -| Configurar [uma fonte de publicação para {% data variables.product.prodname_pages %}](/articles/configuring-a-publishing-source-for-github-pages) | | | | **X** | **X** | -| [Fazer push em branches protegidos](/articles/about-protected-branches) | | | | **X** | **X** | -| [Criar e editar cartões sociais do repositório](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% ifversion fpt or ghec %} -| Limitar [interações em um repositório](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository) | | | | **X** | **X** +| Criar e editar versões | | | **X** | **X** | **X** | +| Exibir versões de rascunho | | | **X** | **X** | **X** | +| Editar a descrição de um repositório | | | | **X** | **X** |{% ifversion fpt or ghae or ghec %} +| [Visualizar e instalar pacotes](/packages/publishing-and-managing-packages) | **X** | **X** | **X** | **X** | **X** | +| [Publicar pacotes](/packages/publishing-and-managing-packages/publishing-a-package) | | | **X** | **X** | **X** | +| [Excluir e restaurar pacotes](/packages/learn-github-packages/deleting-and-restoring-a-package) | | | | | **X** |{% endif %} +| Gerenciar [tópicos](/articles/classifying-your-repository-with-topics) | | | | **X** | **X** | +| Habilitar wikis e restringir editores de wiki | | | | **X** | **X** | +| Habilitar quadros de projeto | | | | **X** | **X** | +| Configurar [merges de pull request](/articles/configuring-pull-request-merges) | | | | **X** | **X** | +| Configurar [uma fonte de publicação para {% data variables.product.prodname_pages %}](/articles/configuring-a-publishing-source-for-github-pages) | | | | **X** | **X** | +| [Manage branch protection rules](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule) | | | | | **X** | +| [Fazer push em branches protegidos](/articles/about-protected-branches) | | | | **X** | **X** | +| Fazer merge de pull requests em branches protegidos, mesmo sem revisões de aprovação | | | | | **X** |{% ifversion fpt or ghes > 3.4 or ghae-issue-6337 or ghec %} +| Create tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules) | | | | **X** | **X** | +| Delete tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules) | | | | | **X** {% endif %} -| Excluir um problema (consulte "[Excluir um problema](/articles/deleting-an-issue)") | | | | | **X** | -| Fazer merge de pull requests em branches protegidos, mesmo sem revisões de aprovação | | | | | **X** | -| [Definir os proprietários do código de um repositório](/articles/about-code-owners) | | | | | **X** | -| Adicionar um repositório a uma equipe (consulte "[Gerenciar o acesso da equipe ao repositório de uma organização](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" para obter informações) | | | | | **X** | -| [Gerenciar o acesso dos colaboradores externos a um repositório](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | -| [Alterar a visibilidade de um repositório](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | -| Criar um modelo de repositório (consulte "[Criar um modelo de repositório](/articles/creating-a-template-repository)") | | | | | **X** | -| Alterar as configurações do repositório | | | | | **X** | -| Gerenciar o acesso de equipe e de colaborador ao repositório | | | | | **X** | -| Editar o branch padrão do repositório | | | | | **X** | -| Renomeie o branch padrão do repositório (veja "[Renomear um branch](/github/administering-a-repository/renaming-a-branch)") | | | | | **X** | -| Renomeie um branch diferente do branch padrão do repositório (veja "[Renomear um branch](/github/administering-a-repository/renaming-a-branch)") | | | **X** | **X** | **X** | -| Gerenciar webhooks e chaves de implantação | | | | | **X** |{% ifversion fpt or ghec %} -| [Gerenciar as configurações do uso de dados para seu repositório privado](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository) | | | | | **X** +| [Criar e editar cartões sociais do repositório](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% ifversion fpt or ghec %} +| Limitar [interações em um repositório](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository) | | | | **X** | **X** {% endif %} -| [Gerenciar a política de bifurcação de um repositório](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | -| [Transferir repositório na organização](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | -| [Excluir ou transferir repositórios na organização](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | -| [Arquivar repositórios](/articles/about-archiving-repositories) | | | | | **X** |{% ifversion fpt or ghec %} -| Exibir um botão de patrocinador (consulte "[Exibir um botão de patrocinador no seu repositório](/articles/displaying-a-sponsor-button-in-your-repository)") | | | | | **X** +| Excluir um problema (consulte "[Excluir um problema](/articles/deleting-an-issue)") | | | | | **X** | +| [Definir os proprietários do código de um repositório](/articles/about-code-owners) | | | | | **X** | +| Adicionar um repositório a uma equipe (consulte "[Gerenciar o acesso da equipe ao repositório de uma organização](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" para obter informações) | | | | | **X** | +| [Gerenciar o acesso dos colaboradores externos a um repositório](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | +| [Alterar a visibilidade de um repositório](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | +| Criar um modelo de repositório (consulte "[Criar um modelo de repositório](/articles/creating-a-template-repository)") | | | | | **X** | +| Alterar as configurações do repositório | | | | | **X** | +| Gerenciar o acesso de equipe e de colaborador ao repositório | | | | | **X** | +| Editar o branch padrão do repositório | | | | | **X** | +| Renomeie o branch padrão do repositório (veja "[Renomear um branch](/github/administering-a-repository/renaming-a-branch)") | | | | | **X** | +| Renomeie um branch diferente do branch padrão do repositório (veja "[Renomear um branch](/github/administering-a-repository/renaming-a-branch)") | | | **X** | **X** | **X** | +| Gerenciar webhooks e chaves de implantação | | | | | **X** |{% ifversion fpt or ghec %} +| [Gerenciar as configurações do uso de dados para seu repositório privado](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository) | | | | | **X** {% endif %} -| Crie referências autolink para recursos externos, como Jira ou Zendesk (consulte "[Configurando links automáticos para fazer referência a recursos externos](/articles/configuring-autolinks-to-reference-external-resources)") | | | | | **X** |{% ifversion fpt or ghec %} -| [Habilitar {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository) em um repositório | | | | **X** | **X** | -| [Criar e editar categorias](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository) para {% data variables.product.prodname_discussions %} | | | | **X** | **X** | -| [Mover uma discussão para uma categoria diferente](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [Transferir uma discussão](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) para um novo repositório | | | **X** | **X** | **X** | -| [Gerenciar discussões fixadas](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [Converter problemas para discussões em massa](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | -| [Bloquear e desbloquear discussões](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | -| [Converter individualmente problemas em discussões](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | -| [Criar novas discussões e comentar em discussões existentes](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion) | **X** | **X** | **X** | **X** | **X** | -| [Excluir uma discussão](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} -| Crie [codespaces](/codespaces/about-codespaces) | | | **X** | **X** | **X** +| [Gerenciar a política de bifurcação de um repositório](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** | +| [Transferir repositório na organização](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** | +| [Excluir ou transferir repositórios na organização](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** | +| [Arquivar repositórios](/articles/about-archiving-repositories) | | | | | **X** |{% ifversion fpt or ghec %} +| Exibir um botão de patrocinador (consulte "[Exibir um botão de patrocinador no seu repositório](/articles/displaying-a-sponsor-button-in-your-repository)") | | | | | **X** +{% endif %} +| Crie referências autolink para recursos externos, como Jira ou Zendesk (consulte "[Configurando links automáticos para fazer referência a recursos externos](/articles/configuring-autolinks-to-reference-external-resources)") | | | | | **X** |{% ifversion fpt or ghec %} +| [Habilitar {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository) em um repositório | | | | **X** | **X** | +| [Criar e editar categorias](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository) para {% data variables.product.prodname_discussions %} | | | | **X** | **X** | +| [Mover uma discussão para uma categoria diferente](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [Transferir uma discussão](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) para um novo repositório | | | **X** | **X** | **X** | +| [Gerenciar discussões fixadas](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [Converter problemas para discussões em massa](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository) | | | **X** | **X** | **X** | +| [Bloquear e desbloquear discussões](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | +| [Converter individualmente problemas em discussões](/discussions/managing-discussions-for-your-community/moderating-discussions) | | **X** | **X** | **X** | **X** | +| [Criar novas discussões e comentar em discussões existentes](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion) | **X** | **X** | **X** | **X** | **X** | +| [Excluir uma discussão](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion) | | **X** | | **X** | **X** |{% endif %}{% ifversion fpt or ghec %} +| Crie [codespaces](/codespaces/about-codespaces) | | | **X** | **X** | **X** {% endif %} ### Requisitos de acesso para funcionalidades de segurança diff --git a/translations/pt-BR/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/pt-BR/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md index a2a3905773..81f1fd21a5 100644 --- a/translations/pt-BR/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md +++ b/translations/pt-BR/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md @@ -84,6 +84,8 @@ Você só pode escolher uma permissão adicional se já não estiver incluída n - **Definir limites de interação**: Restrinja temporariamente certos usuários de comentários, problemas de abertura ou criação de pull requests no seu repositório público para aplicar um período de atividade limitada. For more information, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)." - **Set the social preview**: Add an identifying image to your repository that appears on social media platforms when your repository is linked. Para obter mais informações, consulte "[Personalizar a exibição das redes sociais do repositório](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)". - **Push commits to protected branches**: Push to a branch that is marked as a protected branch. +- **Create protected tags**: Create tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)." +- **Delete protected tags**: Delete tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)." ### Segurança diff --git a/translations/pt-BR/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/translations/pt-BR/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md index fc1bdf29d4..3954d17881 100644 --- a/translations/pt-BR/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md +++ b/translations/pt-BR/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md @@ -22,8 +22,6 @@ Se você habilitar em vez de aplicar o SAML SSO, os integrantes da organização {% data reusables.saml.saml-disabled-linked-identities-removed %} -{% data reusables.saml.cannot-update-existing-saml-settings %} - ## Habilitar e testar logon único de SAML para sua organização Antes de aplicar o SAML SSO na sua organização, certifique-se de preparar a organização. Para obter mais informações, consulte "[Preparar para aplicar logon único de SAML na organização](/articles/preparing-to-enforce-saml-single-sign-on-in-your-organization)". diff --git a/translations/pt-BR/content/packages/index.md b/translations/pt-BR/content/packages/index.md index f0af0ebf6f..b62a3fe911 100644 --- a/translations/pt-BR/content/packages/index.md +++ b/translations/pt-BR/content/packages/index.md @@ -12,11 +12,11 @@ featuredLinks: - /packages/learn-github-packages/installing-a-package popular: - /packages/working-with-a-github-packages-registry/working-with-the-npm-registry - - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' + - '{% ifversion fpt or ghec%}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' - /packages/learn-github-packages - /packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry guideCards: - - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' + - '{% ifversion fpt or ghec %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}' - /packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry changelog: label: packages diff --git a/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md new file mode 100644 index 0000000000..8f4c1be0b9 --- /dev/null +++ b/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md @@ -0,0 +1,27 @@ +--- +title: Configuring tag protection rules +shortTitle: Configure tag rules +intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags. +versions: + fpt: '*' + ghes: '>3.4' + ghae: issue-6337 + ghec: '*' +--- + +{% note %} + +**Note:** Tag protection rules are currently in beta and subject to change. + +{% endnote %} + +When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. Para obter mais informações, consulte "[Funções do repositório para uma organização](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)". + +Additionally, you can create custom repository roles to allow other groups of users to create or delete tags that match tag protection rules. Para obter mais informações, consulte "[Gerenciando as funções de repositórios personalizados para uma organização](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)". + +{% data reusables.repositories.navigate-to-repo %} +{% data reusables.repositories.sidebar-settings %} +1. In the "Code and automation" section of the sidebar, click **{% octicon "tag" aria-label="The tag icon" %} Tags**. +1. Click **New rule**. ![New tag protection rule](/assets/images/help/repository/new-tag-protection-rule.png) +1. Under "Tag name pattern", type the pattern of the tags you want to protect. In this example, typing "\*" protects all tags. ![Set tag protection pattern](/assets/images/help/repository/set-tag-protection-pattern.png) +1. Click **Add rule**. ![Add tag protection rule](/assets/images/help/repository/add-tag-protection-rule.png) diff --git a/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md b/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md index 27c1e80c0f..73f46360f5 100644 --- a/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md +++ b/translations/pt-BR/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md @@ -17,6 +17,7 @@ children: - /enabling-anonymous-git-read-access-for-a-repository - /about-email-notifications-for-pushes-to-your-repository - /configuring-autolinks-to-reference-external-resources + - /configuring-tag-protection-rules shortTitle: Gerenciar as configurações do repositório --- diff --git a/translations/pt-BR/data/reusables/actions/actions-on-examples.md b/translations/pt-BR/data/reusables/actions/actions-on-examples.md index 80c7fc67d2..0665afebfa 100644 --- a/translations/pt-BR/data/reusables/actions/actions-on-examples.md +++ b/translations/pt-BR/data/reusables/actions/actions-on-examples.md @@ -1,8 +1,8 @@ -### Using a single event +### Usando um evento único {% data reusables.actions.on-single-example %} -### Using multiple events +### Usando eventos múltiplos {% data reusables.actions.on-multiple-example %} @@ -10,10 +10,10 @@ {% data reusables.actions.actions-activity-types %} -### Using filters +### Usando filtros {% data reusables.actions.actions-filters %} -### Using activity types and filters with multiple events +### Usando tipos de atividade e filtros com vários eventos {% data reusables.actions.actions-multiple-types %} \ No newline at end of file diff --git a/translations/pt-BR/data/reusables/actions/runner-group-assign-policy-repo.md b/translations/pt-BR/data/reusables/actions/runner-group-assign-policy-repo.md index 442d41f2bc..fdc969a5b6 100644 --- a/translations/pt-BR/data/reusables/actions/runner-group-assign-policy-repo.md +++ b/translations/pt-BR/data/reusables/actions/runner-group-assign-policy-repo.md @@ -1,3 +1,3 @@ 1. Insira um nome para o seu grupo de executor e atribua uma política para acesso ao repositório. - You can configure a runner group to be accessible to a specific list of repositories, or to all repositories in the organization.{% ifversion ghec or ghes %} By default, only private repositories can access runners in a runner group, but you can override this. Esta configuração não pode ser substituída se configurar o grupo de executores da organização que foi compartilhado por uma empresa.{% endif %} + É possível configurar o grupo de um executor para ser acessível a uma lista específica de repositórios ou a todos os repositórios na organização.{% ifversion ghec or ghes %} Por padrão, apenas repositórios privados podem acessar executores no grupo do executor, mas você pode substituir isso. Esta configuração não pode ser substituída se configurar o grupo de executores da organização que foi compartilhado por uma empresa.{% endif %} diff --git a/translations/pt-BR/data/reusables/actions/self-hosted-runner-add-to-enterprise.md b/translations/pt-BR/data/reusables/actions/self-hosted-runner-add-to-enterprise.md index ebdc046ddb..b86edf19a7 100644 --- a/translations/pt-BR/data/reusables/actions/self-hosted-runner-add-to-enterprise.md +++ b/translations/pt-BR/data/reusables/actions/self-hosted-runner-add-to-enterprise.md @@ -6,7 +6,7 @@ 1. Clique em **Novo executor**. {% data reusables.actions.self-hosted-runner-configure %} {%- elsif ghae or ghes < 3.4 %} -To add a self-hosted runner to an enterprise, you must be an enterprise owner. +Para adicionar um executor auto-hospedado a uma empresa, você deve ser um proprietário corporativo. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} {% data reusables.enterprise-accounts.actions-tab %} diff --git a/translations/pt-BR/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md b/translations/pt-BR/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md index 732207d34a..c7b395805c 100644 --- a/translations/pt-BR/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md +++ b/translations/pt-BR/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md @@ -1 +1 @@ -Por exemplo, você pode permitir o acesso somente a partir do endereço IP da rede do escritório. A lista de permissão para endereços IP irá bloquear o acesso através da web, API, e Git de qualquer endereço IP que não esteja na lista de permissões. +Por exemplo, você pode permitir o acesso somente a partir do endereço IP da rede do escritório. The allow list for IP addresses will block access to private resources via the web, API, and Git from any IP addresses that are not on the allow list. diff --git a/translations/pt-BR/data/reusables/saml/cannot-update-existing-saml-settings.md b/translations/pt-BR/data/reusables/saml/cannot-update-existing-saml-settings.md deleted file mode 100644 index 22983550ed..0000000000 --- a/translations/pt-BR/data/reusables/saml/cannot-update-existing-saml-settings.md +++ /dev/null @@ -1,5 +0,0 @@ -{% note %} - -**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings. - -{% endnote %} diff --git a/translations/pt-BR/data/reusables/scim/emu-scim-rate-limit.md b/translations/pt-BR/data/reusables/scim/emu-scim-rate-limit.md new file mode 100644 index 0000000000..f6317a7545 --- /dev/null +++ b/translations/pt-BR/data/reusables/scim/emu-scim-rate-limit.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** To avoid exceeding the rate limit on {% data variables.product.product_name %}, do not assign more than 1,000 users per hour to the IdP application. If you use groups to assign users to the IdP application, do not add more than 100 users to each group per hour. If you exceed these thresholds, attempts to provision users may fail with a "rate limit" error. + +{% endnote %} \ No newline at end of file From 1a78b501bd232195acf1092cb1cbeb90ae3746b1 Mon Sep 17 00:00:00 2001 From: Emma Makinson Date: Tue, 8 Mar 2022 09:19:47 +0000 Subject: [PATCH 16/41] Updates short title for tag protection rules (#26000) Update short titles --- .../configuring-tag-protection-rules.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md index 37dbc4337d..d93375f5d5 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md @@ -1,6 +1,6 @@ --- title: Configuring tag protection rules -shortTitle: Configure tag rules +shortTitle: Tag protection rules intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags. product: '{% data reusables.gated-features.tag-protection-rules %}' versions: From 8df7530f4abee1dce1239de63b6366d8a727d860 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:22:33 +0000 Subject: [PATCH 17/41] remove article (#26006) --- content/code-security/guides.md | 1 - .../about-dependabot-version-updates.md | 1 + .../index.md | 1 - ...pendabotcom-to-github-native-dependabot.md | 54 ------------------- 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md diff --git a/content/code-security/guides.md b/content/code-security/guides.md index b7cdd7db56..43a3da3bbf 100644 --- a/content/code-security/guides.md +++ b/content/code-security/guides.md @@ -67,7 +67,6 @@ includeGuides: - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies diff --git a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md index 74a407f85c..0a2e98654a 100644 --- a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md +++ b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md @@ -7,6 +7,7 @@ redirect_from: - /github/administering-a-repository/about-github-dependabot-version-updates - /github/administering-a-repository/about-dependabot-version-updates - /code-security/supply-chain-security/about-dependabot-version-updates + - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot versions: fpt: '*' ghec: '*' diff --git a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md index 1c04b588f6..e01e8e1116 100644 --- a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md +++ b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md @@ -15,7 +15,6 @@ topics: - Pull requests children: - /about-dependabot-version-updates - - /upgrading-from-dependabotcom-to-github-native-dependabot - /enabling-and-disabling-dependabot-version-updates - /listing-dependencies-configured-for-version-updates - /managing-pull-requests-for-dependency-updates diff --git a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md b/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md deleted file mode 100644 index 8439c9df42..0000000000 --- a/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -title: Upgrading from Dependabot.com to GitHub-native Dependabot -intro: You can upgrade to GitHub-native Dependabot by merging a pull request that will allow your dependencies to continue being updated. -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Repositories - - Dependabot - - Version updates - - Dependencies -redirect_from: - - /code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot -shortTitle: Dependabot.com upgrades ---- -{% warning %} - -Dependabot Preview has been shut down as of August 3rd, 2021. In order to keep getting Dependabot updates, please migrate to GitHub-native Dependabot. - -Open pull requests from Dependabot Preview will remain open, including the pull request to upgrade to GitHub-native Dependabot, but the bot itself will no longer work on your {% data variables.product.prodname_dotcom %} accounts and organizations. - -{% endwarning %} - -## About upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -Dependabot Preview has been built directly into {% data variables.product.prodname_dotcom %}, so you can use {% data variables.product.prodname_dependabot %} alongside all the other functionality in {% data variables.product.prodname_dotcom %} without having to install and use a separate application. By migrating to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, we can also focus on bringing lots of exciting new features to {% data variables.product.prodname_dependabot %}, including more [ecosystem updates](https://github.com/github/roadmap/issues/150), [improved notifications](https://github.com/github/roadmap/issues/133), and {% data variables.product.prodname_dependabot %} support for [{% data variables.product.prodname_ghe_server %}](https://github.com/github/roadmap/issues/86) and [{% data variables.product.prodname_ghe_managed %}](https://github.com/github/roadmap/issues/135). - -## Differences between Dependabot Preview and {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -While most of the Dependabot Preview features exist in {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, a few remain unavailable: -- **Live updates:** We hope to bring these back in the future. For now, you can run {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_dependabot %} daily to catch new packages within one day of release. -- **PHP environment variable registries:** For projects that rely on the `ACF_PRO_KEY` environment variable, you may be able to vendor your licensed copy of the Advanced Custom Fields plugin. For an example, see [dependabot/acf-php-example](https://github.com/dependabot/acf-php-example#readme). For other environment variables, you can use {% data variables.product.prodname_actions %} to fetch dependencies from these registries. -- **Auto-merge:** We always recommend verifying your dependencies before merging them; therefore, auto-merge will not be supported for the foreseeable future. For those of you who have vetted your dependencies, or are only using internal dependencies, we recommend adding third-party auto-merge apps, or setting up GitHub Actions to merge. We have provided the [`dependabot/fetch-metadata`](https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs) action to help developers [enable GitHub's automerge](https://github.com/dependabot/fetch-metadata/#enabling-auto-merge). - -In {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, you can configure all version updates using the configuration file. This file is similar to the Dependabot Preview configuration file with a few changes and improvements that will be automatically included in your upgrade pull request. For more information about the upgrade pull request, see "[Upgrading to GitHub-native Dependabot](/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot#upgrading-to-github-native-dependabot)". - -To see update logs for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} that were previously on the Dependabot.com dashboard: - - 1. Navigate to your repository’s **Insights** page. - 2. Click **Dependency graph** to the left. - 3. Click **{% data variables.product.prodname_dependabot %}**. - -For more information about version updates with {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, see "[About Dependabot version updates](/code-security/supply-chain-security/about-dependabot-version-updates)." - -## Upgrading to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} - -Upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} requires you to merge the *Upgrade to GitHub-native Dependabot* pull request in your repository. This pull request includes the updated configuration file needed for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}. - -If you are using private repositories, you will have to grant Dependabot access to these repositories in your organization's security and analysis settings. For more information, see "[Allowing Dependabot to access private dependencies](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)". Previously, Dependabot had access to all repositories within an organization, but we implemented this change because it is much safer to use the principle of least privilege for Dependabot. - -If you are using private registries, you will have to add your existing Dependabot Preview secrets to your repository's or organization's "Dependabot secrets". For more information, see "[Managing encrypted secrets for Dependabot](/code-security/supply-chain-security/managing-encrypted-secrets-for-dependabot)". - -If you have any questions or need help migrating, you can view or open issues in the [`dependabot/dependabot-core`](https://github.com/dependabot/dependabot-core/issues/new?assignees=%40dependabot%2Fpreview-migration-reviewers&labels=E%3A+preview-migration&template=migration-issue.md&title=) repository. From 8ecfaf9dc0f912930eafdf9a40a812159da352e9 Mon Sep 17 00:00:00 2001 From: hubwriter Date: Tue, 8 Mar 2022 17:07:14 +0000 Subject: [PATCH 18/41] Fix missing word typo (#26008) --- .../enabling-codespaces-for-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md b/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md index 1fa7c620fb..b3993760f1 100644 --- a/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md +++ b/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md @@ -24,7 +24,7 @@ Organization owners can control which users in your organization can create and To use codespaces in your organization, you must do the following: - Ensure that users have [at least write access](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to the repositories where they want to use a codespace. -- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users. +- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose to allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users. - [Set a spending limit](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces) - Ensure that your organization does not have an IP address allow list enabled. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." From 1a6bee46014b5ca29ee6673464883108a119cd12 Mon Sep 17 00:00:00 2001 From: Grace Park Date: Tue, 8 Mar 2022 10:00:38 -0800 Subject: [PATCH 19/41] Refactor to add RestReferencePage (#25781) * refactor to add RestReferencePage * remove structured data from article page * add back clientsidehightlight js and remove structuredcontent * update endpoint available for github apps page to use RestReferencePage * check for minitocs * use children for ArticlePage for overview endpoints page and move category data to RestReferencePage * create MiniTocs component * add MiniTocs * fix unique key issue * break into out into own div * remove some unnecessary ts * refactor looping section * simplify markdown component usage * add key prop * add key prop * add unique key Co-authored-by: Rachael Sewell --- components/article/ArticlePage.tsx | 106 +----------- .../rest/RestParameterTable.module.scss | 4 + components/rest/RestReferencePage.tsx | 159 ++++++++++++++++++ components/rest/types.ts | 4 + components/ui/MiniTocs/MiniTocs.tsx | 52 ++++++ components/ui/MiniTocs/index.ts | 1 + .../endpoints-available-for-github-apps.tsx | 19 ++- .../[versionId]/rest/reference/[category].tsx | 62 ++----- 8 files changed, 250 insertions(+), 157 deletions(-) create mode 100644 components/rest/RestReferencePage.tsx create mode 100644 components/ui/MiniTocs/MiniTocs.tsx create mode 100644 components/ui/MiniTocs/index.ts diff --git a/components/article/ArticlePage.tsx b/components/article/ArticlePage.tsx index 03abe8df19..7ce139d096 100644 --- a/components/article/ArticlePage.tsx +++ b/components/article/ArticlePage.tsx @@ -1,8 +1,6 @@ -import { useState, useEffect, ReactNode } from 'react' +import { useState, useEffect } from 'react' import { useRouter } from 'next/router' import dynamic from 'next/dynamic' -import cx from 'classnames' -import { ActionList, Heading } from '@primer/react' import { ZapIcon, InfoIcon, ShieldLockIcon } from '@primer/octicons-react' import { Callout } from 'components/ui/Callout' @@ -10,7 +8,7 @@ import { Callout } from 'components/ui/Callout' import { Link } from 'components/Link' import { DefaultLayout } from 'components/DefaultLayout' import { ArticleTitle } from 'components/article/ArticleTitle' -import { MiniTocItem, useArticleContext } from 'components/context/ArticleContext' +import { useArticleContext } from 'components/context/ArticleContext' import { useTranslation } from 'components/hooks/useTranslation' import { LearningTrackNav } from './LearningTrackNav' import { MarkdownContent } from 'components/ui/MarkdownContent' @@ -18,10 +16,8 @@ import { Lead } from 'components/ui/Lead' import { ArticleGridLayout } from './ArticleGridLayout' import { PlatformPicker } from 'components/article/PlatformPicker' import { ToolPicker } from 'components/article/ToolPicker' +import { MiniTocs } from 'components/ui/MiniTocs' -const ClientSideRedirectExceptions = dynamic(() => import('./ClientsideRedirectExceptions'), { - ssr: false, -}) const ClientSideHighlightJS = dynamic(() => import('./ClientSideHighlightJS'), { ssr: false }) // Mapping of a "normal" article to it's interactive counterpart @@ -49,12 +45,11 @@ const interactiveAlternatives: Record = { href: '/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces?langId=py', }, } - -export type StructuredContentT = { - structuredContent?: ReactNode +type Props = { + children?: React.ReactNode } -export const ArticlePage = ({ structuredContent }: StructuredContentT) => { +export const ArticlePage = ({ children }: Props) => { const { asPath } = useRouter() const { title, @@ -69,58 +64,9 @@ export const ArticlePage = ({ structuredContent }: StructuredContentT) => { miniTocItems, currentLearningTrack, } = useArticleContext() - const renderedContent = structuredContent || renderedPage const { t } = useTranslation('pages') const currentPath = asPath.split('?')[0] - const renderTocItem = (item: MiniTocItem) => { - return ( - -
-
- {item.items && item.items.length > 0 ? ( -
    {item.items.map(renderTocItem)}
- ) : null} -
- - ) - } - - // We have some one-off redirects for rest api docs - // currently those are limited to the repos page, but - // that will grow soon as we restructure the rest api docs. - // This is a workaround to updating the hardcoded links - // directly in the REST API code in a separate repo, which - // requires many file changes and teams to sign off. - // While the organization is turbulent, we can do this. - // Once it's more settled, we can refactor the rest api code - // to leverage the OpenAPI urls rather than hardcoded urls. - // The code below determines if we should bother loading this redirecting - // component at all. - // The reason this isn't done at the server-level is because there you - // can't possibly access the URL hash. That's only known in client-side - // code. - const [loadClientsideRedirectExceptions, setLoadClientsideRedirectExceptions] = useState(false) - useEffect(() => { - const { hash, pathname } = window.location - // Today, Jan 2022, it's known explicitly what the pathname. - // In the future there might be more. - // Hopefully, we can some day delete all of this and no longer - // be dependent on the URL hash to do the redirect. - if ( - hash && - (pathname.endsWith('/rest/reference/repos') || - pathname.endsWith('/rest/reference/enterprise-admin')) - ) { - setLoadClientsideRedirectExceptions(true) - } - }, []) - // If the page contains `[data-highlight]` blocks, these pages need // syntax highlighting. But not every page needs it, so it's conditionally // lazy-loaded on the client. @@ -139,29 +85,8 @@ export const ArticlePage = ({ structuredContent }: StructuredContentT) => { // consecutive one does. }, [asPath]) - // Scrollable code blocks in our REST API docs and elsewhere aren't accessible - // via keyboard navigation without setting tabindex="0". But we don't want to set - // this attribute on every `
` code block, only the ones where there are scroll
-  // bars because the content isn't all visible.
-  useEffect(() => {
-    const codeBlocks = document.querySelectorAll('pre')
-
-    codeBlocks.forEach((codeBlock) => {
-      if (
-        codeBlock.scrollWidth > codeBlock.clientWidth ||
-        codeBlock.scrollHeight > codeBlock.clientHeight
-      ) {
-        codeBlock.setAttribute('tabindex', '0')
-      }
-    })
-  }, [])
-
   return (
     
-      {/* Doesn't matter *where* this is included because it will
-      never render anything. It always just return null. */}
-      {loadClientsideRedirectExceptions && }
-
       {/* Doesn't matter *where* this is included because it will
       never render anything. It always just return null. */}
       {lazyLoadHighlightJS && }
@@ -220,28 +145,13 @@ export const ArticlePage = ({ structuredContent }: StructuredContentT) => {
)} {miniTocItems.length > 1 && ( - <> - - {t('miniToc')} - - - { - return { - key: title + i, - text: title, - renderItem: () =>
    {renderTocItem(items)}
, - } - })} - /> - + )} } >
- {renderedContent} + {children || renderedPage} {effectiveDate && (
Effective as of:{' '} diff --git a/components/rest/RestParameterTable.module.scss b/components/rest/RestParameterTable.module.scss index 4796e0d9ed..c2e7237c9f 100644 --- a/components/rest/RestParameterTable.module.scss +++ b/components/rest/RestParameterTable.module.scss @@ -24,6 +24,10 @@ } tbody { + tr td { + width: auto; + } + tr td:first-child { font-weight: bold; } diff --git a/components/rest/RestReferencePage.tsx b/components/rest/RestReferencePage.tsx new file mode 100644 index 0000000000..d215453786 --- /dev/null +++ b/components/rest/RestReferencePage.tsx @@ -0,0 +1,159 @@ +import { useState, useEffect } from 'react' +import { useRouter } from 'next/router' +import dynamic from 'next/dynamic' + +import { DefaultLayout } from 'components/DefaultLayout' +import { ArticleTitle } from 'components/article/ArticleTitle' +import { useMainContext } from 'components/context/MainContext' +import { MarkdownContent } from 'components/ui/MarkdownContent' +import { Lead } from 'components/ui/Lead' +import { ArticleGridLayout } from 'components/article/ArticleGridLayout' +import { MiniTocItem } from 'components/context/ArticleContext' +import { RestCategoryOperationsT } from './types' +import { RestOperation } from './RestOperation' +import { MiniTocs } from 'components/ui/MiniTocs' + +const ClientSideHighlightJS = dynamic(() => import('components/article/ClientSideHighlightJS'), { + ssr: false, +}) + +const ClientSideRedirectExceptions = dynamic( + () => import('components/article/ClientsideRedirectExceptions'), + { + ssr: false, + } +) + +export type StructuredContentT = { + descriptions: any + introContent: string + restOperations: RestCategoryOperationsT + miniTocItems?: MiniTocItem[] +} + +export const RestReferencePage = ({ + descriptions, + introContent, + restOperations, + miniTocItems, +}: StructuredContentT) => { + const { asPath } = useRouter() + const { page } = useMainContext() + const subcategories = Object.keys(restOperations) + + // We have some one-off redirects for rest api docs + // currently those are limited to the repos page, but + // that will grow soon as we restructure the rest api docs. + // This is a workaround to updating the hardcoded links + // directly in the REST API code in a separate repo, which + // requires many file changes and teams to sign off. + // While the organization is turbulent, we can do this. + // Once it's more settled, we can refactor the rest api code + // to leverage the OpenAPI urls rather than hardcoded urls. + // The code below determines if we should bother loading this redirecting + // component at all. + // The reason this isn't done at the server-level is because there you + // can't possibly access the URL hash. That's only known in client-side + // code. + const [loadClientsideRedirectExceptions, setLoadClientsideRedirectExceptions] = useState(false) + useEffect(() => { + const { hash, pathname } = window.location + // Today, Jan 2022, it's known explicitly what the pathname. + // In the future there might be more. + // Hopefully, we can some day delete all of this and no longer + // be dependent on the URL hash to do the redirect. + if ( + hash && + (pathname.endsWith('/rest/reference/repos') || + pathname.endsWith('/rest/reference/enterprise-admin')) + ) { + setLoadClientsideRedirectExceptions(true) + } + }, []) + + // Scrollable code blocks in our REST API docs and elsewhere aren't accessible + // via keyboard navigation without setting tabindex="0". But we don't want to set + // this attribute on every `
` code block, only the ones where there are scroll
+  // bars because the content isn't all visible.
+  useEffect(() => {
+    const codeBlocks = document.querySelectorAll('pre')
+
+    codeBlocks.forEach((codeBlock) => {
+      if (
+        codeBlock.scrollWidth > codeBlock.clientWidth ||
+        codeBlock.scrollHeight > codeBlock.clientHeight
+      ) {
+        codeBlock.setAttribute('tabindex', '0')
+      }
+    })
+  }, [])
+
+  // If the page contains `[data-highlight]` blocks, these pages need
+  // syntax highlighting. But not every page needs it, so it's conditionally
+  // lazy-loaded on the client.
+  const [lazyLoadHighlightJS, setLazyLoadHighlightJS] = useState(false)
+  useEffect(() => {
+    // It doesn't need to use querySelector because all we care about is if
+    // there is greater than zero of these in the DOM.
+    // Note! This "core selector", which determines whether to bother
+    // or not, needs to match what's used inside ClientSideHighlightJS.tsx
+    if (document.querySelector('[data-highlight]')) {
+      setLazyLoadHighlightJS(true)
+    }
+
+    // Important to depend on the current path because the first page you
+    // load, before any client-side navigation, might not need it, but the
+    // consecutive one does.
+  }, [asPath])
+
+  return (
+    
+      {/* Doesn't matter *where* this is included because it will
+      never render anything. It always just return null. */}
+      {loadClientsideRedirectExceptions && }
+      {lazyLoadHighlightJS && }
+
+      

+        {page.title}}
+          intro={
+            <>
+              {page.introPlainText && (
+                
+                  {page.introPlainText}
+                
+              )}
+            
+          }
+          toc={
+            <>
+              {miniTocItems && miniTocItems.length > 1 && (
+                
+              )}
+            
+          }
+        >
+          

+            

+          

+          

+            
+              {subcategories.map((subcategory, index) => (
+                

+                  

+                  {restOperations[subcategory].map((operation, index) => (
+                    
+                  ))}
+                

+              ))}
+            
+          

+        
+      

+    
+  )
+}
diff --git a/components/rest/types.ts b/components/rest/types.ts
index f3507435a1..e647246a29 100644
--- a/components/rest/types.ts
+++ b/components/rest/types.ts
@@ -69,3 +69,7 @@ export interface ChildParameter {
   description: string
   type: string
 }
+
+export interface RestCategoryOperationsT {
+  [subcategory: string]: Operation[]
+}
diff --git a/components/ui/MiniTocs/MiniTocs.tsx b/components/ui/MiniTocs/MiniTocs.tsx
new file mode 100644
index 0000000000..bdc3c4dc9d
--- /dev/null
+++ b/components/ui/MiniTocs/MiniTocs.tsx
@@ -0,0 +1,52 @@
+import cx from 'classnames'
+import { ActionList, Heading } from '@primer/react'
+
+import { MiniTocItem } from 'components/context/ArticleContext'
+import { Link } from 'components/Link'
+import { useTranslation } from 'components/hooks/useTranslation'
+
+export type MiniTocsPropsT = {
+  pageTitle: string
+  miniTocItems: MiniTocItem[]
+}
+
+const renderTocItem = (item: MiniTocItem) => {
+  return (
+    
+      

+        

+        {item.items && item.items.length > 0 ? (
+          
    {item.items.map(renderTocItem)}

+        ) : null}
+      

+    
+  )
+}
+
+export function MiniTocs({ pageTitle, miniTocItems }: MiniTocsPropsT) {
+  const { t } = useTranslation('pages')
+
+  return (
+    <>
+      
+        {t('miniToc')}
+      
+
+       {
+          return {
+            key: pageTitle + i,
+            text: pageTitle,
+            renderItem: () => 
    {renderTocItem(items)}
,
+          }
+        })}
+      />
+    
+  )
+}
diff --git a/components/ui/MiniTocs/index.ts b/components/ui/MiniTocs/index.ts
new file mode 100644
index 0000000000..5a781611a8
--- /dev/null
+++ b/components/ui/MiniTocs/index.ts
@@ -0,0 +1 @@
+export { MiniTocs } from './MiniTocs'
diff --git a/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx b/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx
index 2b1a69a76f..26173afc8b 100644
--- a/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx
+++ b/pages/[versionId]/rest/overview/endpoints-available-for-github-apps.tsx
@@ -1,14 +1,15 @@
 import { GetServerSideProps } from 'next'
+import { Fragment } from 'react'
 import { useRouter } from 'next/router'
 import { MainContextT, MainContext, getMainContext } from 'components/context/MainContext'
-import {
-  getArticleContextFromRequest,
-  ArticleContextT,
-  ArticleContext,
-} from 'components/context/ArticleContext'
-import { ArticlePage } from 'components/article/ArticlePage'
 import { Link } from 'components/Link'
 import { getEnabledForApps } from 'lib/rest/index.js'
+import { ArticlePage } from 'components/article/ArticlePage'
+import {
+  ArticleContext,
+  ArticleContextT,
+  getArticleContextFromRequest,
+} from 'components/context/ArticleContext'
 
 type OperationT = {
   slug: string
@@ -36,7 +37,7 @@ export default function Category({ mainContext, enabledForApps, articleContext }
   const { locale } = useRouter()
 
   const content = Object.entries(enabledForApps).map(([category, operations]) => (
-    

+    
       {operations.length > 0 && (
         

           {category}
@@ -53,13 +54,13 @@ export default function Category({ mainContext, enabledForApps, articleContext }
           
         ))}
       
-    

+    
   ))
 
   return (
     
       
-        
+        {content}
       
     
   )
diff --git a/pages/[versionId]/rest/reference/[category].tsx b/pages/[versionId]/rest/reference/[category].tsx
index 9812673e92..87dd2ba0e1 100644
--- a/pages/[versionId]/rest/reference/[category].tsx
+++ b/pages/[versionId]/rest/reference/[category].tsx
@@ -1,19 +1,9 @@
 import { GetServerSideProps } from 'next'
 import { MainContextT, MainContext, getMainContext } from 'components/context/MainContext'
 import getRest, { getRestOperationData } from 'lib/rest/index.js'
-import { RestOperation } from 'components/rest/RestOperation'
-import { Operation } from 'components/rest/types'
-import {
-  getArticleContextFromRequest,
-  ArticleContextT,
-  ArticleContext,
-  MiniTocItem,
-} from 'components/context/ArticleContext'
-import { ArticlePage } from 'components/article/ArticlePage'
-
-type RestCategoryOperationsT = {
-  [subcategory: string]: Operation[]
-}
+import { RestCategoryOperationsT } from 'components/rest/types'
+import { MiniTocItem } from 'components/context/ArticleContext'
+import { RestReferencePage } from 'components/rest/RestReferencePage'
 
 type RestOperationsT = {
   [version: string]: {
@@ -41,7 +31,7 @@ type Props = {
   mainContext: MainContextT
   restOperations: RestCategoryOperationsT
   descriptions: { [subcategory: string]: string }
-  articleContext: ArticleContextT
+  miniTocItems: MiniTocItem[]
   introContent: string
 }
 
@@ -50,39 +40,19 @@ let restOperationData: RestDataT | null = null
 
 export default function Category({
   mainContext,
-  articleContext,
   restOperations,
   descriptions,
+  miniTocItems,
   introContent,
 }: Props) {
-  const subcategories = Object.keys(restOperations)
-
-  const operations = subcategories.map((subcategory, index: number) => {
-    const operations = restOperations[subcategory].map((operation: Operation, index: number) => (
-      
-    ))
-    return (
-      

-        

-        {operations}
-      

-    )
-  })
-
-  // This is Markdown content at the path
-  // data/reusables/rest-reference//
-  // that doesn't map directory to a group of operations.
-  operations.unshift(
-    

-      

-    

-  )
-
   return (
     
-      
-        
-      
+      
     
   )
 }
@@ -130,20 +100,12 @@ export const getServerSideProps: GetServerSideProps = async (context) =>
     )) as CategoryDataT
   }
 
-  // Because the Markdown page in the content/rest/reference directory
-  // is only metadata, the miniTocItems and renderedPage properties
-  // are undefined. We need to populate those properties with the static
-  // data read from the decorated schema files.
-  const articleContext = getArticleContextFromRequest(req)
-  articleContext.miniTocItems =
-    restOperationData[currentLanguage][currentVersion][category].miniTocItems
-
   return {
     props: {
       restOperations,
       mainContext: getMainContext(req, res),
       descriptions: restOperationData[currentLanguage][currentVersion][category].descriptions,
-      articleContext: articleContext,
+      miniTocItems: restOperationData[currentLanguage][currentVersion][category].miniTocItems,
       introContent: restOperationData[currentLanguage][currentVersion][category].introContent,
     },
   }

From 3aa1b1f74cff413aac6928936ee3acd2d7e512b3 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson 
Date: Tue, 8 Mar 2022 13:10:31 -0500
Subject: [PATCH 20/41] lazily load graphql static json files (#25981)

---
 lib/read-json-file.js                      | 31 +++++++++++++++++++
 middleware/archived-enterprise-versions.js | 36 ++--------------------
 middleware/contextualizers/graphql.js      | 32 ++++++++++---------
 3 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/lib/read-json-file.js b/lib/read-json-file.js
index c631789f32..c37fe2e73c 100644
--- a/lib/read-json-file.js
+++ b/lib/read-json-file.js
@@ -30,3 +30,34 @@ export function readCompressedJsonFileFallback(xpath) {
     }
   }
 }
+
+// Wrapper on readCompressedJsonFileFallback that initially only checks
+// if the file exists but doesn't read the content till you call it.
+export function readCompressedJsonFileFallbackLazily(xpath) {
+  const cache = new Map()
+  // This will throw if the file isn't accessible at all, e.g. ENOENT
+  // But, the file might have been replaced by one called `SAMENAME.json.br`
+  // because in staging, we ship these files compressed to make the
+  // deployment faster. So, in our file-presence check, we need to
+  // account for that.
+  try {
+    fs.accessSync(xpath)
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      try {
+        fs.accessSync(xpath + '.br')
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          throw new Error(`Neither ${xpath} nor ${xpath}.br is accessible`)
+        }
+        throw err
+      }
+    } else {
+      throw err
+    }
+  }
+  return () => {
+    if (!cache.has(xpath)) cache.set(xpath, readCompressedJsonFileFallback(xpath))
+    return cache.get(xpath)
+  }
+}
diff --git a/middleware/archived-enterprise-versions.js b/middleware/archived-enterprise-versions.js
index 056a3f65a2..5263022b79 100644
--- a/middleware/archived-enterprise-versions.js
+++ b/middleware/archived-enterprise-versions.js
@@ -1,4 +1,3 @@
-import fs from 'fs'
 import path from 'path'
 import slash from 'slash'
 import statsd from '../lib/statsd.js'
@@ -11,7 +10,7 @@ import versionSatisfiesRange from '../lib/version-satisfies-range.js'
 import isArchivedVersion from '../lib/is-archived-version.js'
 import { setFastlySurrogateKey, SURROGATE_ENUMS } from './set-fastly-surrogate-key.js'
 import got from 'got'
-import { readCompressedJsonFileFallback } from '../lib/read-json-file.js'
+import { readCompressedJsonFileFallbackLazily } from '../lib/read-json-file.js'
 import { cacheControlFactory } from './cache-control.js'
 import { pathLanguagePrefixed, languagePrefixPathRegex } from '../lib/languages.js'
 
@@ -25,42 +24,13 @@ function splitByLanguage(uri) {
   return [language, withoutLanguage]
 }
 
-function readJsonFileLazily(xpath) {
-  const cache = new Map()
-  // This will throw if the file isn't accessible at all, e.g. ENOENT
-  // But, the file might have been replaced by one called `SAMENAME.json.br`
-  // because in staging, we ship these files compressed to make the
-  // deployment faster. So, in our file-presence check, we need to
-  // account for that.
-  try {
-    fs.accessSync(xpath)
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      try {
-        fs.accessSync(xpath + '.br')
-      } catch (err) {
-        if (err.code === 'ENOENT') {
-          throw new Error(`Neither ${xpath} nor ${xpath}.br is accessible`)
-        }
-        throw err
-      }
-    } else {
-      throw err
-    }
-  }
-  return () => {
-    if (!cache.has(xpath)) cache.set(xpath, readCompressedJsonFileFallback(xpath))
-    return cache.get(xpath)
-  }
-}
-
 // These files are huge so lazy-load them. But note that the
 // `readJsonFileLazily()` function will, at import-time, check that
 // the path does exist.
-const archivedRedirects = readJsonFileLazily(
+const archivedRedirects = readCompressedJsonFileFallbackLazily(
   './lib/redirects/static/archived-redirects-from-213-to-217.json'
 )
-const archivedFrontmatterFallbacks = readJsonFileLazily(
+const archivedFrontmatterFallbacks = readCompressedJsonFileFallbackLazily(
   './lib/redirects/static/archived-frontmatter-fallbacks.json'
 )
 
diff --git a/middleware/contextualizers/graphql.js b/middleware/contextualizers/graphql.js
index 12d1974d5e..cfaa047234 100644
--- a/middleware/contextualizers/graphql.js
+++ b/middleware/contextualizers/graphql.js
@@ -1,15 +1,17 @@
-import { readCompressedJsonFileFallback } from '../../lib/read-json-file.js'
+import { readCompressedJsonFileFallbackLazily } from '../../lib/read-json-file.js'
 import { allVersions } from '../../lib/all-versions.js'
-const previews = readCompressedJsonFileFallback('./lib/graphql/static/previews.json')
-const upcomingChanges = readCompressedJsonFileFallback('./lib/graphql/static/upcoming-changes.json')
-const changelog = readCompressedJsonFileFallback('./lib/graphql/static/changelog.json')
-const prerenderedObjects = readCompressedJsonFileFallback(
+const previews = readCompressedJsonFileFallbackLazily('./lib/graphql/static/previews.json')
+const upcomingChanges = readCompressedJsonFileFallbackLazily(
+  './lib/graphql/static/upcoming-changes.json'
+)
+const changelog = readCompressedJsonFileFallbackLazily('./lib/graphql/static/changelog.json')
+const prerenderedObjects = readCompressedJsonFileFallbackLazily(
   './lib/graphql/static/prerendered-objects.json'
 )
-const prerenderedInputObjects = readCompressedJsonFileFallback(
+const prerenderedInputObjects = readCompressedJsonFileFallbackLazily(
   './lib/graphql/static/prerendered-input-objects.json'
 )
-const prerenderedMutations = readCompressedJsonFileFallback(
+const prerenderedMutations = readCompressedJsonFileFallbackLazily(
   './lib/graphql/static/prerendered-mutations.json'
 )
 
@@ -32,16 +34,16 @@ export default function graphqlContext(req, res, next) {
   const graphqlVersion = currentVersionObj.miscVersionName
 
   req.context.graphql = {
-    schemaForCurrentVersion: readCompressedJsonFileFallback(
+    schemaForCurrentVersion: readCompressedJsonFileFallbackLazily(
       `lib/graphql/static/schema-${graphqlVersion}.json`
-    ),
-    previewsForCurrentVersion: previews[graphqlVersion],
-    upcomingChangesForCurrentVersion: upcomingChanges[graphqlVersion],
-    prerenderedObjectsForCurrentVersion: prerenderedObjects[graphqlVersion],
-    prerenderedInputObjectsForCurrentVersion: prerenderedInputObjects[graphqlVersion],
-    prerenderedMutationsForCurrentVersion: prerenderedMutations[graphqlVersion],
+    )(),
+    previewsForCurrentVersion: previews()[graphqlVersion],
+    upcomingChangesForCurrentVersion: upcomingChanges()[graphqlVersion],
+    prerenderedObjectsForCurrentVersion: prerenderedObjects()[graphqlVersion],
+    prerenderedInputObjectsForCurrentVersion: prerenderedInputObjects()[graphqlVersion],
+    prerenderedMutationsForCurrentVersion: prerenderedMutations()[graphqlVersion],
     explorerUrl,
-    changelog,
+    changelog: changelog(),
   }
 
   return next()

From 181845fc875b67008212dcdc4228fbe0a108422a Mon Sep 17 00:00:00 2001
From: Laura Coursen 
Date: Tue, 8 Mar 2022 13:50:48 -0600
Subject: [PATCH 21/41] [GHEC version] Version content about exporting a list
 of people with access to a repository (#25991)

---
 ...g-people-with-access-to-your-repository.md | 19 +++++++++++++++----
 .../roles-in-an-organization.md               |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
index 359f1e4980..31b96a366c 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
@@ -1,6 +1,6 @@
 ---
 title: Viewing people with access to your repository
-intro: 'Organization owners can view people’s access to a repository within an organization. Owners of organizations using {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %} can also export a CSV list of people who have access to a repository.'
+intro: 'You can view{% ifversion ghec or ghes or ghae %} and export{% endif %} a list of people with access to a repository within an organization.'
 redirect_from:
   - /articles/viewing-people-with-access-to-your-repository
   - /github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository
@@ -13,9 +13,19 @@ topics:
   - Organizations
   - Teams
 shortTitle: View people with access
+permissions: Organization owners can view people with access to a repository.
 ---
 
-Administrators can use this information to help off-board people, gather data for compliance, and other general security checkups.
+## About the list of people with access to your repository
+
+You can use this information to help off-board people, gather data for compliance, and other general security checkups. 
+
+{% ifversion fpt %}
+Organizations that use {% data variables.product.prodname_ghe_cloud %} can also export a CSV list of people who have access to a repository. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository).
+
+{% data reusables.enterprise.link-to-ghec-trial %}
+{% endif %}
+
 {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
 ![Access management overview](/assets/images/help/repository/manage-access-overview.png)
 {% else %}
@@ -30,12 +40,13 @@ You can see a combined overview of teams and people with access to your reposito
 {% data reusables.repositories.accessing-repository-graphs %}
 {% data reusables.repositories.accessing-repository-people %}
 {% endif %}
-## Exporting a list of people with access to your repository
 
-Owners of organizations on {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %} can export a CSV list of people who have access to a repository.
+{% ifversion ghec or ghes or ghae %}
+## Exporting a list of people with access to your repository
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.accessing-repository-graphs %}
 {% data reusables.repositories.accessing-repository-people %}
 4. Click **Export CSV**.
   ![People tab in the repository sidebar](/assets/images/help/repository/export-repository-permissions.png)
+{% endif %}
\ No newline at end of file
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
index d94ef979fe..b1ae2bd8d3 100644
--- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
+++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization.md
@@ -126,8 +126,8 @@ Some of the features listed below are limited to organizations using {% data var
 | Pull (read) *all repositories* in the organization | **X** | | | **X** |
 | Push (write) and clone (copy) *all repositories* in the organization | **X** | | |  |
 | Convert organization members to [outside collaborators](#outside-collaborators) | **X** | | |  |
-| [View people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository) | **X** | | |  |
-| [Export a list of people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | |  |
+| [View people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository) | **X** | | |  |{% ifversion ghec or ghes or ghae %}
+| [Export a list of people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | |  |{% endif %}
 | Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | |  |
 | Manage default labels (see "[Managing default labels for repositories in your organization](/articles/managing-default-labels-for-repositories-in-your-organization)") | **X** | | |  |{% ifversion ghec %}
 | Enable team synchronization (see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)" for details) | **X** |  | |  |{% endif %}

From 54d1afae62a31cd56fc91420048e3f692b7859a9 Mon Sep 17 00:00:00 2001
From: Mike Surowiec 
Date: Tue, 8 Mar 2022 14:45:42 -0600
Subject: [PATCH 22/41] OS build: allow missing file types to not error in
 rsync (#26023)

* allow missing file types to not error

Co-authored-by: Peter Bengtsson 
---
 .github/workflows/azure-preview-env-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml
index a653ba63e8..98ebb266f4 100644
--- a/.github/workflows/azure-preview-env-deploy.yml
+++ b/.github/workflows/azure-preview-env-deploy.yml
@@ -163,8 +163,8 @@ jobs:
           rsync -rptovR ./user-code/assets/./**/*.png ./assets
           rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data
           rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components
-          rsync -rptovR ./user-code/lib/./**/*.{js,ts,json} ./lib
-          rsync -rptovR ./user-code/middleware/./**/*.{js,ts} ./middleware
+          rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
+          rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
           rsync -rptovR ./user-code/pages/./**/*.{tsx} ./pages
           rsync -rptovR ./user-code/stylesheets/./**/*.{scss} ./stylesheets
 

From e8f75220e67ded792009db932f22158d12452594 Mon Sep 17 00:00:00 2001
From: John Breault <74558611+JohnBreault@users.noreply.github.com>
Date: Tue, 8 Mar 2022 14:41:34 -0800
Subject: [PATCH 23/41] Removing unnecessary step (#26032)

---
 .../managing-users-in-your-enterprise/managing-dormant-users.md  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md b/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md
index f43bea73e6..23956f2557 100644
--- a/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md
+++ b/content/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users.md
@@ -45,7 +45,6 @@ topics:
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.policies-tab %}
-{% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.options-tab %}
 4. Under "Dormancy threshold", use the drop-down menu, and click the desired dormancy threshold.
 ![The Dormancy threshold drop-down menu](/assets/images/enterprise/site-admin-settings/dormancy-threshold-menu.png)

From 81a0892d77076f5abb824c06b1b83ad77ea3dbd6 Mon Sep 17 00:00:00 2001
From: docubot <67483024+docubot@users.noreply.github.com>
Date: Tue, 8 Mar 2022 16:54:30 -0800
Subject: [PATCH 24/41] New translation batch for cn (#26027)

* Add crowdin translations

* Run script/i18n/homogenize-frontmatter.js

* Run script/i18n/lint-translation-files.js --check parsing

* Run script/i18n/lint-translation-files.js --check rendering

* run script/i18n/reset-files-with-broken-liquid-tags.js --language=cn

* run script/i18n/reset-known-broken-translation-files.js

Co-authored-by: Kevin Heis 
---
 .../about-notifications.md                    |   2 +-
 ...tributions-not-showing-up-on-my-profile.md |   2 +
 ...an-email-address-to-your-github-account.md |   2 +-
 .../merging-multiple-user-accounts.md         |   6 +-
 ...iewing-peoples-roles-in-an-organization.md |  32 ++--
 ...-hosted-runner-application-as-a-service.md |   6 +
 .../index.md                                  |   4 +-
 .../using-workflow-run-logs.md                |   4 +-
 .../managing-github-connect.md                |   6 +-
 ...saml-single-sign-on-for-your-enterprise.md |   2 -
 ...le-sign-on-for-enterprise-managed-users.md |   6 +-
 ...-for-enterprise-managed-users-with-okta.md |   2 +
 ...ovisioning-for-enterprise-managed-users.md |   4 +-
 ...or-security-settings-in-your-enterprise.md |   2 +-
 ...viting-people-to-manage-your-enterprise.md |   7 +-
 .../viewing-people-in-your-enterprise.md      |   2 +-
 .../downgrading-your-github-subscription.md   |   7 +
 ...io-subscriptions-with-github-enterprise.md |  18 +-
 .../sarif-support-for-code-scanning.md        |   6 +-
 .../zh-CN/content/code-security/guides.md     |   1 -
 .../about-dependabot-version-updates.md       |   1 +
 .../index.md                                  |   1 -
 ...pendabotcom-to-github-native-dependabot.md |  55 ------
 ...nerable-dependencies-in-your-repository.md |  15 +-
 ...abling-codespaces-for-your-organization.md |  24 +--
 ...ccess-for-your-organizations-codespaces.md |   6 +-
 .../events/issue-event-types.md               |  10 ++
 .../replit-with-github-classroom.md           |  22 +--
 .../github-cli/using-github-cli-extensions.md |  18 +-
 ...owed-ip-addresses-for-your-organization.md |   6 +-
 .../repository-roles-for-an-organization.md   | 168 +++++++++---------
 ...om-repository-roles-for-an-organization.md |   2 +
 ...ml-single-sign-on-for-your-organization.md |   2 -
 ...ging-code-review-settings-for-your-team.md |   4 -
 translations/zh-CN/content/packages/index.md  |   4 +-
 .../working-with-the-docker-registry.md       |   2 +-
 .../about-github-pages.md                     |  10 +-
 .../troubleshooting-required-status-checks.md |  28 +--
 .../changing-the-default-branch.md            |   2 +-
 .../about-repositories.md                     |  18 +-
 .../creating-a-new-repository.md              |   2 +-
 .../duplicating-a-repository.md               |   8 +-
 .../transferring-a-repository.md              |  14 +-
 ...tolinks-to-reference-external-resources.md |   2 +-
 .../configuring-tag-protection-rules.md       |  28 +++
 .../managing-repository-settings/index.md     |   1 +
 ...d-people-with-access-to-your-repository.md |  12 +-
 .../setting-repository-visibility.md          |   4 +-
 .../index.md                                  |   6 +-
 .../managing-files/editing-files.md           |   6 +-
 .../working-with-non-code-files.md            |  16 +-
 .../rest/guides/basics-of-authentication.md   |   8 +-
 .../features/reopen-dependabot-alerts.yml     |   7 +
 .../gated-features/tag-protection-rules.md    |   1 +
 ...ip-allow-lists-example-and-restrictions.md |   2 +-
 .../cannot-update-existing-saml-settings.md   |   5 -
 .../reusables/scim/emu-scim-rate-limit.md     |   5 +
 57 files changed, 338 insertions(+), 308 deletions(-)
 delete mode 100644 translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
 create mode 100644 translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
 create mode 100644 translations/zh-CN/data/features/reopen-dependabot-alerts.yml
 create mode 100644 translations/zh-CN/data/reusables/gated-features/tag-protection-rules.md
 delete mode 100644 translations/zh-CN/data/reusables/saml/cannot-update-existing-saml-settings.md
 create mode 100644 translations/zh-CN/data/reusables/scim/emu-scim-rate-limit.md

diff --git a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md
index 30119ed23a..1e19d9b50c 100644
--- a/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md
+++ b/translations/zh-CN/content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md
@@ -100,4 +100,4 @@ topics:
 
 ## 反馈和支持
 
-If you have feedback or feature requests for notifications, use a [{% data variables.product.product_name %} feedback discussion](https://github.com/github/feedback/discussions/categories/general-feedback).
+如果您有针对通知的反馈或功能请求，请使用 [{% data variables.product.product_name %} 反馈讨论](https://github.com/github/feedback/discussions/categories/general-feedback)。
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
index 4d8e8fa206..85afebbfd7 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
@@ -19,6 +19,8 @@ shortTitle: Missing contributions
 
 Your profile contributions graph is a record of contributions you've made to repositories {% ifversion ghae %}owned by{% else %}on{% endif %} {% data variables.product.product_location %}. Contributions are timestamped according to Coordinated Universal Time (UTC) rather than your local time zone. Contributions are only counted if they meet certain criteria. In some cases, we may need to rebuild your graph in order for contributions to appear.
 
+If you are part of an organization that uses SAML single sign-on (SSO), you won’t be able to see contribution activity from the organization on your profile if you do not have an active SSO session. People viewing your profile from outside your organization will see anonymized contribution activity of your contribution activity for your organization.
+
 ## Contributions that are counted
 
 ### Issues, pull requests and discussions
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account.md
index cf2aa2c5c3..8bb3b72ffd 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-email-preferences/adding-an-email-address-to-your-github-account.md
@@ -21,7 +21,7 @@ shortTitle: 添加电子邮件地址
 
 **注意**：
   - {% data reusables.user-settings.no-verification-disposable-emails %}
-  -  If you're a member of an {% data variables.product.prodname_emu_enterprise %}, you cannot make changes to your email address on {% data variables.product.prodname_dotcom_the_website %}. {% data reusables.enterprise-accounts.emu-more-info-account %}
+  -  如果您是 {% data variables.product.prodname_emu_enterprise %} 的成员，则无法在 {% data variables.product.prodname_dotcom_the_website %} 上更改您的电子邮件地址。 {% data reusables.enterprise-accounts.emu-more-info-account %}
 
 {% endnote %}
 
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
index 75120e40cf..24a3de4467 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
@@ -19,7 +19,7 @@ shortTitle: 合并多个用户帐户
 
 {% ifversion ghec %}
 
-**Tip:** {% data variables.product.prodname_emus %} allow an enterprise to provision unique user accounts for its members through an identity provider (IdP). For more information, see "[About Enterprise Managed Users](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/about-enterprise-managed-users)." For other use cases, we recommend using only one user account to manage both personal and professional repositories.
+**提示：** {% data variables.product.prodname_emus %} 允许企业通过身份提供商 (IdP) 为其成员配置唯一的用户帐户。 更多信息请参阅“[关于企业管理用户](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/about-enterprise-managed-users)”。 对于其他用例，我们建议仅使用一个用户帐户来管理个人和专业存储库。
 
 {% else %}
 
@@ -31,14 +31,14 @@ shortTitle: 合并多个用户帐户
 
 {% warning %}
 
-**Warning:** Organization and repository access permissions aren't transferable between accounts. If the account you want to delete has an existing access permission, an organization owner or repository administrator will need to invite the account that you want to keep.
+**警告：** 组织和存储库访问权限不可在帐户之间转移。 如果要删除的帐户具有现有访问权限，则组织所有者或存储库管理员将需要邀请您要保留的帐户。
 
 {% endwarning %}
 
 1. 从您要删除的帐户[转让任何仓库](/articles/how-to-transfer-a-repository)到要保留的帐户。 议题、拉取请求和 wiki 也会转让。 确认要保留的帐户中存在仓库。
 2. [更新远程 URL](/github/getting-started-with-github/managing-remote-repositories)（在移动的仓库的任何本地克隆中）。
 3. [删除帐户](/articles/deleting-your-user-account)（不再使用的）。
-4. To attribute past commits to the new account, add the email address you used to author the commits to the account you're keeping. 更多信息请参阅“[为什么我的贡献没有在我的个人资料中显示？](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account)”
+4. 要将过去的提交归因于新帐户，请将用于创作提交的电子邮件地址添加到要保留的帐户。 更多信息请参阅“[为什么我的贡献没有在我的个人资料中显示？](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account)”
 
 ## 延伸阅读
 
diff --git a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
index 52d3a0b0a5..02cedfd0af 100644
--- a/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
+++ b/translations/zh-CN/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
@@ -1,6 +1,6 @@
 ---
 title: 查看组织中人员的角色
-intro: '您可以查看组织中人员的列表，并按其角色进行筛选。 For more information on organization roles, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."'
+intro: '您可以查看组织中人员的列表，并按其角色进行筛选。 有关组织角色的详细信息，请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)”。'
 permissions: Organization members can see people's roles in the organization.
 redirect_from:
   - /articles/viewing-people-s-roles-in-an-organization
@@ -26,39 +26,39 @@ shortTitle: 查看组织中的人员
 
 {% ifversion fpt %}
 
-If your organization uses {% data variables.product.prodname_ghe_cloud %}, you can also view the enterprise owners who manage billing settings and policies for all your enterprise's organizations. 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization#view-enterprise-owners-and-their-roles-in-an-organization)。
+如果您的组织使用 {% data variables.product.prodname_ghe_cloud %}，您还可以查看管理所有企业组织的计费设置和策略的企业所有者。 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-github-user-account/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization#view-enterprise-owners-and-their-roles-in-an-organization)。
 
 {% endif %}
 
 {% if enterprise-owners-visible-for-org-members %}
-## View enterprise owners and their roles in an organization
+## 查看企业所有者及其在组织中的角色
 
-If your organization is managed by an enterprise account, then you can view the enterprise owners who manage billing settings and policies for all of your enterprise's organizations. For more information about enterprise accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
+如果您的组织由企业帐户管理，则可以查看管理企业所有组织的帐单设置和策略的企业所有者。 有关企业帐户的详细信息，请参阅“[{% data variables.product.prodname_dotcom %} 帐户类型](/get-started/learning-about-github/types-of-github-accounts)”。
 
-You can also view whether an enterprise owner has a specific role in the organization. Enterprise owners can also be an organization member, any other organization role, or be un-affililated with the organization.
+您还可以查看企业所有者是否在组织中具有特定角色。 企业所有者也可以是组织成员、任何其他组织角色或与组织无关。
 
 {% note %}
 
-**Note:** If you're an organization owner, you can also invite an enterprise owner to have a role in the organization. If an enterprise owner accepts the invitation, a seat or license in the organization is used from the available licenses for your enterprise. For more information about how licensing works, see "[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)."
+**注意：**如果您是组织所有者，还可以邀请企业所有者在组织中担任角色。 如果企业所有者接受邀请，则会从企业的可用许可证中使用组织中的席位或许可证。 有关许可的工作原理的详细信息，请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)”。
 
 {% endnote %}
 
-| **Enterprise role** | **Organization role**                           | **Organization access or impact**                                                                                              |
-| ------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| 企业所有者               | Un-affililated or no official organization role | Cannot access organization content or repositories but manages enterprise settings and policies that impact your organization. |
-| 企业所有者               | Organization owner                              | Able to configure organization settings and manage access to the organization's resources through teams, etc.                  |
-| 企业所有者               | Organization member                             | Able to access organization resources and content, such as repositories, without access to the organization's settings.        |
+| **企业角色** | **组织角色**           | **组织访问或影响**                    |
+| -------- | ------------------ | ------------------------------ |
+| 企业所有者    | 非附属或无官方组织角色        | 无法访问组织内容或存储库，但可管理影响组织的企业设置和策略。 |
+| 企业所有者    | Organization owner | 能够配置组织设置并通过团队等管理对组织资源的访问。      |
+| 企业所有者    | 组织成员               | 能够访问组织资源和内容（如存储库），而无需访问组织的设置。  |
 
-To review all roles in an organization, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)." {% ifversion ghec %} An organization member can also have a custom role for a specific repository. For more information, see "[Managing custom repository roles for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)."{% endif %}
+要查看组织中的所有角色，请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)”。 {% ifversion ghec %} 组织成员还可以具有特定存储库的自定义角色。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。{% endif %}
 
-For more information about the enterprise owner role, see "[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)."
+有关企业所有者角色的更多信息，请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)”。
 
 {% data reusables.profile.access_org %}
 {% data reusables.user-settings.access_org %}
 {% data reusables.organizations.people %}
-4. In the left sidebar, under "Enterprise permissions", click **Enterprise owners**. ![Screenshot of "Enterprise owners" option in sidebar menu](/assets/images/help/organizations/enterprise-owners-sidebar.png)
-5. View the list of the enterprise owners for your enterprise. If the enterprise owner is also a member of your organization, you can see their role in the organization.
+4. 在左侧边栏的“Enterprise permissions（企业权限）”下，单击 **Enterprise owners（企业所有者）**。 ![侧边栏菜单中 "企业所有者" 选项的屏幕截图](/assets/images/help/organizations/enterprise-owners-sidebar.png)
+5. 查看企业的企业所有者列表。 如果企业所有者也是您组织的成员，则您可以看到他们在组织中的角色。
 
-  ![Screenshot of list of Enterprise owners and their role in the organization](/assets/images/help/organizations/enterprise-owners-list-on-org-page.png)
+  ![企业所有者列表及其在组织中的角色的屏幕截图](/assets/images/help/organizations/enterprise-owners-list-on-org-page.png)
 
 {% endif %}
diff --git a/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
index 13f7860877..af2434c796 100644
--- a/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
+++ b/translations/zh-CN/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
@@ -78,6 +78,12 @@ shortTitle: 启动时运行运行器应用程序
    ```
 {% endmac %}
 
+The command takes an optional `user` argument to install the service as a different user.
+
+```shell
+./svc.sh install --user USERNAME
+```
+
 ## 启动服务
 
 使用以下命令启动服务：
diff --git a/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/index.md b/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/index.md
index 842f1d394a..5d2731fc0a 100644
--- a/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/index.md
+++ b/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/index.md
@@ -1,7 +1,7 @@
 ---
-title: Monitoring and troubleshooting workflows
+title: 监控和故障排除工作流程
 shortTitle: 监控和故障排除
-intro: 'You can view the status and results of each step in your workflow, debug a failed workflow, search and download logs, and view billable job execution minutes.'
+intro: 您可以查看工作流程中每个步骤的状态和结果、调试失败的工作流程、搜索和下载日志以及查看计费作业执行分钟数。
 redirect_from:
   - /articles/viewing-your-repository-s-workflows
   - /articles/viewing-your-repositorys-workflows
diff --git a/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs.md b/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs.md
index 742d49f9c3..2d06157f67 100644
--- a/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs.md
+++ b/translations/zh-CN/content/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs.md
@@ -57,7 +57,7 @@ versions:
 {% data reusables.repositories.navigate-to-workflow %}
 {% data reusables.repositories.view-run %}
 {% data reusables.repositories.navigate-to-job %}
-1. In the upper right corner, click {% octicon "gear" aria-label="The gear icon" %} and select **Download log archive**.
+1. 在右上角，单击 {% octicon "gear" aria-label="The gear icon" %} ，然后选择 **Download log archive（下载日志存档）**。
 
   ![下载日志下拉菜单](/assets/images/help/repository/download-logs-drop-down-updated-2.png)
 
@@ -70,7 +70,7 @@ versions:
 {% data reusables.repositories.actions-tab %}
 {% data reusables.repositories.navigate-to-workflow %}
 {% data reusables.repositories.view-run %}
-1. In the upper right corner, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}.
+1. 在右上角，单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}。
 
     ![烤肉串水平图标](/assets/images/help/repository/workflow-run-kebab-horizontal-icon-updated-2.png)
 
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/managing-github-connect.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/managing-github-connect.md
index 5198b11e53..6c1b29437a 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/managing-github-connect.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/managing-github-connect.md
@@ -41,7 +41,9 @@ When you enable {% data variables.product.prodname_github_connect %}, you config
 To use {% data variables.product.prodname_github_connect %}, you must have an organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that uses {% data variables.product.prodname_ghe_cloud %}. You may already have {% data variables.product.prodname_ghe_cloud %} included in your plan. {% data reusables.enterprise.link-to-ghec-trial %}
 
 {% ifversion ghes %}
-To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. 更多信息请参阅“[配置出站 Web 代理服务器](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)”。
+If your organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} uses IP allow lists, you must add the IP address or network for {% data variables.product.product_location %} to your IP allow list on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Managing allowed IP addresses for your organization](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)" and "[Enforcing policies for security settings in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+
+To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. For more information, see "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)."
 {% endif %}
 
 ## 启用 {% data variables.product.prodname_github_connect %}
@@ -69,7 +71,7 @@ If you're connecting {% data variables.product.product_location %} to an organiz
 
 Enterprise owners can disable {% data variables.product.prodname_github_connect %}.
 
-与 {% data variables.product.prodname_ghe_cloud %} 断开连接后，{% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} 会从企业帐户或组织中删除，{% data variables.product.product_location %} 上存储的凭据也会删除。
+When you disconnect from {% data variables.product.prodname_ghe_cloud %}, the {% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} is deleted from your enterprise account or organization and credentials stored on {% data variables.product.product_location %} are deleted.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.github-connect-tab %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
index 2eecbac189..33ea8e4054 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -33,8 +33,6 @@ redirect_from:
 
 {% data reusables.saml.about-saml-access-enterprise-account %} For more information, see "[Viewing and managing a user's SAML access to your enterprise account](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise)."
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
-
 {% data reusables.saml.saml-disabled-linked-identities-removed %}
 
 {% data reusables.scim.enterprise-account-scim %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
index b62b5f01f2..839d43e8da 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
@@ -25,7 +25,11 @@ With {% data variables.product.prodname_emus %}, your enterprise uses SAML SSO t
 
 After you configure SAML SSO, we recommend storing your recovery codes so you can recover access to your enterprise in the event that your identity provider is unavailable.
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
+{% note %}
+
+**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings.
+
+{% endnote %}
 
 ## Configuring SAML single sign-on for {% data variables.product.prodname_emus %}
 
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
index ccab1865c2..b64bac359e 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
@@ -76,6 +76,8 @@ To configure provisioning, the setup user with the **@SHORT-CODE_admin*
 
 After you have configured SAML SSO and provisioning, you will be able provision new users on {% data variables.product.prodname_dotcom_the_website %} by assigning users to the {% data variables.product.prodname_emu_idp_application %} application.
 
+{% data reusables.scim.emu-scim-rate-limit %}
+
 You can also automatically manage organization membership by assigning groups to the application and adding them to the "Push Groups" tab in Okta. When the group is provisioned successfully, it will be available to connect to teams in the enterprise's organizations. For more information about managing teams, see "[Managing team memberships with identity provider groups](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)."
 
 When assigning users, you can use the "Roles" attribute in the {% data variables.product.prodname_emu_idp_application %} application to set a user's role in your enterprise on {% data variables.product.product_name %}. For more information on roles, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise)."
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
index 246c1004fe..4f1f03b5fb 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
@@ -19,7 +19,7 @@ You must configure provisioning for {% data variables.product.prodname_emus %} t
 
 When you update information associated with a user's identity on your IdP, your IdP will update the user's account on GitHub.com. When you unassign the user from the {% data variables.product.prodname_emu_idp_application %} application or deactivate a user's account on your IdP, your IdP will communicate with {% data variables.product.prodname_dotcom %} to invalidate any SAML sessions and disable the member's account. The disabled account's information is maintained and their username is changed to a hash of their original username with the short code appended. If you reassign a user to the {% data variables.product.prodname_emu_idp_application %} application or reactivate their account on your IdP, the {% data variables.product.prodname_managed_user %} account on {% data variables.product.prodname_dotcom %} will be reactivated and username restored.
 
-Groups in your IdP can be used to manage team membership within your enterprise's organizations, allowing you to configure repository access and permissions through your IdP. For more information, see "[Managing team memberships with identity provider groups](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)."
+Groups in your IdP can be used to manage team membership within your enterprise's organizations, allowing you to configure repository access and permissions through your IdP. 更多信息请参阅“[使用身份提供商组管理团队成员](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)”。
 
 ## 基本要求
 
@@ -51,6 +51,8 @@ To configure provisioning for your {% data variables.product.prodname_emu_enterp
 
 After creating your personal access token and storing it securely, you can configure provisioning on your identity provider.
 
+{% data reusables.scim.emu-scim-rate-limit %}
+
 To configure Azure Active Directory to provision users for your {% data variables.product.prodname_emu_enterprise %}, see [Tutorial: Configure GitHub Enterprise Managed User for automatic user provisioning](https://docs.microsoft.com/en-us/azure/active-directory/saas-apps/github-enterprise-managed-user-provisioning-tutorial) in the Azure AD documentation.
 
 To configure Okta to provision users for your {% data variables.product.prodname_emu_enterprise %}, see "[Configuring SCIM provisioning for Enterprise Managed Users with Okta](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta)."
diff --git a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
index 5e19bc46d8..0156457a6d 100644
--- a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
+++ b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
@@ -67,7 +67,7 @@ You can restrict network traffic to your enterprise on {% data variables.product
 
 {% elsif ghec %}
 
-Enterprise owners can restrict access to assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
+Enterprise owners can restrict access to private assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
 
 {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %}
 
diff --git a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
index cbc322531f..118c7c798a 100644
--- a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
+++ b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
@@ -47,7 +47,7 @@ shortTitle: 邀请人员进行管理
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
-1. 在左侧边栏中，单击 **Administrators（管理员）**。 ![左侧边栏中的管理员选项卡](/assets/images/help/business-accounts/administrators-tab.png)
+{% data reusables.enterprise-accounts.administrators-tab %}
 1. 在管理员列表上方，单击 {% ifversion ghec %}**邀请管理员**{% elsif ghes %}**添加所有者**{% endif %}。
   {% ifversion ghec %}
   ![企业所有者列表上方的"邀请管理员"按钮](/assets/images/help/business-accounts/invite-admin-button.png)
@@ -65,10 +65,11 @@ shortTitle: 邀请人员进行管理
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
-1. 在您要删除的人员用户名旁边，单击 {% octicon "gear" aria-label="The Settings gear" %}，然后单击 **Remove owner（删除所有者）**{% ifversion ghec %} 或**Remove billing manager（删除帐单管理员）**。{% endif %}
+{% data reusables.enterprise-accounts.administrators-tab %}
+1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Convert to member**{% endif %}.
   {% ifversion ghec %}
   ![包含删除企业管理员的菜单选项的设置齿轮](/assets/images/help/business-accounts/remove-admin.png)
   {% elsif ghes %}
   ![包含删除企业管理员的菜单选项的设置齿轮](/assets/images/help/business-accounts/ghes-remove-owner.png)
   {% endif %}
-1. 阅读确认，然后单击 **Remove owner（删除所有者）**{% ifversion ghec %} 或 **Remove billing manager（删除帐单管理员）**{% endif %}。
+1. Read the confirmation, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Yes, convert USERNAME to member**{% endif %}.
diff --git a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
index 6c3fc1b1d3..98bc1850e6 100644
--- a/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
+++ b/translations/zh-CN/content/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
@@ -41,7 +41,7 @@ shortTitle: 查看企业中的人员
 
 ## Viewing suspended members in an {% data variables.product.prodname_emu_enterprise %}
 
-If your enterprise uses {% data variables.product.prodname_emus %}, you can also view suspended users. Suspended users are members who have been deprovisioned after being unassigned from the {% data variables.product.prodname_emu_idp_application %} application or deleted from the identity provider. For more information, see "[About Enterprise Managed Users](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/about-enterprise-managed-users)."
+If your enterprise uses {% data variables.product.prodname_emus %}, you can also view suspended users. Suspended users are members who have been deprovisioned after being unassigned from the {% data variables.product.prodname_emu_idp_application %} application or deleted from the identity provider. 更多信息请参阅“[关于企业管理用户](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/about-enterprise-managed-users)”。
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
diff --git a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
index 46a36be1d0..fb457041ab 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
@@ -52,6 +52,13 @@ shortTitle: 降级订阅
 
 如果将您的组织从 {% data variables.product.prodname_ghe_cloud %} 降级到 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_free_team %}，该帐户将失去对高级安全性、合规性和部署控件的访问权限。 {% data reusables.gated-features.more-info %}
 
+
+{% note %}
+
+**注意：** 如果您当前正在试用 {% data variables.product.prodname_ghe_cloud %}，并且在试用期结束前未购买 {% data variables.product.prodname_enterprise %} ，则您的组织将自动降级为 {% data variables.product.prodname_free_team %} 或 {% data variables.product.prodname_team %}。 更多信息请参阅“[设置 {% data variables.product.prodname_ghe_cloud %} 的试用](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)”。
+
+{% endnote %}
+
 {% data reusables.organizations.billing-settings %}
 1. 在“Current plan（当前计划）”下，使用 **Edit（编辑）**下拉菜单，单击您想要的降级选项。 ![降级按钮](/assets/images/help/billing/downgrade-option-button.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
diff --git a/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
index c4e39f17fb..e47f0ca052 100644
--- a/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
+++ b/translations/zh-CN/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
@@ -16,17 +16,19 @@ shortTitle: 设置
 
 This guide shows you how your team can get {% data variables.product.prodname_vs %} subscribers licensed and started with {% data variables.product.prodname_enterprise %}.
 
+If you prefer video, you can watch [Setting up your {% data variables.product.prodname_enterprise %} licenses with {% data variables.product.prodname_vs %} subscriptions](https://www.youtube.com/watch?v=P_zBgp_BE_I) on Microsoft Visual Studio's YouTube channel.
+
 ## Roles for {% data variables.product.prodname_vss_ghe %}
 
 Before setting up {% data variables.product.prodname_vss_ghe %}, it's important to understand the roles for this combined offering.
 
-| Role                    | 服务                                                    | 描述                                                                                                                                          | 更多信息                                                                                                                                              |
-|:----------------------- |:----------------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Subscriptions admin** | {% data variables.product.prodname_vs %} subscription | Person who assigns licenses for {% data variables.product.prodname_vs %} subscription                                                       | [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs        |
-| **Subscriber**          | {% data variables.product.prodname_vs %} subscription | Person who uses a license for {% data variables.product.prodname_vs %} subscription                                                         | [Visual Studio Subscriptions documentation](https://docs.microsoft.com/en-us/visualstudio/subscriptions/) in Microsoft Docs                       |
-| **企业所有者**               | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's an administrator of an enterprise on {% data variables.product.product_location %}                     | "[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)"                                      |
-| **Organization owner**  | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's an owner of an organization in your team's enterprise on {% data variables.product.product_location %} | "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners)" |
-| **Enterprise member**   | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's a member of an enterprise on {% data variables.product.product_location %}                             | "[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-members)"                                    |
+| Role                    | 服务                                                    | 描述                                                                                                                                          | 更多信息                                                                                                                                       |
+|:----------------------- |:----------------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------ |
+| **Subscriptions admin** | {% data variables.product.prodname_vs %} subscription | Person who assigns licenses for {% data variables.product.prodname_vs %} subscription                                                       | [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs |
+| **Subscriber**          | {% data variables.product.prodname_vs %} subscription | Person who uses a license for {% data variables.product.prodname_vs %} subscription                                                         | [Visual Studio Subscriptions documentation](https://docs.microsoft.com/en-us/visualstudio/subscriptions/) in Microsoft Docs                |
+| **企业所有者**               | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's an administrator of an enterprise on {% data variables.product.product_location %}                     | "[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)"                               |
+| **Organization owner**  | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's an owner of an organization in your team's enterprise on {% data variables.product.product_location %} | "[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners)"            |
+| **Enterprise member**   | {% data variables.product.prodname_dotcom %}          | Person who has a user account that's a member of an enterprise on {% data variables.product.product_location %}                             | "[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-members)"                             |
 
 ## 基本要求
 
@@ -40,7 +42,7 @@ To set up {% data variables.product.prodname_vss_ghe %}, members of your team mu
 
 One person may be able to complete the tasks because the person has all of the roles, but you may need to coordinate the tasks with multiple people. For more information, see "[Roles for {% data variables.product.prodname_vss_ghe %}](#roles-for-visual-studio-subscriptions-with-github-enterprise)."
 
-1. An enterprise owner must create at least one organization in your enterprise on {% data variables.product.product_location %}. For more information, see "[Adding organizations to your enterprise](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise)."
+1. An enterprise owner must create at least one organization in your enterprise on {% data variables.product.product_location %}. 更多信息请参阅“[将组织添加到企业](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise)”。
 
 1. The subscription admin must assign a license for {% data variables.product.prodname_vs %} to a subscriber in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information, see [Overview of the {% data variables.product.prodname_vs %} Subscriptions Administrator Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/using-admin-portal) and [Assign {% data variables.product.prodname_vs %} Licenses in the {% data variables.product.prodname_vs %} Subscriptions Administration Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-license) in Microsoft Docs.
 
diff --git a/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md b/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
index 88765f488b..1c40c8ccba 100644
--- a/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
+++ b/translations/zh-CN/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
@@ -105,7 +105,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr
 | `properties.tags[]` | **Optional.** An array of strings. {% data variables.product.prodname_code_scanning_capc %} uses `tags` to allow you to filter results on {% data variables.product.prodname_dotcom %}. For example, it is possible to filter to all results that have the tag `security`.
 | `properties.precision` | **Recommended.** A string that indicates how often the results indicated by this rule are true. For example, if a rule has a known high false-positive rate, the precision should be `low`. {% data variables.product.prodname_code_scanning_capc %} orders results by precision on {% data variables.product.prodname_dotcom %} so that the results with the highest `level`, and highest `precision` are shown first. Can be one of: `very-high`, `high`, `medium`, or `low`. {% ifversion fpt or ghes > 3.1 or ghae or ghec %}
 | `properties.problem.severity` | **Recommended.** A string that indicates the level of severity of any alerts generated by a non-security query. This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `problem.severity`, and highest `precision` are shown first. Can be one of: `error`, `warning`, or `recommendation`.
-| `properties.security-severity` | **Recommended.** A score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9  is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %}
+| `properties.security-severity` | **Recommended.** A string representing a score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9  is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %}
 
 ### `result` object
 
@@ -114,7 +114,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr
 | Name | Description |
 |----|----|
 | `ruleId`| **Optional.** The unique identifier of the rule (`reportingDescriptor.id`). For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). {% data variables.product.prodname_code_scanning_capc %} uses the rule identifier to filter results by rule on {% data variables.product.prodname_dotcom %}.
-| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object).
+| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). The allowed range for this property 0 to 2^63 - 1.
 | `rule`| **Optional.** A reference used to locate the rule (reporting descriptor) for this result. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object).
 | `level`| **Optional.** The severity of the result. This level overrides the default severity defined by the rule. {% data variables.product.prodname_code_scanning_capc %} uses the level to filter results by severity on {% data variables.product.prodname_dotcom %}.
 | `message.text`| **Required.** A message that describes the result. {% data variables.product.prodname_code_scanning_capc %} displays the message text as the title of the result. Only the first sentence of the message will be displayed when visible space is limited.
@@ -129,7 +129,7 @@ A location within a programming artifact, such as a file in the repository or a
 
 | Name | Description |
 |----|----|
-| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object.
+| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. The allowed range for this property 0 to 2^63 - 1.
 | `location.physicalLocation` | **Required.** Identifies the artifact and region. For more information, see the [`physicalLocation`](#physicallocation-object).
 | `location.message.text` | **Optional.** A message relevant to the location.
 
diff --git a/translations/zh-CN/content/code-security/guides.md b/translations/zh-CN/content/code-security/guides.md
index fd3657aca6..04143a7d96 100644
--- a/translations/zh-CN/content/code-security/guides.md
+++ b/translations/zh-CN/content/code-security/guides.md
@@ -67,7 +67,6 @@ includeGuides:
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
-  - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md b/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
index 414c8deb2a..91c9ecf6da 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
@@ -7,6 +7,7 @@ redirect_from:
   - /github/administering-a-repository/about-github-dependabot-version-updates
   - /github/administering-a-repository/about-dependabot-version-updates
   - /code-security/supply-chain-security/about-dependabot-version-updates
+  - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md b/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
index db1f654551..78b4febd91 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
@@ -15,7 +15,6 @@ topics:
   - Pull requests
 children:
   - /about-dependabot-version-updates
-  - /upgrading-from-dependabotcom-to-github-native-dependabot
   - /enabling-and-disabling-dependabot-version-updates
   - /listing-dependencies-configured-for-version-updates
   - /managing-pull-requests-for-dependency-updates
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md b/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
deleted file mode 100644
index 88f7d256ee..0000000000
--- a/translations/zh-CN/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: 从 Dependabot.com 上传到 GitHub 原生的 Dependabot
-intro: 您可以通过合并拉取请求升级到 GitHub 原生的 Dependabot，允许继续更新您的依赖项。
-versions:
-  fpt: '*'
-  ghec: '*'
-type: how_to
-topics:
-  - Repositories
-  - Dependabot
-  - Version updates
-  - Dependencies
-redirect_from:
-  - /code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot
-shortTitle: Dependabot.com 升级
----
-
-{% warning %}
-
-Dependabot Preview 已在 2021 年 8 月 3 日关闭。 为了继续获取 Dependabot 更新，请迁移到 GitHub 原生的 Dependabot。
-
-来自 Dependabot Preview 的开放拉取请求将保持开放状态，包括升级到 GitHub 原生 Dependabot 的拉取请求，但自动程序本身将不再适用于您的 {% data variables.product.prodname_dotcom %} 帐户和组织。
-
-{% endwarning %}
-
-## 关于从 Dependabot Preview 升级到 {% data variables.product.prodname_dotcom %} 原生的 {% data variables.product.prodname_dependabot %}
-
-Dependabot Preview 已直接植入 {% data variables.product.prodname_dotcom %}，因此您可以将 {% data variables.product.prodname_dependabot %} 与 {% data variables.product.prodname_dotcom %} 中的所有其他功能一起使用，而无需安装和使用单独的应用程序。 通过迁移到 {% data variables.product.prodname_dotcom %} 原生的 {% data variables.product.prodname_dependabot %}，我们也可以注重将大量令人兴奋的新功能植入 {% data variables.product.prodname_dependabot %}，包括更多的[生态系统更新](https://github.com/github/roadmap/issues/150)、[改进的通知](https://github.com/github/roadmap/issues/133)以及 {% data variables.product.prodname_dependabot %} 对 [{% data variables.product.prodname_ghe_server %}](https://github.com/github/roadmap/issues/86) 和 [{% data variables.product.prodname_ghe_managed %}](https://github.com/github/roadmap/issues/135) 的支持。
-
-## Dependabot Preview 与 {% data variables.product.prodname_dotcom %} 原生 {% data variables.product.prodname_dependabot %} 之间的差异
-
-虽然大多数 Dependabot Preview 功能存在于 {% data variables.product.prodname_dotcom %} 原生 {% data variables.product.prodname_dependabot %} 中，但仍有几个功能不可用：
-- **实时更新：** 我们希望将来恢复这些功能。 现在，您可以每天运行 {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_dependabot %}，以便在发布后的一天内捕获新包。
-- **PHP 环境变量注册表：** 对于依赖 `ACF_PRO_KEY` 环境变量的项目，您也许能够提供 Advanced Custom Fields 插件的许可副本。 相关示例请参阅 [dependabot/acf-php-example](https://github.com/dependabot/acf-php-example#readme)。 对于其他环境变量，您可以使用 {% data variables.product.prodname_actions %} 从这些注册表中获取依赖项。
-- **自动合并：**我们始终建议您在合并依赖项之前先验证它们；因此，在可预见的将来将不支持自动合并。 对于那些已审核依赖项或仅使用内部依赖项的用户，我们建议添加第三方自动合并应用程序，或设置用于合并的 GitHub Actions。 我们提供了 [`dependabot/fetch-metadata`](https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs) 操作来帮助开发者[启用 GitHub 的自动合并](https://github.com/dependabot/fetch-metadata/#enabling-auto-merge)。
-
-在 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %} 中，您可以使用配置文件配置所有版本更新。 此文件类似于 Dependabot Preview 配置文件，其中包含一些将自动包含在升级拉取请求中的更改和改进。 有关升级拉取请求的更多信息，请参阅“[升级到 GitHub 原生 Dependabot](/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot#upgrading-to-github-native-dependabot)”。
-
-要查看以前在 Dependabot.com 仪表板上的 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %} 的更新日志：
-
-  1. 导航到仓库的 **Insights（洞察）**页面。
-  2. 单击左侧的 **Dependency graph（依赖项图）**。
-  3. 单击 **{% data variables.product.prodname_dependabot %}**。
-
-有关 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %} 版本更新的更多信息，请参阅“[关于 Dependabot 版本更新](/code-security/supply-chain-security/about-dependabot-version-updates)”。
-
-## 升级到 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %}
-
-从 Depabot Preview 升级到 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %} 需要您合并仓库中的*升级到 GitHub-原生 Dependabot* 拉取请求。 此拉取请求包括 {% data variables.product.prodname_dotcom %}-原生 {% data variables.product.prodname_dependabot %} 所需的更新配置文件。
-
-如果使用私有仓库，则必须在组织的安全和分析设置中授予 Dependabot 访问这些仓库的权限。 更多信息请参阅“[允许 Dependabot 访问私有依赖项](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)”。 以前，Dependabot 可以访问组织内的所有仓库，但是我们实施了此更改，因为对 Dependabot 使用最小权限原则更为安全。
-
-如果使用私人注册表，则必须将现有的 Dependabot Preview 密钥添加到仓库或组织的“ Dependabot 密钥”中。 更多信息请参阅“[管理 Dependabot 的加密密码](/code-security/supply-chain-security/managing-encrypted-secrets-for-dependabot)”。
-
-如果您在迁移方面有任何问题或需要帮助，您可以在 [`dependabot/dependabot-core`](https://github.com/dependabot/dependabot-core/issues/new?assignees=%40dependabot%2Fpreview-migration-reviewers&labels=E%3A+preview-migration&template=migration-issue.md&title=) 仓库中查看或打开议题。
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index fd82748fab..630748e2d3 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -54,7 +54,7 @@ topics:
 1. 查看漏洞的详细信息以及包含自动安全更新的拉取请求（如果有）。
 1. （可选）如果还没有针对该警报的 {% data variables.product.prodname_dependabot_security_updates %} 更新，要创建拉取请求以解决该漏洞，请单击 **Create {% data variables.product.prodname_dependabot %} security update（创建 Dependabot 安全更新）**。 ![创建 {% data variables.product.prodname_dependabot %} 安全更新按钮](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png)
 1. 当您准备好更新依赖项并解决漏洞时，合并拉取请求。 {% data variables.product.prodname_dependabot %} 提出的每个拉取请求都包含可用于控制 {% data variables.product.prodname_dependabot %} 的命令的相关信息。 更多信息请参阅“[管理依赖项更新的拉取请求](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)”。
-1. （可选）如果警报正在修复、不正确或位于未使用的代码中，请选择“Dismiss（忽略）”，然后单击忽略警报的原因。 ![选择通过 "Dismiss（忽略）"下拉菜单忽略警报的原因](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png)
+1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% if reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %} ![选择通过 "Dismiss（忽略）"下拉菜单忽略警报的原因](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png)
 
 {% elsif ghes = 3.3 %}
 {% data reusables.repositories.navigate-to-repo %}
@@ -83,6 +83,19 @@ topics:
 1. **Dependencies（依赖项）**选项卡顶部的横幅将会显示，直到解决所有漏洞依赖项或者您忽略该横幅。 单击横幅右上角的 **Dismiss（忽略）**并选择忽略警报的原因。 ![忽略安全横幅](/assets/images/enterprise/3.0/dependabot-alert-dismiss.png)
 {% endif %}
 
+{% if reopen-dependabot-alerts %}
+
+## Viewing and updating closed alerts
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. To just view closed alerts, click **Closed**. ![Screenshot showing the "Closed" option](/assets/images/help/repository/dependabot-alerts-closed.png)
+1. Click the alert that you would like to view or update. ![Screenshot showing a highlighted dependabot alert](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png)
+2. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**. ![Screenshot showing the "Reopen" button](/assets/images/help/repository/reopen-dismissed-alert.png)
+
+{% endif %}
+
 ## 延伸阅读
 
 - "[关于有漏洞依赖项的警报](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)" {% ifversion fpt or ghec or ghes > 3.2 %}
diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
index 365b3e8ef8..cf334a8850 100644
--- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
+++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
@@ -1,6 +1,6 @@
 ---
-title: Enabling Codespaces for your organization
-shortTitle: Enable Codespaces
+title: 为组织启用 Codespaces
+shortTitle: 启用 Codespaces
 intro: '您可以控制组织中的哪些用户可以使用 {% data variables.product.prodname_codespaces %}。'
 product: '{% data reusables.gated-features.codespaces %}'
 permissions: 'To manage user permissions for {% data variables.product.prodname_codespaces %} for an organization, you must be an organization owner.'
@@ -17,20 +17,20 @@ topics:
 ---
 
 
-## About enabling {% data variables.product.prodname_codespaces %} for your organization
+## 关于为组织启用 {% data variables.product.prodname_codespaces %}
 
 组织所有者可以控制组织中的哪些用户可以创建和使用代码空间。
 
-To use codespaces in your organization, you must do the following:
+要在组织中使用 Codespaces，必须执行以下操作：
 
-- Ensure that users have [at least write access](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to the repositories where they want to use a codespace.
-- [Enable {% data variables.product.prodname_codespaces %} for users in your organization](#enable-codespaces-for-users-in-your-organization). You can choose allow {% data variables.product.prodname_codespaces %} for selected users or only for specific users.
+- 确保用户他们要在其中使用代码空间的存储库[至少具有写入权限](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)。
+- [为组织中的用户启用 {% data variables.product.prodname_codespaces %}](#enable-codespaces-for-users-in-your-organization)。 您可以选择允许所选用户使用 {% data variables.product.prodname_codespaces %} ，也可以选择仅允许特定用户使用。
 - [设置支出限制](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)
 - 确保您的组织未启用 IP 地址允许列表。 更多信息请参阅“[管理组织允许的 IP 地址](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)”。
 
 默认情况下，代码空间只能访问从中创建它的存储库。 如果您希望组织中的代码空间能够访问代码空间创建者可以访问的其他组织仓库，请参阅“[管理 {% data variables.product.prodname_codespaces %} 的访问和安全](/codespaces/managing-codespaces-for-your-organization/managing-access-and-security-for-your-organizations-codespaces)”。
 
-## Enable {% data variables.product.prodname_codespaces %} for users in your organization
+## 为组织中的用户启用 {% data variables.product.prodname_codespaces %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
@@ -38,25 +38,25 @@ To use codespaces in your organization, you must do the following:
 1. 在“User permissions（用户权限）”下，选择以下选项之一：
 
    * **Selected users（所选用户）**选择特定组织成员使用 {% data variables.product.prodname_codespaces %}。
-   * **Allow for all members** to allow all your organization members to use {% data variables.product.prodname_codespaces %}.
-   * **Allow for all members and outside collaborators** to allow all your organization members as well as outside collaborators to use {% data variables.product.prodname_codespaces %}.
+   * **允许所有成员**以允许所有组织成员使用 {% data variables.product.prodname_codespaces %}。
+   * **允许所有成员和外部协作者**以允许所有组织成员以及外部协作者使用 {% data variables.product.prodname_codespaces %}。
 
    !["用户权限"单选按钮](/assets/images/help/codespaces/org-user-permission-settings-outside-collaborators.png)
 
    {% note %}
 
-   **Note:** When you select **Allow for all members and outside collaborators**,  all outside collaborators who have been added to specific repositories can create and use {% data variables.product.prodname_codespaces %}. Your organization will be billed for all usage incurred by outside collaborators. For more information on managing outside collaborators, see "[About outside collaborators](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization#about-outside-collaborators)."
+   **注意：** 当您选择 **Allow for all members and outside collaborators（允许所有成员和外部协作者）**时，所有已添加到特定存储库的外部协作者都可以创建和使用 {% data variables.product.prodname_codespaces %}。 您的组织将对外部协作者发生的所有使用付费。 有关管理外部协作者的详细信息，请参阅“[关于外部协作者](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization#about-outside-collaborators)”。
 
    {% endnote %}
 
 1. 单击 **Save（保存）**。
 
-## Disabling {% data variables.product.prodname_codespaces %} for your organization
+## 为组织禁用 {% data variables.product.prodname_codespaces %}
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.click-codespaces %}
-1. Under "User permissions", select **Disabled**.
+1. 在“User permissions（用户权限）”下，选择 **Disabled（已禁用）**。
 
 ## 设置支出限制
 
diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces.md
index ba84000c42..768f2231d6 100644
--- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces.md
+++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/managing-repository-access-for-your-organizations-codespaces.md
@@ -1,5 +1,5 @@
 ---
-title: Managing repository access for your organization's codespaces
+title: 管理组织代码空间的存储库访问
 shortTitle: 存储库访问
 intro: '您可以管理 {% data variables.product.prodname_codespaces %} 可以访问的组织仓库。'
 product: '{% data reusables.gated-features.codespaces %}'
@@ -18,7 +18,7 @@ redirect_from:
   - /codespaces/working-with-your-codespace/managing-access-and-security-for-codespaces
 ---
 
-默认情况下，代码空间只能访问创建它的仓库。 When you enable access and security for a repository owned by your organization, any codespaces that are created for that repository will also have read permissions to all other repositories the organization owns and the codespace creator has permissions to access. If you want to restrict the repositories a codespace can access, you can limit it to either the repository where the codespace was created, or to specific repositories. 您应该只对您信任的仓库启用访问和安全。
+默认情况下，代码空间只能访问创建它的仓库。 当您为组织拥有的存储库启用访问和安全性时，为该存储库创建的任何代码空间也将对组织拥有的所有其他存储库具有读取权限，并且代码空间创建者具有访问权限。 如果要限制代码空间可以访问的存储库，可以将其限制为创建代码空间的存储库或特定存储库。 您应该只对您信任的仓库启用访问和安全。
 
 要管理组织中的哪些用户可以使用 {% data variables.product.prodname_codespaces %}，请参阅“[管理组织的用户权限](/codespaces/managing-codespaces-for-your-organization/managing-user-permissions-for-your-organization)”。
 
@@ -30,4 +30,4 @@ redirect_from:
 
 ## 延伸阅读
 
-- "[Managing repository access for your codespaces](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)"
+- "[管理代码空间的存储库访问](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)"
diff --git a/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md b/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md
index 5448337fcb..4eae8a91a4 100644
--- a/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md
+++ b/translations/zh-CN/content/developers/webhooks-and-events/events/issue-event-types.md
@@ -320,6 +320,16 @@ GitHub 尝试自动更改拉取请求的基本分支已成功。
 |:-------------------------- |:--------:|:---------:|
 | 
  • 拉取请求
 |  **X**   |   **X**   |
 
+## head_ref_force_pushed
+
+The pull request's HEAD branch was force pushed.
+
+### 可用性
+
+| 议题类型                       | 议题事件 API | 时间表事件 API |
+|:-------------------------- |:--------:|:---------:|
+| 
  • 拉取请求
 |  **X**   |   **X**   |
+
 ### 事件对象属性
 
 {% data reusables.issue-events.issue-event-common-properties %}
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/replit-with-github-classroom.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/replit-with-github-classroom.md
index 34892a0b02..44d4e650b4 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/replit-with-github-classroom.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/replit-with-github-classroom.md
@@ -1,7 +1,7 @@
 ---
-title: Repl.it with GitHub Classroom
-shortTitle: Repl.it with GitHub Classroom
-intro: 'As of July 13 2021, Repl.it integration is no longer available in {% data variables.product.prodname_classroom %}.'
+title: 使用 GitHub Classroom 的 Repl.it
+shortTitle: 使用 GitHub Classroom 的 Repl.it
+intro: '自 2021 年 7 月 13 日起，Repl.it 集成在 {% data variables.product.prodname_classroom %} 中不再可用。'
 versions:
   fpt: '*'
 redirect_from:
@@ -10,19 +10,19 @@ redirect_from:
   - /education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/about-using-replit-with-github-classroom
 ---
 
-## What’s changing with Repl.it integration
+## Repl.it 集成有什么变化
 
-As of July 13 2021, Repl.it integration is no longer available. Here’s what’s changed:
+自 2021 年 7 月 13 日起，Repl.it 集成不再可用。 变化如下：
 
-- New private and public repls can no longer be created from within GitHub Classroom.
-- Replit Hacker benefits, such as Always On and Boosts, are no longer available for new GitHub Classroom users.
+- 无法再从 GitHub Classroom 中创建新的私有和公共版本。
+- Replit Hacker 的权益（如 Always On 和 Boosts）不再适用于新的 GitHub Classroom 用户。
 
-## What does this mean for existing assignments?
-Your existing GitHub Classroom repls will remain private forever and you can submit work to GitHub Classroom via these repls until September 30 2021. After September 2021, the Replit icon on the assignment README will no longer work. We suggest you remove the instructions from any README using the integration and let students know that the icon will no longer work.
+## 这对现有作业意味着什么？
+您现有的 GitHub Classroom 回复将永远保持私密状态，在 2021 年 9 月 30 日之前您可以通过这些回复向 GitHub Classroom 提交作业。 2021 年 9 月之后，作业自述文件上的 Replit 图标将不再有效。 我们建议您使用集成从任何自述文件中删除说明，并让学生知道该图标将不再有效。
 
-While you can no longer create private repls from within Classroom, you can continue to create private repls in Replit until September 30th.
+虽然您无法再在 Classroom 中创建私有回复，但在 9 月 30 日之前您可以继续在 Replit 中创建私密回复。
 
-We know cloud IDE integrations are important to your classroom and are working hard to bring you more options.
+我们知道云 IDE 集成对您的课堂很重要，正在努力为您带来更多选择。
 
 ## 延伸阅读
 
diff --git a/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md b/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md
index 4b73560688..f273e5faf9 100644
--- a/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md
+++ b/translations/zh-CN/content/github-cli/github-cli/using-github-cli-extensions.md
@@ -1,6 +1,6 @@
 ---
-title: Using GitHub CLI extensions
-intro: 'Learn how to use custom extensions written by other {% data variables.product.prodname_cli %} users.'
+title: 使用 GitHub CLI 扩展
+intro: '了解如何使用其他 {% data variables.product.prodname_cli %} 用户编写的自定义扩展。'
 versions:
   fpt: '*'
   ghes: '*'
@@ -14,21 +14,21 @@ topics:
 
 {% note %}
 
-**Note:** Extensions outside of {% data variables.product.product_name %} and {% data variables.product.prodname_cli %} are not certified by {% data variables.product.product_name %} and are governed by separate terms of service, privacy policy, and support documentation. To mitigate risk when using third-party extensions, audit the source code of the extension before installing or updating the extension.
+**注意： {% data variables.product.product_name %} 和 {% data variables.product.prodname_cli %} 以外的** 扩展未经 {% data variables.product.product_name %} 认证，并受单独的服务条款、隐私政策和支持文档的约束。 要在使用第三方扩展时降低风险，请在安装或更新扩展之前审核扩展的源代码。
 
 {% endnote %}
 
-{% data reusables.cli.cli-extensions %} For more information about how to create {% data variables.product.prodname_cli %} extensions, see "[Creating {% data variables.product.prodname_cli %} extensions](/github-cli/github-cli/creating-github-cli-extensions)."
+{% data reusables.cli.cli-extensions %} 有关如何创建 {% data variables.product.prodname_cli %} 扩展的详细信息，请参阅“[创建 {% data variables.product.prodname_cli %} 扩展](/github-cli/github-cli/creating-github-cli-extensions)”。
 
-Extensions are locally installed and are scoped to the user. Therefore, if you access {% data variables.product.prodname_cli %} from a different machine or another user accesses {% data variables.product.prodname_cli %} from the same machine, the extension will not be available.
+扩展在本地安装，范围限定为用户。 因此，如果您从另一台计算机访问 {% data variables.product.prodname_cli %} ，或者其他用户从同一台计算机访问 {% data variables.product.prodname_cli %} ，则该扩展将不可用。
 
-## Finding extensions
+## 查找扩展
 
-You can find extensions by browsing [repositories with the `gh-extension` topic](https://github.com/topics/gh-extension).
+您可以通过浏览[具有 `gh-extension` 主题的存储库](https://github.com/topics/gh-extension)来查找扩展。
 
-## Installing extensions
+## 安装扩展
 
-To install an extension, use the `extensions install` subcommand. Replace the `repo` parameter with the repository of the extension. You can use the full URL, such as `https://github.com/octocat/gh-whoami`, or just the owner and repository, such as `octocat/gh-whoami`.
+要安装扩展，请使用 `extensions install` 子命令。 将 `repo` 参数替换为扩展的存储库。 You can use the full URL, such as `https://github.com/octocat/gh-whoami`, or just the owner and repository, such as `octocat/gh-whoami`.
 
 If the owner and repository are used, `gh` will install the extension using the hostname to which `gh` is currently authenticated. The full URL format is useful when installing extensions from a different host. For example, users on {% data variables.product.prodname_ghe_server %} should use the full repository URL to install extensions from {% data variables.product.prodname_dotcom_the_website %} or any other host.
 
diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
index d720d1d2d0..7ebee46c59 100644
--- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
@@ -1,6 +1,6 @@
 ---
 title: 管理组织允许的 IP 地址
-intro: 您可以通过配置允许连接的 IP 地址列表来限制对组织资产的访问。
+intro: You can restrict access to your organization's private assets by configuring a list of IP addresses that are allowed to connect.
 product: '{% data reusables.gated-features.allowed-ip-addresses %}'
 redirect_from:
   - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization
@@ -19,7 +19,7 @@ shortTitle: 管理允许的 IP 地址
 
 ## 关于允许的 IP 地址
 
-您可以通过为特定 IP 地址配置允许列表来限制对组织资产的访问。 {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
+You can restrict access to private organization assets by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
 
 {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %}
 
@@ -27,7 +27,7 @@ shortTitle: 管理允许的 IP 地址
 
 如果您设置了允许列表，您还可以选择将为组织中安装的 {% data variables.product.prodname_github_apps %} 配置的任何 IP 地址自动添加到允许列表中。 {% data variables.product.prodname_github_app %} 的创建者可以为其应用程序配置允许列表，指定应用程序运行的 IP 地址。 通过将允许列表继承到您的列表中，您可以避免申请中的连接请求被拒绝。 更多信息请参阅“[允许 {% data variables.product.prodname_github_apps %} 访问](#allowing-access-by-github-apps)”。
 
-您还可以为企业帐户中的组织配置允许的 IP 地址。 更多信息请参阅“[在企业中实施安全设置策略](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)”。
+您还可以为企业帐户中的组织配置允许的 IP 地址。 更多信息请参阅“[在企业中实施安全设置策略](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)”。
 
 ## 添加允许的 IP 地址
 
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
index 683628112a..bf281764ec 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
@@ -60,94 +60,98 @@ In addition to managing organization-level settings, organization owners have ad
 
 {% endnote %}
 {% endif %}
-| 仓库操作                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |  读取   |  分类   |  写入   |  维护   |                      管理员                      |
-|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:-----:|:-----:|:---------------------------------------------:|
-| Manage [individual](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository), [team](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository), and [outside collaborator](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization) access to the repository |       |       |       |       |                     **X**                     |
-| 从人员或团队的已分配仓库拉取                                                                                                                                                                                                                                                                                                                                                                                                                                                              | **X** | **X** | **X** | **X** |                     **X**                     |
-| 复刻人员或团队的已分配仓库                                                                                                                                                                                                                                                                                                                                                                                                                                                               | **X** | **X** | **X** | **X** |                     **X**                     |
-| 编辑和删除自己的评论                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | **X** | **X** | **X** | **X** |                     **X**                     |
-| 打开议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                     **X**                     |
-| 关闭自己打开的议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | **X** | **X** | **X** | **X** |                     **X**                     |
-| 重新打开自己关闭的议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | **X** | **X** | **X** | **X** |                     **X**                     |
-| 受理议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                     **X**                     |
-| 从团队已分配仓库的复刻发送拉取请求                                                                                                                                                                                                                                                                                                                                                                                                                                                           | **X** | **X** | **X** | **X** |                     **X**                     |
-| 提交拉取请求审查                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | **X** | **X** | **X** | **X** |                     **X**                     |
-| 查看已发布的版本                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | **X** | **X** | **X** | **X** |      **X** |{% ifversion fpt or ghec %}
-| 查看 [GitHub Actions 工作流程运行](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)                                                                                                                                                                                                                                                                                                                                                                   | **X** | **X** | **X** | **X** |              **X** 
+| 仓库操作                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |  读取   |  分类   |  写入   |  维护   |                                 管理员                                 |
+|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:-----:|:-----:|:-----:|:-----:|:-------------------------------------------------------------------:|
+| Manage [individual](/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository), [team](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository), and [outside collaborator](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization) access to the repository |       |       |       |       |                                **X**                                |
+| 从人员或团队的已分配仓库拉取                                                                                                                                                                                                                                                                                                                                                                                                                                                              | **X** | **X** | **X** | **X** |                                **X**                                |
+| 复刻人员或团队的已分配仓库                                                                                                                                                                                                                                                                                                                                                                                                                                                               | **X** | **X** | **X** | **X** |                                **X**                                |
+| 编辑和删除自己的评论                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | **X** | **X** | **X** | **X** |                                **X**                                |
+| 打开议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                                **X**                                |
+| 关闭自己打开的议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | **X** | **X** | **X** | **X** |                                **X**                                |
+| 重新打开自己关闭的议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | **X** | **X** | **X** | **X** |                                **X**                                |
+| 受理议题                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                                **X**                                |
+| 从团队已分配仓库的复刻发送拉取请求                                                                                                                                                                                                                                                                                                                                                                                                                                                           | **X** | **X** | **X** | **X** |                                **X**                                |
+| 提交拉取请求审查                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | **X** | **X** | **X** | **X** |                                **X**                                |
+| 查看已发布的版本                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | **X** | **X** | **X** | **X** |                 **X** |{% ifversion fpt or ghec %}
+| 查看 [GitHub Actions 工作流程运行](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)                                                                                                                                                                                                                                                                                                                                                                   | **X** | **X** | **X** | **X** |                         **X** 
 {% endif %}
-| 编辑公共仓库中的 Wiki                                                                                                                                                                                                                                                                                                                                                                                                                                                               | **X** | **X** | **X** | **X** |                     **X**                     |
-| 编辑私有仓库中的 Wiki                                                                                                                                                                                                                                                                                                                                                                                                                                                               |       |       | **X** | **X** |      **X** |{% ifversion fpt or ghec %}
-| [举报滥用或垃圾内容](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam)                                                                                                                                                                                                                                                                                                                                                                                         | **X** | **X** | **X** | **X** |              **X** 
+| 编辑公共仓库中的 Wiki                                                                                                                                                                                                                                                                                                                                                                                                                                                               | **X** | **X** | **X** | **X** |                                **X**                                |
+| 编辑私有仓库中的 Wiki                                                                                                                                                                                                                                                                                                                                                                                                                                                               |       |       | **X** | **X** |                 **X** |{% ifversion fpt or ghec %}
+| [举报滥用或垃圾内容](/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam)                                                                                                                                                                                                                                                                                                                                                                                         | **X** | **X** | **X** | **X** |                         **X** 
 {% endif %}
-| 应用/忽略标签                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       | **X** | **X** | **X** |                     **X**                     |
-| 创建、编辑、删除标签                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                     **X**                     |
-| 关闭、重新打开和分配所有议题与拉取请求                                                                                                                                                                                                                                                                                                                                                                                                                                                         |       | **X** | **X** | **X** |                     **X**                     |
-| [在拉取请求上启用和禁用自动合并](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)                                                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |                     **X**                     |
-| 应用里程碑                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |       | **X** | **X** | **X** |                     **X**                     |
-| 标记[重复的议题和拉取请求](/articles/about-duplicate-issues-and-pull-requests)                                                                                                                                                                                                                                                                                                                                                                                                          |       | **X** | **X** | **X** |                     **X**                     |
-| 申请[拉取请求审查](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)                                                                                                                                                                                                                                                                                                                              |       | **X** | **X** | **X** |                     **X**                     |
-| 合并[拉取请求](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                     **X**                     |
-| 推送到（写入）人员或团队的已分配仓库                                                                                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                     **X**                     |
-| 编辑和删除任何人对提交、拉取请求和议题的评论                                                                                                                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                     **X**                     |
-| [隐藏任何人的评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments)                                                                                                                                                                                                                                                                                                                                                                                 |       |       | **X** | **X** |                     **X**                     |
-| [锁定对话](/communities/moderating-comments-and-conversations/locking-conversations)                                                                                                                                                                                                                                                                                                                                                                                            |       |       | **X** | **X** |                     **X**                     |
-| 转让议题（更多信息请参阅“[将议题转让给其他仓库](/articles/transferring-an-issue-to-another-repository)”）                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                     **X**                     |
-| [作为仓库的指定代码所有者](/articles/about-code-owners)                                                                                                                                                                                                                                                                                                                                                                                                                                 |       |       | **X** | **X** |                     **X**                     |
-| [将拉取请求草稿标记为可供审查](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request)                                                                                                                                                                                                                                                                                                                    |       |       | **X** | **X** |                     **X**                     |
-| [将拉取请求转换为草稿](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request)                                                                                                                                                                                                                                                                                                                        |       |       | **X** | **X** |                     **X**                     |
-| 提交影响拉取请求可合并性的审查                                                                                                                                                                                                                                                                                                                                                                                                                                                             |       |       | **X** | **X** |                     **X**                     |
-| 对拉取请求[应用建议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request)                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |                     **X**                     |
-| 创建[状态检查](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |      **X** |{% ifversion fpt or ghec %}
-| 创建、编辑、运行、重新运行和取消 [GitHub Actions 工作流程](/actions/automating-your-workflow-with-github-actions/)                                                                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |              **X** 
+| 应用/忽略标签                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       | **X** | **X** | **X** |                                **X**                                |
+| 创建、编辑、删除标签                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                                **X**                                |
+| 关闭、重新打开和分配所有议题与拉取请求                                                                                                                                                                                                                                                                                                                                                                                                                                                         |       | **X** | **X** | **X** |                                **X**                                |
+| [在拉取请求上启用和禁用自动合并](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)                                                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |                                **X**                                |
+| 应用里程碑                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |       | **X** | **X** | **X** |                                **X**                                |
+| 标记[重复的议题和拉取请求](/articles/about-duplicate-issues-and-pull-requests)                                                                                                                                                                                                                                                                                                                                                                                                          |       | **X** | **X** | **X** |                                **X**                                |
+| 申请[拉取请求审查](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review)                                                                                                                                                                                                                                                                                                                              |       | **X** | **X** | **X** |                                **X**                                |
+| 合并[拉取请求](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                                **X**                                |
+| 推送到（写入）人员或团队的已分配仓库                                                                                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                                **X**                                |
+| 编辑和删除任何人对提交、拉取请求和议题的评论                                                                                                                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                                **X**                                |
+| [隐藏任何人的评论](/communities/moderating-comments-and-conversations/managing-disruptive-comments)                                                                                                                                                                                                                                                                                                                                                                                 |       |       | **X** | **X** |                                **X**                                |
+| [锁定对话](/communities/moderating-comments-and-conversations/locking-conversations)                                                                                                                                                                                                                                                                                                                                                                                            |       |       | **X** | **X** |                                **X**                                |
+| 转让议题（更多信息请参阅“[将议题转让给其他仓库](/articles/transferring-an-issue-to-another-repository)”）                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                                **X**                                |
+| [作为仓库的指定代码所有者](/articles/about-code-owners)                                                                                                                                                                                                                                                                                                                                                                                                                                 |       |       | **X** | **X** |                                **X**                                |
+| [将拉取请求草稿标记为可供审查](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request)                                                                                                                                                                                                                                                                                                                    |       |       | **X** | **X** |                                **X**                                |
+| [将拉取请求转换为草稿](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request)                                                                                                                                                                                                                                                                                                                        |       |       | **X** | **X** |                                **X**                                |
+| 提交影响拉取请求可合并性的审查                                                                                                                                                                                                                                                                                                                                                                                                                                                             |       |       | **X** | **X** |                                **X**                                |
+| 对拉取请求[应用建议的更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request)                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |                                **X**                                |
+| 创建[状态检查](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                 **X** |{% ifversion fpt or ghec %}
+| 创建、编辑、运行、重新运行和取消 [GitHub Actions 工作流程](/actions/automating-your-workflow-with-github-actions/)                                                                                                                                                                                                                                                                                                                                                                              |       |       | **X** | **X** |                         **X** 
 {% endif %}
-| 创建和编辑发行版                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |       |       | **X** | **X** |                     **X**                     |
-| 查看发行版草稿                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       | **X** | **X** |                     **X**                     |
-| 编辑仓库的说明                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       |       | **X** |  **X** |{% ifversion fpt or ghae or ghec %}
-| [查看和安装包](/packages/publishing-and-managing-packages)                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                     **X**                     |
-| [发布包](/packages/publishing-and-managing-packages/publishing-a-package)                                                                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                     **X**                     |
-| [删除和恢复包](/packages/learn-github-packages/deleting-and-restoring-a-package)                                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                     **X**                     |{% endif %}
-| 管理[主题](/articles/classifying-your-repository-with-topics)                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       | **X** |                     **X**                     |
-| 启用 wiki 和限制 wiki 编辑器                                                                                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       | **X** |                     **X**                     |
-| 启用项目板                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |       |       |       | **X** |                     **X**                     |
-| 配置[拉取请求合并](/articles/configuring-pull-request-merges)                                                                                                                                                                                                                                                                                                                                                                                                                       |       |       |       | **X** |                     **X**                     |
-| 配置[ {% data variables.product.prodname_pages %} 的发布源](/articles/configuring-a-publishing-source-for-github-pages)                                                                                                                                                                                                                                                                                                                                                           |       |       |       | **X** |                     **X**                     |
-| [推送到受保护分支](/articles/about-protected-branches)                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       | **X** |                     **X**                     |
-| [创建和编辑仓库社交卡](/articles/customizing-your-repositorys-social-media-preview)                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       | **X** |      **X** |{% ifversion fpt or ghec %}
-| 限制[仓库中的交互](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                     |       |       |       | **X** |              **X** 
+| 创建和编辑发行版                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |       |       | **X** | **X** |                                **X**                                |
+| 查看发行版草稿                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       | **X** | **X** |                                **X**                                |
+| 编辑仓库的说明                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       |       | **X** |             **X** |{% ifversion fpt or ghae or ghec %}
+| [查看和安装包](/packages/publishing-and-managing-packages)                                                                                                                                                                                                                                                                                                                                                                                                                        | **X** | **X** | **X** | **X** |                                **X**                                |
+| [发布包](/packages/publishing-and-managing-packages/publishing-a-package)                                                                                                                                                                                                                                                                                                                                                                                                      |       |       | **X** | **X** |                                **X**                                |
+| [删除和恢复包](/packages/learn-github-packages/deleting-and-restoring-a-package)                                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                                **X**                                |{% endif %}
+| 管理[主题](/articles/classifying-your-repository-with-topics)                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       | **X** |                                **X**                                |
+| 启用 wiki 和限制 wiki 编辑器                                                                                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       | **X** |                                **X**                                |
+| 启用项目板                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |       |       |       | **X** |                                **X**                                |
+| 配置[拉取请求合并](/articles/configuring-pull-request-merges)                                                                                                                                                                                                                                                                                                                                                                                                                       |       |       |       | **X** |                                **X**                                |
+| 配置[ {% data variables.product.prodname_pages %} 的发布源](/articles/configuring-a-publishing-source-for-github-pages)                                                                                                                                                                                                                                                                                                                                                           |       |       |       | **X** |                                **X**                                |
+| [Manage branch protection rules](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule)                                                                                                                                                                                                                                                                                             |       |       |       |       |                                **X**                                |
+| [推送到受保护分支](/articles/about-protected-branches)                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       | **X** |                                **X**                                |
+| 合并受保护分支上的拉取请求（即使没有批准审查）                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       |       |       | **X** |{% ifversion fpt or ghes > 3.4 or ghae-issue-6337 or ghec %}
+| Create tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)                                                                                                                                                                                                                                                                                                 |       |       |       | **X** |                                **X**                                |
+| Delete tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)                                                                                                                                                                                                                                                                                                 |       |       |       |       |                         **X** 
 {% endif %}
-| 删除议题（请参阅“[删除议题](/articles/deleting-an-issue)”）                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                     **X**                     |
-| 合并受保护分支上的拉取请求（即使没有批准审查）                                                                                                                                                                                                                                                                                                                                                                                                                                                     |       |       |       |       |                     **X**                     |
-| [定义仓库的代码所有者](/articles/about-code-owners)                                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       |       |                     **X**                     |
-| 将仓库添加到团队（详细信息请参阅“[管理团队对组织仓库的访问](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)”）                                                                                                                                                                                                                                                                                |       |       |       |       |                     **X**                     |
-| [管理外部协作者对仓库的权限](/articles/adding-outside-collaborators-to-repositories-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                |       |       |       |       |                     **X**                     |
-| [更改仓库的可见性](/articles/restricting-repository-visibility-changes-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       |       |                     **X**                     |
-| 将仓库设为模板（请参阅“[创建模板仓库](/articles/creating-a-template-repository)”）                                                                                                                                                                                                                                                                                                                                                                                                            |       |       |       |       |                     **X**                     |
-| 更改仓库设置                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |       |       |       |       |                     **X**                     |
-| 管理团队和协作者对仓库的权限                                                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                     **X**                     |
-| 编辑仓库的默认分支                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       |       |                     **X**                     |
-| 重命名仓库的默认分支（请参阅“[重命名分支](/github/administering-a-repository/renaming-a-branch)”）                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                     **X**                     |
-| 重命名仓库默认分支以外的分支（请参阅“[重命名分支](/github/administering-a-repository/renaming-a-branch)”）                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                     **X**                     |
-| 管理 web 挂钩和部署密钥                                                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |      **X** |{% ifversion fpt or ghec %}
-| [管理私有仓库的数据使用设置](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)                                                                                                                                                                                                                                                                                                                                                                      |       |       |       |       |              **X** 
+| [创建和编辑仓库社交卡](/articles/customizing-your-repositorys-social-media-preview)                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       | **X** |                 **X** |{% ifversion fpt or ghec %}
+| 限制[仓库中的交互](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                     |       |       |       | **X** |                         **X** 
 {% endif %}
-| [管理仓库的复刻策略](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)                                                                                                                                                                                                                                                                                                                                                                             |       |       |       |       |                     **X**                     |
-| [将仓库转让给组织](/articles/restricting-repository-creation-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                     **X**                     |
-| [删除仓库或将仓库转让到组织外部](/articles/setting-permissions-for-deleting-or-transferring-repositories)                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                     **X**                     |
-| [存档仓库](/articles/about-archiving-repositories)                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |      **X** |{% ifversion fpt or ghec %}
-| 显示赞助按钮（请参阅“[在仓库中显示赞助按钮](/articles/displaying-a-sponsor-button-in-your-repository)”）。                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       |       |              **X** 
+| 删除议题（请参阅“[删除议题](/articles/deleting-an-issue)”）                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                                **X**                                |
+| [定义仓库的代码所有者](/articles/about-code-owners)                                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       |       |                                **X**                                |
+| 将仓库添加到团队（详细信息请参阅“[管理团队对组织仓库的访问](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)”）                                                                                                                                                                                                                                                                                |       |       |       |       |                                **X**                                |
+| [管理外部协作者对仓库的权限](/articles/adding-outside-collaborators-to-repositories-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                |       |       |       |       |                                **X**                                |
+| [更改仓库的可见性](/articles/restricting-repository-visibility-changes-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       |       |                                **X**                                |
+| 将仓库设为模板（请参阅“[创建模板仓库](/articles/creating-a-template-repository)”）                                                                                                                                                                                                                                                                                                                                                                                                            |       |       |       |       |                                **X**                                |
+| 更改仓库设置                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |       |       |       |       |                                **X**                                |
+| 管理团队和协作者对仓库的权限                                                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                                **X**                                |
+| 编辑仓库的默认分支                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |       |       |       |       |                                **X**                                |
+| 重命名仓库的默认分支（请参阅“[重命名分支](/github/administering-a-repository/renaming-a-branch)”）                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                                **X**                                |
+| 重命名仓库默认分支以外的分支（请参阅“[重命名分支](/github/administering-a-repository/renaming-a-branch)”）                                                                                                                                                                                                                                                                                                                                                                                          |       |       | **X** | **X** |                                **X**                                |
+| 管理 web 挂钩和部署密钥                                                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                 **X** |{% ifversion fpt or ghec %}
+| [管理私有仓库的数据使用设置](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)                                                                                                                                                                                                                                                                                                                                                                      |       |       |       |       |                         **X** 
 {% endif %}
-| Create autolink references to external resources, like Jira or Zendesk (see "[Configuring autolinks to reference external resources](/articles/configuring-autolinks-to-reference-external-resources)")                                                                                                                                                                                                                                                                     |       |       |       |       |      **X** |{% ifversion fpt or ghec %}
-| 在仓库中[启用 {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)                                                                                                                                                                                                                                                                                                                    |       |       |       | **X** |                     **X**                     |
-| 为 {% data variables.product.prodname_discussions %} [创建和编辑类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                  |       |       |       | **X** |                     **X**                     |
-| [将讨论移动到其他类别](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                     **X**                     |
-| [将讨论转移到](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)新仓库                                                                                                                                                                                                                                                                                                                                                                   |       |       | **X** | **X** |                     **X**                     |
-| [管理置顶的讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                     |       |       | **X** | **X** |                     **X**                     |
-| [批量将议题转换为讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                     **X**                     |
-| [锁定和解锁讨论](/discussions/managing-discussions-for-your-community/moderating-discussions)                                                                                                                                                                                                                                                                                                                                                                                      |       | **X** | **X** | **X** |                     **X**                     |
-| [单独将议题转换为讨论](/discussions/managing-discussions-for-your-community/moderating-discussions)                                                                                                                                                                                                                                                                                                                                                                                   |       | **X** | **X** | **X** |                     **X**                     |
-| [创建新的讨论并对现有讨论发表评论](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion)                                                                                                                                                                                                                                                                                                                                                          | **X** | **X** | **X** | **X** |                     **X**                     |
-| [删除讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion)                                                                                                                                                                                                                                                                                                                                                  |       | **X** |       | **X** | **X** |{% endif %}{% ifversion fpt or ghec %}
-| 创建 [codespaces](/codespaces/about-codespaces)                                                                                                                                                                                                                                                                                                                                                                                                                               |       |       | **X** | **X** |              **X** 
+| [管理仓库的复刻策略](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)                                                                                                                                                                                                                                                                                                                                                                             |       |       |       |       |                                **X**                                |
+| [将仓库转让给组织](/articles/restricting-repository-creation-in-your-organization)                                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                                **X**                                |
+| [删除仓库或将仓库转让到组织外部](/articles/setting-permissions-for-deleting-or-transferring-repositories)                                                                                                                                                                                                                                                                                                                                                                                  |       |       |       |       |                                **X**                                |
+| [存档仓库](/articles/about-archiving-repositories)                                                                                                                                                                                                                                                                                                                                                                                                                              |       |       |       |       |                 **X** |{% ifversion fpt or ghec %}
+| 显示赞助按钮（请参阅“[在仓库中显示赞助按钮](/articles/displaying-a-sponsor-button-in-your-repository)”）。                                                                                                                                                                                                                                                                                                                                                                                        |       |       |       |       |                         **X** 
+{% endif %}
+| Create autolink references to external resources, like Jira or Zendesk (see "[Configuring autolinks to reference external resources](/articles/configuring-autolinks-to-reference-external-resources)")                                                                                                                                                                                                                                                                     |       |       |       |       |                 **X** |{% ifversion fpt or ghec %}
+| 在仓库中[启用 {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)                                                                                                                                                                                                                                                                                                                    |       |       |       | **X** |                                **X**                                |
+| 为 {% data variables.product.prodname_discussions %} [创建和编辑类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                  |       |       |       | **X** |                                **X**                                |
+| [将讨论移动到其他类别](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                                **X**                                |
+| [将讨论转移到](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)新仓库                                                                                                                                                                                                                                                                                                                                                                   |       |       | **X** | **X** |                                **X**                                |
+| [管理置顶的讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                     |       |       | **X** | **X** |                                **X**                                |
+| [批量将议题转换为讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)                                                                                                                                                                                                                                                                                                                                                                  |       |       | **X** | **X** |                                **X**                                |
+| [锁定和解锁讨论](/discussions/managing-discussions-for-your-community/moderating-discussions)                                                                                                                                                                                                                                                                                                                                                                                      |       | **X** | **X** | **X** |                                **X**                                |
+| [单独将议题转换为讨论](/discussions/managing-discussions-for-your-community/moderating-discussions)                                                                                                                                                                                                                                                                                                                                                                                   |       | **X** | **X** | **X** |                                **X**                                |
+| [创建新的讨论并对现有讨论发表评论](/discussions/collaborating-with-your-community-using-discussions/participating-in-a-discussion)                                                                                                                                                                                                                                                                                                                                                          | **X** | **X** | **X** | **X** |                                **X**                                |
+| [删除讨论](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository#deleting-a-discussion)                                                                                                                                                                                                                                                                                                                                                  |       | **X** |       | **X** |            **X** |{% endif %}{% ifversion fpt or ghec %}
+| 创建 [codespaces](/codespaces/about-codespaces)                                                                                                                                                                                                                                                                                                                                                                                                                               |       |       | **X** | **X** |                         **X** 
 {% endif %}
 
 ### Access requirements for security features
diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
index 5e08b5d138..f58eecfe2f 100644
--- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
@@ -84,6 +84,8 @@ You can only choose an additional permission if it's not already included in the
 - **Set interaction limits**: Temporarily restrict certain users from commenting, opening issues, or creating pull requests in your public repository to enforce a period of limited activity. For more information, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)."
 - **Set the social preview**: Add an identifying image to your repository that appears on social media platforms when your repository is linked. 更多信息请参阅“[自定义仓库的社交媒体审查](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)”。
 - **Push commits to protected branches**: Push to a branch that is marked as a protected branch.
+- **Create protected tags**: Create tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."
+- **Delete protected tags**: Delete tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."
 
 ### 安全
 
diff --git a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
index 536076c1c4..cd8bbbf705 100644
--- a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
@@ -22,8 +22,6 @@ shortTitle: 启用和测试 SAML SSO
 
 {% data reusables.saml.saml-disabled-linked-identities-removed %}
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
-
 ## 启用和测试组织的 SAML 单点登录
 
 在组织中实施 SAML SSO 之前，请确保您已准备好组织。 更多信息请参阅“[准备在组织中实施 SAML 单点登录](/articles/preparing-to-enforce-saml-single-sign-on-in-your-organization)”。
diff --git a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
index 4565050b6d..7c3f67efba 100644
--- a/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
+++ b/translations/zh-CN/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
@@ -36,10 +36,6 @@ When you enable auto assignment, any time your team has been requested to review
 
 When code owners are automatically requested for review, the team is still removed and replaced with individuals unless a branch protection rule is configured to require review from code owners. If such a branch protection rule is in place, the team request cannot be removed and so the individual request will appear in addition.
 
-{% ifversion fpt %}
-为了进一步提高团队的协作能力，您可以升级到 {% data variables.product.prodname_ghe_cloud %}，其中包括受保护的分支机构和私有仓库的代码所有者等功能。 {% data reusables.enterprise.link-to-ghec-trial %}
-{% endif %}
-
 ### 路由算法
 
 代码审查分配根据两种可能的算法之一自动选择和分配审查者。
diff --git a/translations/zh-CN/content/packages/index.md b/translations/zh-CN/content/packages/index.md
index 210aab102a..014ca354fb 100644
--- a/translations/zh-CN/content/packages/index.md
+++ b/translations/zh-CN/content/packages/index.md
@@ -12,11 +12,11 @@ featuredLinks:
     - /packages/learn-github-packages/installing-a-package
   popular:
     - /packages/working-with-a-github-packages-registry/working-with-the-npm-registry
-    - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
+    - '{% ifversion fpt or ghec%}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
     - /packages/learn-github-packages
     - /packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry
   guideCards:
-    - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
+    - '{% ifversion fpt or ghec %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
     - /packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry
 changelog:
   label: packages
diff --git a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
index b7650ff4b4..dc433c384c 100644
--- a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
+++ b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
@@ -1,6 +1,6 @@
 ---
 title: Working with the Docker registry
-intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry, which uses the package namespace `https://docker.pkg.github.com`.{% endif %}'
+intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry.{% endif %}'
 product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /articles/configuring-docker-for-use-with-github-package-registry
diff --git a/translations/zh-CN/content/pages/getting-started-with-github-pages/about-github-pages.md b/translations/zh-CN/content/pages/getting-started-with-github-pages/about-github-pages.md
index 6f05a8fd66..72814d0494 100644
--- a/translations/zh-CN/content/pages/getting-started-with-github-pages/about-github-pages.md
+++ b/translations/zh-CN/content/pages/getting-started-with-github-pages/about-github-pages.md
@@ -92,21 +92,21 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat
 ## Limits on use of {% data variables.product.prodname_pages %}
 
 {% ifversion fpt or ghec %}
-{% data variables.product.prodname_pages %} sites created after June 15, 2016 and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
+{% data variables.product.prodname_pages %} sites created after June 15, 2016, and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
 
 ### Prohibited uses
 {% endif %}
-{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
+{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web-hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
 
-In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get rich quick schemes, sexually obscene content, and violent or threatening content or activity.
+In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get-rich-quick schemes, sexually obscene content, and violent or threatening content or activity.
 
 ### Usage limits
 {% data variables.product.prodname_pages %} sites are subject to the following usage limits:
 
-  - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?"](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations){% endif %}
+  - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1 GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations)"{% endif %}
   - Published {% data variables.product.prodname_pages %} sites may be no larger than 1 GB.
 {% ifversion fpt or ghec %}
-  - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100GB per month.
+  - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100 GB per month.
   - {% data variables.product.prodname_pages %} sites have a *soft* limit of 10 builds per hour.
 
 If your site exceeds these usage quotas, we may not be able to serve your site, or you may receive a polite email from {% data variables.contact.contact_support %} suggesting strategies for reducing your site's impact on our servers, including putting a third-party content distribution network (CDN) in front of your site, making use of other {% data variables.product.prodname_dotcom %} features such as releases, or moving to a different hosting service that might better fit your needs.
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md
index d5f3d1d8c4..22ff0809bc 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md
@@ -39,22 +39,22 @@ remote: error: Required status check "ci-build" is failing
 
 {% ifversion fpt or ghae or ghes or ghec %}
 
-## Conflicts between head commit and test merge commit
+## 头部提交与测试合并提交之间的冲突
 
 有时，测试合并提交与头部提交的状态检查结果存在冲突。 如果测试合并提交具有状态，则测试合并提交必须通过。 否则，必须传递头部提交的状态后才可合并该分支。 有关测试合并提交的更多信息，请参阅“[拉取](/rest/reference/pulls#get-a-pull-request)”。
 
 ![具有冲突的合并提交的分支](/assets/images/help/repository/req-status-check-conflicting-merge-commits.png)
 {% endif %}
 
-## Handling skipped but required checks
+## 处理已跳过但需要检查
 
-Sometimes a required status check is skipped on pull requests due to path filtering. For example, a Node.JS test will be skipped on a pull request that just fixes a typo in your README file and makes no changes to the JavaScript and TypeScript files in the `scripts` directory.
+有时，由于路径筛选，在拉取请求上会跳过所需的状态检查。 例如，Node.JS 测试在仅修复自述文件中拼写错误的拉取请求上将跳过，并且不会更改 `scripts` 目录中的 JavaScript 和 TypeScript 文件。
 
-If this check is required and it gets skipped, then the check's status is shown as pending, because it's required. In this situation you won't be able to merge the pull request.
+如果此检查是必需的，并且被跳过，则检查的状态将显示为挂起，因为它是必需的。 在此情况下，您将无法合并拉取请求。
 
 ### 示例
 
-In this example you have a workflow that's required to pass.
+在此示例中，您有一个需要通过的工作流程。
 
 ```yaml
 name: ci
@@ -81,11 +81,11 @@ jobs:
     - run: npm test
 ```
 
-If someone submits a pull request that changes a markdown file in the root of the repository, then the workflow above won't run at all because of the path filtering. As a result you won't be able to merge the pull request. You would see the following status on the pull request:
+如果有人提交更改存储库根目录中 Markdown 文件的拉取请求，则上述工作流程将因路径筛选而完全不会运行。 因此，您将无法合并拉取请求。 您将在拉取请求上看到以下状态：
 
-![Required check skipped but shown as pending](/assets/images/help/repository/PR-required-check-skipped.png)
+![必需的检查已跳过，但显示为挂起](/assets/images/help/repository/PR-required-check-skipped.png)
 
-You can fix this by creating a generic workflow, with the same name, that will return true in any case similar to the workflow below :
+您可以通过创建具有相同名称的通用工作流程来解决此问题，该工作流程在任何情况下都将返回 true，类似于下面的工作流程：
 
 ```yaml
 name: ci
@@ -100,21 +100,21 @@ jobs:
     steps:
       - run: 'echo "No build required" '
 ```
-Now the checks will always pass whenever someone sends a pull request that doesn't change the files listed under `paths` in the first workflow.
+现在，每当有人发送拉取请求时，检查将始终通过，该请求不会更改第一个工作流程中`路径下`列出的文件。
 
-![Check skipped but passes due to generic workflow](/assets/images/help/repository/PR-required-check-passed-using-generic.png)
+![检查已跳过，但由于通用工作流程而通过](/assets/images/help/repository/PR-required-check-passed-using-generic.png)
 
 {% note %}
 
 **注意：**
-* Make sure that the `name` key and required job name in both the workflow files are the same. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions)".
-* The example above uses {% data variables.product.prodname_actions %} but this workaround is also applicable to other CI/CD providers that integrate with {% data variables.product.company_short %}.
+* 确保两个工作流程文件中`名称`键和所需的作业名称相同。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程语法](/actions/reference/workflow-syntax-for-github-actions)”。
+* 上面的示例使用 {% data variables.product.prodname_actions %} 但此解决方法也适用于与 {% data variables.product.company_short %} 集成的其他 CI/CD 提供程序。
 
 {% endnote %}
 
-{% ifversion fpt or ghes > 3.3 or ghae-issue-5379 or ghec %}It's also possible for a protected branch to require a status check from a specific {% data variables.product.prodname_github_app %}. If you see a message similar to the following, then you should verify that the check listed in the merge box was set by the expected app.
+{% ifversion fpt or ghes > 3.3 or ghae-issue-5379 or ghec %}受保护分支也可能要求特定 {% data variables.product.prodname_github_app %} 进行状态检查。 如果看到类似于以下内容的消息，则应验证合并框中列出的检查项是否由预期的应用设置。
 
 ```
-Required status check "build" was not set by the expected {% data variables.product.prodname_github_app %}.
+必需状态检查 "build" 未由预期的 {% data variables.product.prodname_github_app %} 设置。
 ```
 {% endif %}
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 264d30dae4..94780f3014 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
@@ -45,5 +45,5 @@ shortTitle: 更改默认分支
 1. 在“Default branch（默认分支）”下，在默认分支名称的右侧单击 {% octicon "arrow-switch" aria-label="The switch icon with two arrows" %}。 ![当前默认分支名称右侧的两个箭头切换图标](/assets/images/help/repository/repository-options-defaultbranch-change.png)
 1. 使用下拉菜单，然后单击分支名称。 ![选择新默认分支的下拉菜单](/assets/images/help/repository/repository-options-defaultbranch-drop-down.png)
 1. 单击 **Update（更新）**。 ![选择新默认分支后的"更新"按钮](/assets/images/help/repository/repository-options-defaultbranch-update.png)
-1. 阅读警告，然后单击 **I understand, update the default branch（我了解，请更新默认分支）**。 !["I understand, update the default branch." button to perform the update](/assets/images/help/repository/repository-options-defaultbranch-i-understand.png)
+1. 阅读警告，然后单击 **I understand, update the default branch（我了解，请更新默认分支）**。 !["我了解，请更新默认分支" 按钮以执行更新](/assets/images/help/repository/repository-options-defaultbranch-i-understand.png)
 
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/about-repositories.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/about-repositories.md
index 8b5f469d07..db5b5c6894 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/about-repositories.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/about-repositories.md
@@ -26,7 +26,7 @@ topics:
 
 您可以通过选择仓库的可见性来限制谁可以访问仓库。 更多信息请参阅“[关于仓库可见性](#about-repository-visibility)”。
 
-对于用户拥有的仓库，您可以向其他人授予协作者访问权限，以便他们可以协作处理您的项目。 如果仓库归组织所有，您可以向组织成员授予访问权限，以便协作处理您的仓库。 For more information, see "[Permission levels for a user account repository](/articles/permission-levels-for-a-user-account-repository/)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)."
+对于用户拥有的仓库，您可以向其他人授予协作者访问权限，以便他们可以协作处理您的项目。 如果仓库归组织所有，您可以向组织成员授予访问权限，以便协作处理您的仓库。 更多信息请参阅“[用户帐户仓库的权限级别](/articles/permission-levels-for-a-user-account-repository/)”和“[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)”。
 
 {% ifversion fpt or ghec %}
 通过用户帐户和组织的 {% data variables.product.prodname_free_team %}，可与无限的协作者合作处理设置了完全功能的无限公共仓库，或者是设置了有限功能的无限私有仓库， 要获取对私有仓库的高级处理，您可以升级到 {% data variables.product.prodname_pro %}、{% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %}。 {% data reusables.gated-features.more-info %}
@@ -48,11 +48,11 @@ topics:
 
 {% ifversion fpt or ghec or ghes %}
 
-When you create a repository, you can choose to make the repository public or private.{% ifversion ghec or ghes %} If you're creating the repository in an organization{% ifversion ghec %} that is owned by an enterprise account{% endif %}, you can also choose to make the repository internal.{% endif %}{% endif %}{% ifversion fpt %} Repositories in organizations that use {% data variables.product.prodname_ghe_cloud %} and are owned by an enterprise account can also be created with internal visibility. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories).
+创建存储库时，可以选择将存储库设为公开或私有。{% ifversion ghec or ghes %} 如果要在{% ifversion ghec %}企业帐户拥有的{% endif %} 组织中创建存储库，则还可以选择将存储库设为内部存储库。{% endif %}{% endif %}{% ifversion fpt %}还可以通过内部可见性创建使用 {% data variables.product.prodname_ghe_cloud %} 并由企业帐户拥有的组织中的存储库。 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/repositories/creating-and-managing-repositories/about-repositories)。
 
 {% elsif ghae %}
 
-When you create a repository owned by your user account, the repository is always private. When you create a repository owned by an organization, you can choose to make the repository private or internal.
+当您创建由您的用户帐户拥有的仓库时，仓库始终是私有的。 创建组织拥有的存储库时，可以选择将存储库设为私有或内部存储库。
 
 {% endif %}
 
@@ -78,19 +78,19 @@ When you create a repository owned by your user account, the repository is alway
 
 {% data reusables.repositories.about-internal-repos %} 有关内部资源的更多信息，请参阅 {% data variables.product.prodname_dotcom %} 的白皮书“[内部资源简介](https://resources.github.com/whitepapers/introduction-to-innersource/)”。
 
-All enterprise members have read permissions to the internal repository, but internal repositories are not visible to people {% ifversion fpt or ghec %}outside of the enterprise{% else %}who are not members of any organization{% endif %}, including outside collaborators on organization repositories. For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise#enterprise-members)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)."
+所有企业成员对内部仓库具有读取权限，但内部仓库对{% ifversion fpt or ghec %}企业外部{% else %}非组织成员{% endif %}的人员不可见，包括组织仓库的外部协作者。 更多信息请参阅“[企业中的角色](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise#enterprise-members)”和“[组织的存储库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)”。
 
 {% ifversion ghes %}
 {% note %}
 
-**Note:** A user must be part of an organization to be an enterprise member and have access to internal repositories. If a user on {% data variables.product.product_location %} is not a member of any organization, that user will not have access to internal repositories.
+**注意：** 用户必须是组织的一部分才能成为企业成员并有权访问内部存储库。 如果 {% data variables.product.product_location %} 上的用户不是任何组织的成员，则该用户将无权访问内部存储库。
 
 {% endnote %}
 {% endif %}
 
 {% data reusables.repositories.internal-repo-default %}
 
-Any member of the enterprise can fork any internal repository owned by an organization in the enterprise. The forked repository will belong to the member's user account, and the visibility of the fork will be private. 如果用户从企业拥有的所有组织中删除，该用户的内部仓库复刻也会自动删除。
+企业的任何成员都可以复刻企业中组织拥有的任何内部存储库。 复刻的存储库将属于成员的用户帐户，复刻的可见性将是私有的。 如果用户从企业拥有的所有组织中删除，该用户的内部仓库复刻也会自动删除。
 {% endif %}
 
 ## 限制查看仓库中的内容和差异
@@ -101,7 +101,7 @@ Any member of the enterprise can fork any internal repository owned by an organi
 
 ### 文本限制
 
-Text files over **512 KB** are always displayed as plain text. 代码不强调语法，散文文件不会转换成 HTML（如 Markdown、AsciiDoc *等*）。
+超过 **512 KB** 的文本文件始终显示为纯文本。 代码不强调语法，散文文件不会转换成 HTML（如 Markdown、AsciiDoc *等*）。
 
 超过 **5 MB** 的文本文件仅通过其源 URL 访问，将通过 `{% data variables.product.raw_github_com %}` 提供；例如 `https://{% data variables.product.raw_github_com %}/octocat/Spoon-Knife/master/index.html`。 单击 **Raw（源）**按钮获取文件的源 URL。
 
@@ -109,8 +109,8 @@ Text files over **512 KB** are always displayed as plain text. 代码不强调
 
 因为差异可能很大，所以我们会对评论、拉取请求和比较视图的差异施加限制：
 
-- In a pull request, no total diff may exceed *20,000 lines that you can load* or *1 MB* of raw diff data.
-- No single file's diff may exceed *20,000 lines that you can load* or *500 KB* of raw diff data. *四百行*和 *20 KB* 会自动加载为一个文件。
+- 在拉取请求中，总差异不得超过*您可以加载的 20,000 行* 或 *1 MB* 的原始差异数据。
+- 任何单个文件的差异都不能超过*您可以加载的 20,000 行，*或 *500 KB* 的原始差异数据。 *四百行*和 *20 KB* 会自动加载为一个文件。
 - 单一差异中的最大文件数限于 *300*。
 - 单一差异中可呈现的文件（如图像、PDF 和 GeoJSON 文件）最大数量限于 *25*。
 
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md
index 002357ffc6..4c7efb95b7 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/creating-a-new-repository.md
@@ -40,7 +40,7 @@ topics:
 3. 在“Owner（所有者）”下拉菜单中，选择要在其上创建仓库的帐户。 ![所有者下拉菜单](/assets/images/help/repository/create-repository-owner.png)
 {% data reusables.repositories.repo-name %}
 {% data reusables.repositories.choose-repo-visibility %}
-6. 如果您不使用模板，可以使用许多可选项预填充仓库。 如果要将现有仓库导入 {% data variables.product.product_name %}，请不要选择上述任何选项，否则可能会导致合并冲突。 您可以通过用户界面添加或创建新文件，或者选择稍后使用命令行添加新文件。 For more information, see "[Importing a Git repository using the command line](/articles/importing-a-git-repository-using-the-command-line/)," "[Adding a file to a repository](/repositories/working-with-files/managing-files/adding-a-file-to-a-repository#adding-a-file-to-a-repository-using-the-command-line)," and "[Addressing merge conflicts](/articles/addressing-merge-conflicts/)."
+6. 如果您不使用模板，可以使用许多可选项预填充仓库。 如果要将现有仓库导入 {% data variables.product.product_name %}，请不要选择上述任何选项，否则可能会导致合并冲突。 您可以通过用户界面添加或创建新文件，或者选择稍后使用命令行添加新文件。 更多信息请参阅“[使用命令行导入 Git 存储库](/articles/importing-a-git-repository-using-the-command-line/)”、“[将文件添加到存储库](/repositories/working-with-files/managing-files/adding-a-file-to-a-repository#adding-a-file-to-a-repository-using-the-command-line)”和“[解决合并冲突](/articles/addressing-merge-conflicts/)”。
     - 您可以创建自述文件以介绍您的项目。 更多信息请参阅“[关于自述文件](/articles/about-readmes/)”。
     - 您可以创建 *.gitignore* 文件以设置忽略规则。 更多信息请参阅“[忽略文件](/github/getting-started-with-github/ignoring-files)”。{% ifversion fpt or ghec %}
     - 您可以选择为项目添加软件许可。 更多信息请参阅“[许可仓库](/articles/licensing-a-repository)”。{% endif %}
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
index 9eb8618b60..53f0cd0502 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
@@ -36,13 +36,13 @@ topics:
   ```
 3. 镜像推送至新仓库。
   ```shell
-  $ cd old-repository
+  $ cd old-repository.git
   $ git push --mirror https://{% data variables.command_line.codeblock %}/exampleuser/new-repository.git
   ```
 4. 删除您之前创建的临时本地仓库。
   ```shell
   $ cd ..
-  $ rm -rf old-repository
+  $ rm -rf old-repository.git
   ```
 
 ## 镜像包含 {% data variables.large_files.product_name_long %} 对象的仓库。
@@ -54,7 +54,7 @@ topics:
   ```
 3. 导航到刚克隆的仓库。
   ```shell
-  $ cd old-repository
+  $ cd old-repository.git
   ```
 4. 拉取仓库的 {% data variables.large_files.product_name_long %} 对象。
   ```shell
@@ -71,7 +71,7 @@ topics:
 7. 删除您之前创建的临时本地仓库。
   ```shell
   $ cd ..
-  $ rm -rf old-repository
+  $ rm -rf old-repository.git
   ```
 
 ## 镜像其他位置的仓库
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
index 72eae5e035..9d4d90389c 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
@@ -28,11 +28,11 @@ topics:
 当您将仓库转让给新所有者时，他们可以立即管理仓库的内容、议题、拉取请求、版本、项目板和设置。
 
 存储库传输的先决条件：
-- When you transfer a repository that you own to another user account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. 如果新所有者在一天之内没有接受转让，则邀请将过期。{% endif %}
+- 当您将您拥有的存储库转移到另一个用户帐户时，新所有者将收到一封确认电子邮件。{% ifversion fpt or ghec %} 确认电子邮件包含接受转移的说明。 如果新所有者在一天之内没有接受转让，则邀请将过期。{% endif %}
 - 要将您拥有的仓库转让给一个组织，您必须拥有在目标组织中创建仓库的权限。
 - 目标帐户不得具有相同名称的仓库，或位于同一网络中的复刻。
-- 仓库原来的所有者将添加为已转让仓库的协作者。 Other collaborators to the transferred repository remain intact.{% ifversion ghec or ghes or ghae %}
-- Internal repositories can't be transferred.{% endif %}
+- 仓库原来的所有者将添加为已转让仓库的协作者。 转移的仓库的其他协作者保持不变。{% ifversion ghec or ghes or ghae %}
+- 无法转移内部仓库。{% endif %}
 - 私有复刻无法进行转让。
 
 {% ifversion fpt or ghec %}如果您将私有仓库转让给 {% data variables.product.prodname_free_user %} 用户或组织帐户，该仓库将无法访问比如受保护分支和 {% data variables.product.prodname_pages %} 之类的功能。 {% data reusables.gated-features.more-info %}{% endif %}
@@ -43,7 +43,7 @@ topics:
 
 - 如果转让的仓库是复刻，则它仍与上游仓库关联。
 - 如果转让的仓库有任何复刻，则这些复刻在转让完成后仍与该仓库关联。
-- 如果转让的仓库使用 {% data variables.large_files.product_name_long %}，则所有 {% data variables.large_files.product_name_short %} 对象均自动移动。 This transfer occurs in the background, so if you have a large number of {% data variables.large_files.product_name_short %} objects or if the {% data variables.large_files.product_name_short %} objects themselves are large, it may take some time for the transfer to occur.{% ifversion fpt or ghec %} Before you transfer a repository that uses {% data variables.large_files.product_name_short %}, make sure the receiving account has enough data packs to store the {% data variables.large_files.product_name_short %} objects you'll be moving over. 有关为用户帐户增加存储的更多详细，请参阅“[升级 {% data variables.large_files.product_name_long %}](/articles/upgrading-git-large-file-storage)”。{% endif %}
+- 如果转让的仓库使用 {% data variables.large_files.product_name_long %}，则所有 {% data variables.large_files.product_name_short %} 对象均自动移动。 此转移在后台进行，因此如果您有大量的 {% data variables.large_files.product_name_short %} 对象或者如果 {% data variables.large_files.product_name_short %} 对象本身很大，则进行转移可能需要一些时间。{% ifversion fpt or ghec %}转让使用 {% data variables.large_files.product_name_short %} 的仓库之前，确保接收帐户有足够的数据包用来存储您将移动的 {% data variables.large_files.product_name_short %} 对象。 有关为用户帐户增加存储的更多详细，请参阅“[升级 {% data variables.large_files.product_name_long %}](/articles/upgrading-git-large-file-storage)”。{% endif %}
 - 仓库在两个用户帐户之间转让时，议题分配保持不变。 当您将仓库从用户帐户转让给组织时，分配给组织中该成员的议题保持不变，所有其他议题受理人都将被清除。 只允许组织中的所有者创建新的议题分配。 当您将仓库从组织转让给用户帐户时，只有分配给仓库所有者的议题保留，所有其他议题受理人都将被清除。
 - 如果转让的仓库包含 {% data variables.product.prodname_pages %} 站点，则指向 Web 上 Git 仓库和通过 Git 活动的链接将重定向。 不过，我们不会重定向与仓库关联的 {% data variables.product.prodname_pages %}。
 - 指向以前仓库位置的所有链接均自动重定向到新位置。 当您对转让的仓库使用 `git clone`、`git fetch` 或 `git push` 时，这些命令将重定向到新仓库位置或 URL。 不过，为了避免混淆，我们强烈建议将任何现有的本地克隆副本更新为指向新仓库 URL。 您可以通过在命令行中使用 `git remote` 来执行此操作：
@@ -52,8 +52,8 @@ topics:
   $ git remote set-url origin new_url
   ```
 
-- When you transfer a repository from an organization to a user account, the repository's read-only collaborators will not be transferred. This is because collaborators can't have read-only access to repositories owned by a user account. For more information about repository permission levels, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)."{% ifversion fpt or ghec %}
-- Sponsors who have access to the repository through a sponsorship tier may be affected. For more information, see "[Adding a repository to a sponsorship tier](/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers#adding-a-repository-to-a-sponsorship-tier)".{% endif %}
+- 当您将存储库从组织转移到用户帐户时，将不会转移存储库的只读协作者。 这是因为协作者不能对用户帐户拥有的仓库具有只读权限。 有关仓库权限级别的更多信息，请参阅“[用户帐户仓库的权限级别](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)”和“[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)”。{% ifversion fpt or ghec %}
+- 有权通过赞助层访问存储库的发起人可能会受到影响。 更多信息请参阅“[将存储库添加到赞助层](/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers#adding-a-repository-to-a-sponsorship-tier)”。{% endif %}
 
 更多信息请参阅“[管理远程仓库](/github/getting-started-with-github/managing-remote-repositories)”。
 
@@ -67,7 +67,7 @@ topics:
 
 您可以将仓库转让给接受仓库转让的任何用户帐户。 在两个用户帐户之间转让仓库时，原来的仓库所有者和协作者将自动添加为新仓库的协作者。
 
-{% ifversion fpt or ghec %}If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, before transferring the repository, you may want to remove or update your DNS records to avoid the risk of a domain takeover. 更多信息请参阅“[管理 {% data variables.product.prodname_pages %} 网站的自定义域](/articles/managing-a-custom-domain-for-your-github-pages-site)。{% endif %}
+{% ifversion fpt or ghec %}如果您在私有仓库中发布了 {% data variables.product.prodname_pages %} 站点并添加了自定义域，则转让仓库之前，您可能想要删除或更新 DNS 记录以避免域接管风险。 更多信息请参阅“[管理 {% data variables.product.prodname_pages %} 网站的自定义域](/articles/managing-a-custom-domain-for-your-github-pages-site)。{% endif %}
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md
index 548f745394..f20fcbb695 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md
@@ -23,7 +23,7 @@ shortTitle: 配置自动链接
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
-1. In the "Integrations" section of the sidebar, click **{% octicon "cross-reference" aria-label="The cross-reference icon" %} Autolink references**.
+1. 在边栏的“Integrations（集成）”部分中，单击 **{% octicon "cross-reference" aria-label="The cross-reference icon" %} 自动链接引用**。
 {% else %}
 1. 在左侧边栏中，单击 **Autolink references（自动链接引用）**。 ![左侧边栏中的自动链接引用选项卡](/assets/images/help/repository/autolink-references-tab.png)
 {% endif %}
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
new file mode 100644
index 0000000000..357d10a9af
--- /dev/null
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
@@ -0,0 +1,28 @@
+---
+title: Configuring tag protection rules
+shortTitle: Tag protection rules
+intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags.
+product: '{% data reusables.gated-features.tag-protection-rules %}'
+versions:
+  fpt: '*'
+  ghes: '>3.4'
+  ghae: issue-6337
+  ghec: '*'
+---
+
+{% note %}
+
+**Note:** Tag protection rules are currently in beta and subject to change.
+
+{% endnote %}
+
+When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. 更多信息请参阅“[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)”。
+
+Additionally, you can create custom repository roles to allow other groups of users to create or delete tags that match tag protection rules. 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. In the "Code and automation" section of the sidebar, click **{% octicon "tag" aria-label="The tag icon" %} Tags**.
+1. Click **New rule**. ![New tag protection rule](/assets/images/help/repository/new-tag-protection-rule.png)
+1. Under "Tag name pattern", type the pattern of the tags you want to protect. In this example, typing "\*" protects all tags. ![Set tag protection pattern](/assets/images/help/repository/set-tag-protection-pattern.png)
+1. Click **Add rule**. ![Add tag protection rule](/assets/images/help/repository/add-tag-protection-rule.png)
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
index daf5319d8b..c7255ae41f 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
@@ -17,6 +17,7 @@ children:
   - /enabling-anonymous-git-read-access-for-a-repository
   - /about-email-notifications-for-pushes-to-your-repository
   - /configuring-autolinks-to-reference-external-resources
+  - /configuring-tag-protection-rules
 shortTitle: 管理仓库设置
 ---
 
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
index 640bd829cb..a1ae26177c 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository.md
@@ -16,15 +16,15 @@ topics:
 shortTitle: 团队和人员
 ---
 
-## About access management for repositories
+## 关于存储库的访问管理
 
-对于您在 {% data variables.product.prodname_dotcom %} 上管理的每个仓库，您可以查看有权访问仓库的每个团队或人员的概览。 From the overview, you can also invite new teams or people, change each team or person's role for the repository, or remove access to the repository.
+对于您在 {% data variables.product.prodname_dotcom %} 上管理的每个仓库，您可以查看有权访问仓库的每个团队或人员的概览。 在概述中，您还可以邀请新的团队或人员，更改存储库的每个团队或人员的角色，或删除对存储库的访问权限。
 
 此概览可帮助您审核对仓库、内部或外部承包商或员工的访问权限，并有效响应安全事件。
 
 {% data reusables.organizations.mixed-roles-warning %}
 
-For more information about repository roles, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository roles for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)."
+有关存储库角色的详细信息，请参阅“[用户帐户存储库的权限级别](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)”和“[组织的存储库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization)”。
 
 ![访问权限管理概览](/assets/images/help/repository/manage-access-overview.png)
 
@@ -37,7 +37,7 @@ For more information about repository roles, see "[Permission levels for a user
 {% else %}
 {% data reusables.repositories.navigate-to-manage-access %}
 {% endif %}
-1. 在“Manage access（管理访问权限）”下的搜索字段中，开始输入您要查找的团队或人员的名称。 Optionally, use the dropdown menus to filter your search. ![用于过滤具有访问权限的团队或人员列表的搜索字段](/assets/images/help/repository/manage-access-filter.png)
+1. 在“Manage access（管理访问权限）”下的搜索字段中，开始输入您要查找的团队或人员的名称。 （可选）使用下拉菜单筛选搜索。 ![用于过滤具有访问权限的团队或人员列表的搜索字段](/assets/images/help/repository/manage-access-filter.png)
 
 ## 更改团队或人员的权限
 
@@ -48,7 +48,7 @@ For more information about repository roles, see "[Permission levels for a user
 {% else %}
 {% data reusables.repositories.navigate-to-manage-access %}
 {% endif %}
-4. Under "Manage access", find the team or person whose role you'd like to change, then select the Role drop-down and click a new role. ![使用"Role（角色）"下拉菜单为团队或人员选择新权限](/assets/images/help/repository/manage-access-role-drop-down.png)
+4. 在“Manage access（管理访问）”下，找到您要更改其角色的团队或人员，然后选择 Role（角色）下拉菜单并点击新角色。 ![使用"Role（角色）"下拉菜单为团队或人员选择新权限](/assets/images/help/repository/manage-access-role-drop-down.png)
 
 ## 邀请团队或人员
 
@@ -61,7 +61,7 @@ For more information about repository roles, see "[Permission levels for a user
 {% endif %}
 {% data reusables.organizations.invite-teams-or-people %}
 5. 在搜索字段中，开始输入要邀请的团队或人员的名称，然后单击匹配列表中的名称。 ![用于输入要邀请加入仓库的团队或人员名称的搜索字段](/assets/images/help/repository/manage-access-invite-search-field.png)
-6. Under "Choose a role", select the repository role to grant to the team or person, then click **Add NAME to REPOSITORY**. ![为团队或人员选择权限](/assets/images/help/repository/manage-access-invite-choose-role-add.png)
+6. 在“Choose a role（选择角色）”下，选择要授予该团队或人员的仓库角色，然后单击 **Add NAME to REPOSITORY（将名称添加到仓库）**。 ![为团队或人员选择权限](/assets/images/help/repository/manage-access-invite-choose-role-add.png)
 
 ## 删除团队或人员的访问权限
 
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
index e8e0370b51..c3798622de 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
@@ -24,7 +24,7 @@ shortTitle: 仓库可见性
 
 {% ifversion ghec %}
 
-Members of an {% data variables.product.prodname_emu_enterprise %} can only set the visibility of repositories owned by their user account to private, and repositories in their enterprise's organizations can only be private or internal. 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。
+{% data variables.product.prodname_emu_enterprise %} 的成员只能将其用户帐户拥有的存储库的可见性设置为私有，并且其企业组织中的存储库只能是私有的或内部的。 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。
 
 {% endif %}
 
@@ -52,7 +52,7 @@ Members of an {% data variables.product.prodname_emu_enterprise %} can only set
 {%- endif %}
 
 {%- ifversion fpt %}
-* 如果对用户帐户或组织使用 {% data variables.product.prodname_free_user %}，有些功能在您将可见性更改为私有后不可用于仓库。 任何已发布的 {% data variables.product.prodname_pages %} 站点都将自动取消发布。 如果您将自定义域添加到 {% data variables.product.prodname_pages %} 站点，应在将仓库设为私有之前删除或更新 DNS 记录，以避免域接管的风险。 For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products) and "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."
+* 如果对用户帐户或组织使用 {% data variables.product.prodname_free_user %}，有些功能在您将可见性更改为私有后不可用于仓库。 任何已发布的 {% data variables.product.prodname_pages %} 站点都将自动取消发布。 如果您将自定义域添加到 {% data variables.product.prodname_pages %} 站点，应在将仓库设为私有之前删除或更新 DNS 记录，以避免域接管的风险。 更多信息请参阅“[{% data variables.product.company_short %} 的产品](/get-started/learning-about-github/githubs-products)”和“[管理 {% data variables.product.prodname_pages %} 站点的自定义域](/articles/managing-a-custom-domain-for-your-github-pages-site)”。
 {%- endif %}
 
 {%- ifversion fpt or ghec %}
diff --git a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/index.md b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/index.md
index 0eefd3a121..c628204aab 100644
--- a/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/index.md
+++ b/translations/zh-CN/content/repositories/viewing-activity-and-data-for-your-repository/index.md
@@ -1,6 +1,6 @@
 ---
-title: Viewing activity and data for your repository
-intro: Gain insight into your repository by viewing activity and data.
+title: 查看存储库的活动和数据
+intro: 通过查看活动和数据深入了解您的存储库。
 redirect_from:
   - /categories/44/articles
   - /categories/graphs-and-contributions
@@ -22,6 +22,6 @@ children:
   - /viewing-a-projects-contributors
   - /analyzing-changes-to-a-repositorys-content
   - /understanding-connections-between-repositories
-shortTitle: View activity and data
+shortTitle: 查看活动和数据
 ---
 
diff --git a/translations/zh-CN/content/repositories/working-with-files/managing-files/editing-files.md b/translations/zh-CN/content/repositories/working-with-files/managing-files/editing-files.md
index d752403d54..8982ce0675 100644
--- a/translations/zh-CN/content/repositories/working-with-files/managing-files/editing-files.md
+++ b/translations/zh-CN/content/repositories/working-with-files/managing-files/editing-files.md
@@ -1,5 +1,5 @@
 ---
-title: Editing files
+title: 编辑文件
 intro: '您可以使用文件编辑器，在任何仓库中的 {% data variables.product.product_name %} 上直接编辑文件。'
 redirect_from:
   - /articles/editing-files
@@ -16,7 +16,7 @@ versions:
   ghec: '*'
 topics:
   - Repositories
-shortTitle: Edit files
+shortTitle: 编辑文件
 ---
 
 ## 编辑仓库中的文件
@@ -44,7 +44,7 @@ shortTitle: Edit files
 
 ## 编辑其他用户仓库中的文件
 
-When you edit a file in another user's repository, we'll automatically [fork the repository](/articles/fork-a-repo) and [open a pull request](/articles/creating-a-pull-request) for you.
+当您编辑其他用户存储库中的文件时，我们将自动[复刻存储库](/articles/fork-a-repo)，并为您[打开拉取请求](/articles/creating-a-pull-request)。
 
 1. 才其他用户的仓库中，浏览到包含要编辑文件的文件夹。 单击要编辑文件的名称。
 2. 在文件内容上方，单击 {% octicon "pencil" aria-label="The edit icon" %}。 此时，GitHub 会为您复刻仓库。
diff --git a/translations/zh-CN/content/repositories/working-with-files/using-files/working-with-non-code-files.md b/translations/zh-CN/content/repositories/working-with-files/using-files/working-with-non-code-files.md
index e4dfcbc1ed..6948d6df36 100644
--- a/translations/zh-CN/content/repositories/working-with-files/using-files/working-with-non-code-files.md
+++ b/translations/zh-CN/content/repositories/working-with-files/using-files/working-with-non-code-files.md
@@ -1,6 +1,6 @@
 ---
 title: 使用非代码文件
-intro: '{% data variables.product.product_name %} supports rendering and diffing in a number of non-code file formats.'
+intro: '{% data variables.product.product_name %} 支持以多种非代码文件格式呈现和比较。'
 redirect_from:
   - /articles/rendering-and-diffing-images
   - /github/managing-files-in-a-repository/rendering-and-diffing-images
@@ -37,7 +37,7 @@ shortTitle: 使用非代码文件
 
 ## 呈现图像和比较差异
 
-{% data variables.product.product_name %} 可显示几种常见的图像格式，包括 PNG、JPG、GIF、PSD 和 SVG。 In addition to simply displaying them, there are several ways to compare differences between versions of those image formats.'
+{% data variables.product.product_name %} 可显示几种常见的图像格式，包括 PNG、JPG、GIF、PSD 和 SVG。 除了简单地显示这些图像以外，还有几种方法可以比较这些图像格式版本之间的差异。
 
 {% note %}
 
@@ -47,7 +47,7 @@ shortTitle: 使用非代码文件
 
 ### 查看图像
 
-You can directly browse and view images in your repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}:
+您可以直接浏览和查看 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %} 上的{% endif %} 存储库中的图像：
 
 ![内联图像](/assets/images/help/images/view.png)
 
@@ -116,7 +116,7 @@ SVG 目前不支持内联脚本或动画。
 
 ```
 
-For example, if your model's URL is [`github.com/skalnik/secret-bear-clip/blob/master/stl/clip.stl`](https://github.com/skalnik/secret-bear-clip/blob/master/stl/clip.stl), your embed code would be:
+例如，如果模型的 URL 是 [`github.com/skalnik/secret-bear-clip/blob/master/stl/clip.stl`](https://github.com/skalnik/secret-bear-clip/blob/master/stl/clip.stl)，则嵌入的代码为：
 
 ```html
 
@@ -136,7 +136,7 @@ GitHub 支持以 *.csv*（逗号分隔）和 .*tsv*（制表符分隔）文件
 
 ![呈现的 CSV 示例](/assets/images/help/repository/rendered_csv.png)
 
-When viewed, any _.csv_ or _.tsv_ file committed to a repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} automatically renders as an interactive table, complete with headers and row numbering. 默认情况下，我们始终假设第一行是标题行。
+查看时，提交到 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %} 上的{% endif %} 存储库的任何 _.csv_ 或 _.tsv_ 文件都会自动呈现为交互式表格，包括标题和行号。 默认情况下，我们始终假设第一行是标题行。
 
 您可以通过单击行号链接到特定行，或通过按住 Shift 键选择多行。 只需复制 URL 并将其发送给好友即可。
 
@@ -225,7 +225,7 @@ GitHub 支持呈现 PDF 文档。
 
 一般来说，包含嵌入式 HTML 的文档更改的呈现视图将显示对 {% data variables.product.product_name %} 文档视图中支持元素的更改。 必须始终在呈现视图和源视图中检查对包含嵌入式 HTML 的文档的更改以确保完整性。
 
-## Mapping geoJSON files on {% data variables.product.prodname_dotcom %}
+## 映射 {% data variables.product.prodname_dotcom %} 上的 geoJSON 文件
 
 {% data variables.product.product_name %} 支持在 {% data variables.product.product_name %} 仓库中渲染 geoJSON 和 topoJSON 地图文件。 只需像平常一样提交扩展名为 `.geojson` 或 `.topojson` 的文件。 也支持扩展名为 `.json` 的文件，但仅当 `type` 设置为 `FeatureCollection`、`GeometryCollection` 或 `topology` 时才支持。 然后导航到 GitHub.com 上 geoJSON 文件的路径。
 
@@ -298,9 +298,9 @@ GitHub 支持呈现 PDF 文档。
 * [MapBox marker-styling 文档](http://www.mapbox.com/developers/simplestyle/)
 * [TopoJSON Wiki](https://github.com/mbostock/topojson/wiki)
 
-## Working with Jupyter Notebook files on {% data variables.product.prodname_dotcom %}
+## 在 {% data variables.product.prodname_dotcom %} 上使用 Jupyter Notebook 文件
 
-When you add Jupyter Notebook or IPython Notebook files with a *.ipynb* extension on {% data variables.product.product_location %}, they will render as static HTML files in your repository.
+当您在 {% data variables.product.product_location %} 上添加具有 *.ipynb* 扩展名的 Jupyter Notebook 或 IPython Notebook 文件时，它们将在您的仓库中呈现为静态 HTML 文件。
 
 笔记本的交互式功能（例如自定义的 JavaScript 图）在 {% data variables.product.product_location %} 上的仓库中不起作用。 有关示例，请参阅 [*Linking and Interactions.ipynb*](https://github.com/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb)。
 
diff --git a/translations/zh-CN/content/rest/guides/basics-of-authentication.md b/translations/zh-CN/content/rest/guides/basics-of-authentication.md
index f948b6118d..71a7b5fa77 100644
--- a/translations/zh-CN/content/rest/guides/basics-of-authentication.md
+++ b/translations/zh-CN/content/rest/guides/basics-of-authentication.md
@@ -38,7 +38,7 @@ up your application. It's the callback URL that {% data variables.product.produc
 successful authentication.
 
 Since we're running a regular Sinatra server, the location of the local instance
-is set to `http://localhost:4567`. Let's fill in the callback URL as `http://localhost:4567/callback`.
+is set to `http://127.0.0.1:4567`. Let's fill in the callback URL as `http://127.0.0.1:4567/callback`.
 
 ## Accepting user authorization
 
@@ -91,7 +91,7 @@ Also, notice that the URL uses the `scope` query parameter to define the
 [scopes][oauth scopes] requested by the application. For our application, we're
 requesting `user:email` scope for reading private email addresses.
 
-Navigate your browser to `http://localhost:4567`. After clicking on the link, you
+Navigate your browser to `http://127.0.0.1:4567`. After clicking on the link, you
 should be taken to {% data variables.product.product_name %}, and presented with a dialog that looks something like this:
 ![GitHub's OAuth Prompt](/assets/images/oauth_prompt.png)
 
@@ -215,7 +215,7 @@ We can do whatever we want with our results. In this case, we'll just dump them
 
 It'd be a pretty bad model if we required users to log into the app every single
 time they needed to access the web page. For example, try navigating directly to
-`http://localhost:4567/basic`. You'll get an error.
+`http://127.0.0.1:4567/basic`. You'll get an error.
 
 What if we could circumvent the entire
 "click here" process, and just _remember_ that, as long as the user's logged into
@@ -348,7 +348,7 @@ Next, create a file in _views_ called _advanced.erb_, and paste this markup into
 
 From the command line, call `ruby advanced_server.rb`, which starts up your
 server on port `4567` -- the same port we used when we had a simple Sinatra app.
-When you navigate to `http://localhost:4567`, the app calls `authenticate!`
+When you navigate to `http://127.0.0.1:4567`, the app calls `authenticate!`
 which redirects you to `/callback`. `/callback` then sends us back to `/`,
 and since we've been authenticated, renders _advanced.erb_.
 
diff --git a/translations/zh-CN/data/features/reopen-dependabot-alerts.yml b/translations/zh-CN/data/features/reopen-dependabot-alerts.yml
new file mode 100644
index 0000000000..bd672e3a76
--- /dev/null
+++ b/translations/zh-CN/data/features/reopen-dependabot-alerts.yml
@@ -0,0 +1,7 @@
+---
+#Reference 5861
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>3.4'
+  ghae: 'issue-5861'
diff --git a/translations/zh-CN/data/reusables/gated-features/tag-protection-rules.md b/translations/zh-CN/data/reusables/gated-features/tag-protection-rules.md
new file mode 100644
index 0000000000..3f8d774374
--- /dev/null
+++ b/translations/zh-CN/data/reusables/gated-features/tag-protection-rules.md
@@ -0,0 +1 @@
+{% ifversion ghae %}Tag protection rules are available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else%}Tag protection rules are available {% endif %}in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %}
diff --git a/translations/zh-CN/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md b/translations/zh-CN/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
index b097071784..fc5904d87d 100644
--- a/translations/zh-CN/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
+++ b/translations/zh-CN/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
@@ -1 +1 @@
-例如，您可以只允许从您办公室网络的 IP 地址访问。 IP 地址的允许列表将阻止 从不在允许列表中的任何 IP 地址通过 web、API、Git 进行访问。
+例如，您可以只允许从您办公室网络的 IP 地址访问。 The allow list for IP addresses will block access to private resources via the web, API, and Git from any IP addresses that are not on the allow list.
diff --git a/translations/zh-CN/data/reusables/saml/cannot-update-existing-saml-settings.md b/translations/zh-CN/data/reusables/saml/cannot-update-existing-saml-settings.md
deleted file mode 100644
index 22983550ed..0000000000
--- a/translations/zh-CN/data/reusables/saml/cannot-update-existing-saml-settings.md
+++ /dev/null
@@ -1,5 +0,0 @@
-{% note %}
-
-**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings.
-
-{% endnote %}
diff --git a/translations/zh-CN/data/reusables/scim/emu-scim-rate-limit.md b/translations/zh-CN/data/reusables/scim/emu-scim-rate-limit.md
new file mode 100644
index 0000000000..f6317a7545
--- /dev/null
+++ b/translations/zh-CN/data/reusables/scim/emu-scim-rate-limit.md
@@ -0,0 +1,5 @@
+{% note %}
+
+**Note:** To avoid exceeding the rate limit on {% data variables.product.product_name %}, do not assign more than 1,000 users per hour to the IdP application. If you use groups to assign users to the IdP application, do not add more than 100 users to each group per hour. If you exceed these thresholds, attempts to provision users may fail with a "rate limit" error.
+
+{% endnote %}
\ No newline at end of file

From e6c4b739698f870f3c540398b9d1c51b19c770fc Mon Sep 17 00:00:00 2001
From: docubot <67483024+docubot@users.noreply.github.com>
Date: Tue, 8 Mar 2022 16:58:57 -0800
Subject: [PATCH 25/41] New translation batch for es (#26025)

* Add crowdin translations

* Run script/i18n/homogenize-frontmatter.js

* Run script/i18n/fix-translation-errors.js

* Run script/i18n/lint-translation-files.js --check parsing

* run script/i18n/reset-files-with-broken-liquid-tags.js --language=es

* run script/i18n/reset-known-broken-translation-files.js

* Check in es CSV report

Co-authored-by: Kevin Heis 
---
 ...tributions-not-showing-up-on-my-profile.md |  2 +
 ...-hosted-runner-application-as-a-service.md |  6 +++
 .../managing-github-connect.md                |  6 ++-
 ...saml-single-sign-on-for-your-enterprise.md |  2 -
 ...le-sign-on-for-enterprise-managed-users.md |  6 ++-
 ...-for-enterprise-managed-users-with-okta.md |  2 +
 ...ovisioning-for-enterprise-managed-users.md |  2 +
 ...or-security-settings-in-your-enterprise.md |  2 +-
 ...viting-people-to-manage-your-enterprise.md |  7 +--
 .../downgrading-your-github-subscription.md   |  7 +++
 ...io-subscriptions-with-github-enterprise.md |  2 +
 .../sarif-support-for-code-scanning.md        |  6 +--
 .../es-ES/content/code-security/guides.md     |  1 -
 .../about-dependabot-version-updates.md       |  1 +
 .../index.md                                  |  1 -
 ...pendabotcom-to-github-native-dependabot.md | 54 -------------------
 ...nerable-dependencies-in-your-repository.md | 18 ++++++-
 .../events/issue-event-types.md               | 10 ++++
 ...owed-ip-addresses-for-your-organization.md |  6 +--
 .../repository-roles-for-an-organization.md   |  5 +-
 ...om-repository-roles-for-an-organization.md |  2 +
 ...ml-single-sign-on-for-your-organization.md |  2 -
 ...ging-code-review-settings-for-your-team.md |  4 --
 translations/es-ES/content/packages/index.md  |  4 +-
 .../working-with-the-docker-registry.md       |  2 +-
 .../about-github-pages.md                     | 10 ++--
 .../duplicating-a-repository.md               |  8 +--
 .../configuring-tag-protection-rules.md       | 28 ++++++++++
 .../managing-repository-settings/index.md     |  1 +
 .../rest/guides/basics-of-authentication.md   |  8 +--
 .../features/reopen-dependabot-alerts.yml     |  7 +++
 .../gated-features/tag-protection-rules.md    |  1 +
 ...ip-allow-lists-example-and-restrictions.md |  2 +-
 .../cannot-update-existing-saml-settings.md   |  5 --
 .../reusables/scim/emu-scim-rate-limit.md     |  5 ++
 translations/log/es-resets.csv                |  1 -
 36 files changed, 134 insertions(+), 102 deletions(-)
 delete mode 100644 translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
 create mode 100644 translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
 create mode 100644 translations/es-ES/data/features/reopen-dependabot-alerts.yml
 create mode 100644 translations/es-ES/data/reusables/gated-features/tag-protection-rules.md
 delete mode 100644 translations/es-ES/data/reusables/saml/cannot-update-existing-saml-settings.md
 create mode 100644 translations/es-ES/data/reusables/scim/emu-scim-rate-limit.md

diff --git a/translations/es-ES/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/translations/es-ES/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
index 9a551ad5f6..5702cd233d 100644
--- a/translations/es-ES/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
+++ b/translations/es-ES/content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile.md
@@ -19,6 +19,8 @@ shortTitle: Contribuciones faltantes
 
 La gráfica de contribuciones en tu perfil es un registro de las contribuciones que has hecho en los repositorios {% ifversion ghae %}que le pertenecen{% else %}de{% endif %} {% data variables.product.product_location %}. Las contribuciones son registros horarios de acuerdo a la zona horaria universal coordinada (UTC) en lugar de tu zona horaria local. Las contribuciones solo se cuentan si cumplen con determinados criterios. En algunos casos, necesitamos reconstruir tu gráfico para que aparezcan las contribuciones.
 
+If you are part of an organization that uses SAML single sign-on (SSO), you won’t be able to see contribution activity from the organization on your profile if you do not have an active SSO session. People viewing your profile from outside your organization will see anonymized contribution activity of your contribution activity for your organization.
+
 ## Contribuciones que se cuentan
 
 ### Propuestas, solicitudes de cambios y debates
diff --git a/translations/es-ES/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md b/translations/es-ES/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
index 0b4a0aa7ab..3a13506466 100644
--- a/translations/es-ES/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
+++ b/translations/es-ES/content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md
@@ -78,6 +78,12 @@ Puedes administrar el servicio de ejecutor en la aplicación de **Servicios** de
    ```
 {% endmac %}
 
+The command takes an optional `user` argument to install the service as a different user.
+
+```shell
+./svc.sh install --user USERNAME
+```
+
 ## Iniciar el servicio
 
 Inicia el servicio con el siguiente comando:
diff --git a/translations/es-ES/content/admin/configuration/configuring-github-connect/managing-github-connect.md b/translations/es-ES/content/admin/configuration/configuring-github-connect/managing-github-connect.md
index 105d2f5e85..b4095de526 100644
--- a/translations/es-ES/content/admin/configuration/configuring-github-connect/managing-github-connect.md
+++ b/translations/es-ES/content/admin/configuration/configuring-github-connect/managing-github-connect.md
@@ -41,7 +41,9 @@ Cuando habilitas {% data variables.product.prodname_github_connect %}, configura
 To use {% data variables.product.prodname_github_connect %}, you must have an organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that uses {% data variables.product.prodname_ghe_cloud %}. You may already have {% data variables.product.prodname_ghe_cloud %} included in your plan. {% data reusables.enterprise.link-to-ghec-trial %}
 
 {% ifversion ghes %}
-To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. Para obtener más información, consulta "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)."
+If your organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} uses IP allow lists, you must add the IP address or network for {% data variables.product.product_location %} to your IP allow list on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Managing allowed IP addresses for your organization](/enterprise-cloud@latest/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)" and "[Enforcing policies for security settings in your enterprise](/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+
+To configure a connection, your proxy configuration must allow connectivity to `github.com`, `api.github.com`, and `uploads.github.com`. For more information, see "[Configuring an outbound web proxy server](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-an-outbound-web-proxy-server)."
 {% endif %}
 
 ## Habilitar {% data variables.product.prodname_github_connect %}
@@ -69,7 +71,7 @@ Si estás conectando {% data variables.product.product_location %} a una organiz
 
 Los propietarios de empresas pueden inhabilitar {% data variables.product.prodname_github_connect %}.
 
-Cuando te desconectas de {% data variables.product.prodname_ghe_cloud %}, se elimina la {% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} de tu cuenta de empresa u organización, y las credenciales almacenadas en {% data variables.product.product_location %} se eliminan.
+When you disconnect from {% data variables.product.prodname_ghe_cloud %}, the {% data variables.product.prodname_github_connect %} {% data variables.product.prodname_github_app %} is deleted from your enterprise account or organization and credentials stored on {% data variables.product.product_location %} are deleted.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.github-connect-tab %}
diff --git a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
index cecd68da89..5ab323de6b 100644
--- a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -33,8 +33,6 @@ redirect_from:
 
 {% data reusables.saml.about-saml-access-enterprise-account %}Para obtener más información, consulta la sección "[Visualizar y administrar el acceso de SAML de un usuario a tu cuenta empresarial](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise)".
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
-
 {% data reusables.saml.saml-disabled-linked-identities-removed %}
 
 {% data reusables.scim.enterprise-account-scim %}
diff --git a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
index 8d900850af..d1dd3e2c1f 100644
--- a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
+++ b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-saml-single-sign-on-for-enterprise-managed-users.md
@@ -25,7 +25,11 @@ Con {% data variables.product.prodname_emus %}, tu empresa utiliza el SSO de SAM
 
 Después de que configures el SSO de SAML, te recomendamos que almacenes tus códigos de recuperación para que puedas recuperar el acceso a tu empresa en caso de que no esté disponible tu proveedor de identidad.
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
+{% note %}
+
+**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings.
+
+{% endnote %}
 
 ## Configurar el inicio de sesión único de SAML para {% data variables.product.prodname_emus %}
 
diff --git a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
index 83a4ae4be0..5bd12d3bcd 100644
--- a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
+++ b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md
@@ -76,6 +76,8 @@ Para configurar el aprovisionamiento, el usuario de configuración con el nombre
 
 Después de haber configurado el SSO de SAML y el aprovisionamiento, podrás aprovisionar usuarios nuevos en {% data variables.product.prodname_dotcom_the_website %} asignando a los usuarios a la aplicación de {% data variables.product.prodname_emu_idp_application %}.
 
+{% data reusables.scim.emu-scim-rate-limit %}
+
 You can also automatically manage organization membership by assigning groups to the application and adding them to the "Push Groups" tab in Okta. When the group is provisioned successfully, it will be available to connect to teams in the enterprise's organizations. Para obtener más información sobre cómo administrar los equipos, consulta la sección "[Administrar las membrecías de los quipos con grupos de proveedor de identidad](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups)".
 
 Cuando asignas usuarios, puedes utilizar el atributo de "Roles" en la aplicación de {% data variables.product.prodname_emu_idp_application %} para configurar el rol de un usuario en tu empresa en {% data variables.product.product_name %}. Para obtener más información sobre los roles, consulta la sección "[Roles en una empresa](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise)".
diff --git a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
index fa7f063b08..ed3ea8a455 100644
--- a/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
+++ b/translations/es-ES/content/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users.md
@@ -51,6 +51,8 @@ Para configurar el aprovisionamiento de tu {% data variables.product.prodname_em
 
 Después de crear tu token de acceso personal y almacenarlo de forma segura, puedes configurar el aprovisionamiento en tu proveedor de identidad.
 
+{% data reusables.scim.emu-scim-rate-limit %}
+
 Para configurar a Azure Active Directory para que aprovisione usuarios para tu {% data variables.product.prodname_emu_enterprise %}, consulta el [Tutorial: Configurar a los Usuarios Administrados Empresariales de Github para un aprovisionamiento de usuarios automático](https://docs.microsoft.com/en-us/azure/active-directory/saas-apps/github-enterprise-managed-user-provisioning-tutorial) en la documentación de Azure AD.
 
 Para configurar Okta para que aprovisione usuarios para tu {% data variables.product.prodname_emu_enterprise %}, consulta la sección "[Configurar el aprovisionamiento de SCIM para los Usuarios Administrados Empresariales con Okta](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta)".
diff --git a/translations/es-ES/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/es-ES/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
index 69f67199d5..dabe75e515 100644
--- a/translations/es-ES/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
+++ b/translations/es-ES/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
@@ -69,7 +69,7 @@ You can restrict network traffic to your enterprise on {% data variables.product
 
 {% elsif ghec %}
 
-Enterprise owners can restrict access to assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
+Enterprise owners can restrict access to private assets owned by organizations in an enterprise by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
 
 {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %}
 
diff --git a/translations/es-ES/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/translations/es-ES/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
index a5b3e3cfac..88d84dc759 100644
--- a/translations/es-ES/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
+++ b/translations/es-ES/content/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md
@@ -47,7 +47,7 @@ Si tu empresa utiliza {% data variables.product.prodname_emus %}, solo se pueden
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
-1. En la barra lateral izquierda, haz clic en **Administrators** (Administradores). ![Pestaña Administrators (Administradores) en la barra lateral izquierda](/assets/images/help/business-accounts/administrators-tab.png)
+{% data reusables.enterprise-accounts.administrators-tab %}
 1. Sobre la lista de administradores, haz clic en {% ifversion ghec %}**Invitar administrador**{% elsif ghes %}**Agregar propietario**{% endif %}.
   {% ifversion ghec %}
   ![botón de "invitar administrador" sobre la lista de propietarios empresariales](/assets/images/help/business-accounts/invite-admin-button.png)
@@ -65,10 +65,11 @@ Solo los propietarios de empresa pueden eliminar a otros administradores de empr
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
-1. Junto al nombre de usuario de la persona que te gustaría eliminar, haz clic en {% octicon "gear" aria-label="The Settings gear" %}, luego en **Eliminar propietario**{% ifversion ghec %} o **Eliminar gerente de facturación**{% endif %}.
+{% data reusables.enterprise-accounts.administrators-tab %}
+1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Convert to member**{% endif %}.
   {% ifversion ghec %}
   ![Parámetros con opción del menú para eliminar un administrador de empresa](/assets/images/help/business-accounts/remove-admin.png)
   {% elsif ghes %}
   ![Parámetros con opción del menú para eliminar un administrador de empresa](/assets/images/help/business-accounts/ghes-remove-owner.png)
   {% endif %}
-1. Lee la confirmación y luego haz clic en **Eliminar propietario**{% ifversion ghec %} o **Eliminar gerente de facturación**{% endif %}.
+1. Read the confirmation, then click {% ifversion ghes %}**Remove owner**{% elsif ghec %}**Yes, convert USERNAME to member**{% endif %}.
diff --git a/translations/es-ES/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/translations/es-ES/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
index 323a587375..e16f18a01a 100644
--- a/translations/es-ES/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
+++ b/translations/es-ES/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
@@ -52,6 +52,13 @@ Si bajas tu organización de nivel desde {% data variables.product.prodname_team
 
 Si bajas a tu organización de nivel desde {% data variables.product.prodname_ghe_cloud %} a {% data variables.product.prodname_team %} o {% data variables.product.prodname_free_team %}, la cuenta perderá acceso a los controles avanzados de seguridad, cumplimiento y despliegue. {% data reusables.gated-features.more-info %}
 
+
+{% note %}
+
+**Note:** If you're currently trialing {% data variables.product.prodname_ghe_cloud %}, and you don't purchase {% data variables.product.prodname_enterprise %} before the trial ends, your organization will be automatically downgraded to {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}. Para obtener más información, consulta "[Configurar una prueba de {% data variables.product.prodname_ghe_cloud %}](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)".
+
+{% endnote %}
+
 {% data reusables.organizations.billing-settings %}
 1. Debajo de "Plan actual", utiliza el menú desplegable **Editar** y haz clic en la opción a la que quieras bajar. ![Botón Bajar de categoría](/assets/images/help/billing/downgrade-option-button.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
diff --git a/translations/es-ES/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/translations/es-ES/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
index a741734b74..6b341318e3 100644
--- a/translations/es-ES/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
+++ b/translations/es-ES/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
@@ -16,6 +16,8 @@ shortTitle: Configuración
 
 Esta guía te muestra cómo tu equipo puede obtener suscriptores de {% data variables.product.prodname_vs %} con licencia y comenzar a utilizar {% data variables.product.prodname_enterprise %}.
 
+If you prefer video, you can watch [Setting up your {% data variables.product.prodname_enterprise %} licenses with {% data variables.product.prodname_vs %} subscriptions](https://www.youtube.com/watch?v=P_zBgp_BE_I) on Microsoft Visual Studio's YouTube channel.
+
 ## Roles para {% data variables.product.prodname_vss_ghe %}
 
 Antes de configurar {% data variables.product.prodname_vss_ghe %}, es importante entender los roles para esta oferta combinada.
diff --git a/translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md b/translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
index 88765f488b..1c40c8ccba 100644
--- a/translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
+++ b/translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md
@@ -105,7 +105,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr
 | `properties.tags[]` | **Optional.** An array of strings. {% data variables.product.prodname_code_scanning_capc %} uses `tags` to allow you to filter results on {% data variables.product.prodname_dotcom %}. For example, it is possible to filter to all results that have the tag `security`.
 | `properties.precision` | **Recommended.** A string that indicates how often the results indicated by this rule are true. For example, if a rule has a known high false-positive rate, the precision should be `low`. {% data variables.product.prodname_code_scanning_capc %} orders results by precision on {% data variables.product.prodname_dotcom %} so that the results with the highest `level`, and highest `precision` are shown first. Can be one of: `very-high`, `high`, `medium`, or `low`. {% ifversion fpt or ghes > 3.1 or ghae or ghec %}
 | `properties.problem.severity` | **Recommended.** A string that indicates the level of severity of any alerts generated by a non-security query. This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `problem.severity`, and highest `precision` are shown first. Can be one of: `error`, `warning`, or `recommendation`.
-| `properties.security-severity` | **Recommended.** A score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9  is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %}
+| `properties.security-severity` | **Recommended.** A string representing a score that indicates the level of severity, between 0.0 and 10.0, for security queries (`@tags` includes `security`). This, with the `properties.precision` property, determines whether the results are displayed by default on {% data variables.product.prodname_dotcom %} so that the results with the highest `security-severity`, and highest `precision` are shown first. {% data variables.product.prodname_code_scanning_capc %} translates numerical scores as follows: over 9.0 is `critical`, 7.0 to 8.9  is `high`, 4.0 to 6.9 is `medium` and 3.9 or less is `low`. {% endif %}
 
 ### `result` object
 
@@ -114,7 +114,7 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr
 | Name | Description |
 |----|----|
 | `ruleId`| **Optional.** The unique identifier of the rule (`reportingDescriptor.id`). For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). {% data variables.product.prodname_code_scanning_capc %} uses the rule identifier to filter results by rule on {% data variables.product.prodname_dotcom %}.
-| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object).
+| `ruleIndex`| **Optional.** The index of the associated rule (`reportingDescriptor` object) in the tool component `rules` array. For more information, see the [`run` object](#run-object). The allowed range for this property 0 to 2^63 - 1.
 | `rule`| **Optional.** A reference used to locate the rule (reporting descriptor) for this result. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object).
 | `level`| **Optional.** The severity of the result. This level overrides the default severity defined by the rule. {% data variables.product.prodname_code_scanning_capc %} uses the level to filter results by severity on {% data variables.product.prodname_dotcom %}.
 | `message.text`| **Required.** A message that describes the result. {% data variables.product.prodname_code_scanning_capc %} displays the message text as the title of the result. Only the first sentence of the message will be displayed when visible space is limited.
@@ -129,7 +129,7 @@ A location within a programming artifact, such as a file in the repository or a
 
 | Name | Description |
 |----|----|
-| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object.
+| `location.id` | **Optional.** A unique identifier that distinguishes this location from all other locations within a single result object. The allowed range for this property 0 to 2^63 - 1.
 | `location.physicalLocation` | **Required.** Identifies the artifact and region. For more information, see the [`physicalLocation`](#physicallocation-object).
 | `location.message.text` | **Optional.** A message relevant to the location.
 
diff --git a/translations/es-ES/content/code-security/guides.md b/translations/es-ES/content/code-security/guides.md
index b7cdd7db56..43a3da3bbf 100644
--- a/translations/es-ES/content/code-security/guides.md
+++ b/translations/es-ES/content/code-security/guides.md
@@ -67,7 +67,6 @@ includeGuides:
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
-  - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates
   - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies
diff --git a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md b/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
index 74a407f85c..0a2e98654a 100644
--- a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
+++ b/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md
@@ -7,6 +7,7 @@ redirect_from:
   - /github/administering-a-repository/about-github-dependabot-version-updates
   - /github/administering-a-repository/about-dependabot-version-updates
   - /code-security/supply-chain-security/about-dependabot-version-updates
+  - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md b/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
index 1c04b588f6..e01e8e1116 100644
--- a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
+++ b/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md
@@ -15,7 +15,6 @@ topics:
   - Pull requests
 children:
   - /about-dependabot-version-updates
-  - /upgrading-from-dependabotcom-to-github-native-dependabot
   - /enabling-and-disabling-dependabot-version-updates
   - /listing-dependencies-configured-for-version-updates
   - /managing-pull-requests-for-dependency-updates
diff --git a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md b/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
deleted file mode 100644
index 8439c9df42..0000000000
--- a/translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: Upgrading from Dependabot.com to GitHub-native Dependabot
-intro: You can upgrade to GitHub-native Dependabot by merging a pull request that will allow your dependencies to continue being updated.
-versions:
-  fpt: '*'
-  ghec: '*'
-type: how_to
-topics:
-  - Repositories
-  - Dependabot
-  - Version updates
-  - Dependencies
-redirect_from:
-  - /code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot
-shortTitle: Dependabot.com upgrades
----
-{% warning %}
-
-Dependabot Preview has been shut down as of August 3rd, 2021. In order to keep getting Dependabot updates, please migrate to GitHub-native Dependabot.
-
-Open pull requests from Dependabot Preview will remain open, including the pull request to upgrade to GitHub-native Dependabot, but the bot itself will no longer work on your {% data variables.product.prodname_dotcom %} accounts and organizations.
-
-{% endwarning %}
-
-## About upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
-
-Dependabot Preview has been built directly into {% data variables.product.prodname_dotcom %}, so you can use {% data variables.product.prodname_dependabot %} alongside all the other functionality in {% data variables.product.prodname_dotcom %} without having to install and use a separate application. By migrating to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, we can also focus on bringing lots of exciting new features to {% data variables.product.prodname_dependabot %}, including more [ecosystem updates](https://github.com/github/roadmap/issues/150), [improved notifications](https://github.com/github/roadmap/issues/133), and {% data variables.product.prodname_dependabot %} support for [{% data variables.product.prodname_ghe_server %}](https://github.com/github/roadmap/issues/86) and [{% data variables.product.prodname_ghe_managed %}](https://github.com/github/roadmap/issues/135).
-
-## Differences between Dependabot Preview and {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
-
-While most of the Dependabot Preview features exist in {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, a few remain unavailable: 
-- **Live updates:** We hope to bring these back in the future. For now, you can run {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_dependabot %} daily to catch new packages within one day of release.
-- **PHP environment variable registries:** For projects that rely on the `ACF_PRO_KEY` environment variable, you may be able to vendor your licensed copy of the Advanced Custom Fields plugin. For an example, see [dependabot/acf-php-example](https://github.com/dependabot/acf-php-example#readme). For other environment variables, you can use {% data variables.product.prodname_actions %} to fetch dependencies from these registries.
-- **Auto-merge:** We always recommend verifying your dependencies before merging them; therefore, auto-merge will not be supported for the foreseeable future. For those of you who have vetted your dependencies, or are only using internal dependencies, we recommend adding third-party auto-merge apps, or setting up GitHub Actions to merge. We have provided the [`dependabot/fetch-metadata`](https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs) action to help developers [enable GitHub's automerge](https://github.com/dependabot/fetch-metadata/#enabling-auto-merge).
-
-In {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, you can configure all version updates using the configuration file. This file is similar to the Dependabot Preview configuration file with a few changes and improvements that will be automatically included in your upgrade pull request. For more information about the upgrade pull request, see "[Upgrading to GitHub-native Dependabot](/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot#upgrading-to-github-native-dependabot)".
-
-To see update logs for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} that were previously on the Dependabot.com dashboard:
-
-  1. Navigate to your repository’s **Insights** page.
-  2. Click **Dependency graph** to the left.
-  3. Click **{% data variables.product.prodname_dependabot %}**.
-
-For more information about version updates with {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, see "[About Dependabot version updates](/code-security/supply-chain-security/about-dependabot-version-updates)."
-
-## Upgrading to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
-
-Upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} requires you to merge the *Upgrade to GitHub-native Dependabot* pull request in your repository. This pull request includes the updated configuration file needed for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}.
-
-If you are using private repositories, you will have to grant Dependabot access to these repositories in your organization's security and analysis settings. For more information, see "[Allowing Dependabot to access private dependencies](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)". Previously, Dependabot had access to all repositories within an organization, but we implemented this change because it is much safer to use the principle of least privilege for Dependabot.
-
-If you are using private registries, you will have to add your existing Dependabot Preview secrets to your repository's or organization's "Dependabot secrets". For more information, see "[Managing encrypted secrets for Dependabot](/code-security/supply-chain-security/managing-encrypted-secrets-for-dependabot)".
-
-If you have any questions or need help migrating, you can view or open issues in the [`dependabot/dependabot-core`](https://github.com/dependabot/dependabot-core/issues/new?assignees=%40dependabot%2Fpreview-migration-reviewers&labels=E%3A+preview-migration&template=migration-issue.md&title=) repository.
diff --git a/translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index 4029faa7f6..ce51732a37 100644
--- a/translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -57,7 +57,7 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric
 1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot %} security update**.
   ![Create {% data variables.product.prodname_dependabot %} security update button](/assets/images/help/repository/create-dependabot-security-update-button-ungrouped.png)
 1. When you're ready to update your dependency and resolve the vulnerability, merge the pull request. Each pull request raised by {% data variables.product.prodname_dependabot %} includes information on commands you can use to control {% data variables.product.prodname_dependabot %}. For more information, see "[Managing pull requests for dependency updates](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)."
-1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" drop-down, and click a reason for dismissing the alert.
+1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, select the "Dismiss" dropdown, and click a reason for dismissing the alert.{% if reopen-dependabot-alerts %} Unfixed dismissed alerts can be reopened later.{% endif %}
    ![Choosing reason for dismissing the alert via the "Dismiss" drop-down](/assets/images/help/repository/dependabot-alert-dismiss-drop-down-ungrouped.png)
 
 {% elsif ghes = 3.3 %}
@@ -94,6 +94,22 @@ Each {% data variables.product.prodname_dependabot %} alert has a unique numeric
   ![Dismiss security banner](/assets/images/enterprise/3.0/dependabot-alert-dismiss.png)
 {% endif %}
 
+{% if reopen-dependabot-alerts %}
+
+## Viewing and updating closed alerts
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. To just view closed alerts, click **Closed**.
+  ![Screenshot showing the "Closed" option](/assets/images/help/repository/dependabot-alerts-closed.png)
+1. Click the alert that you would like to view or update.
+  ![Screenshot showing a highlighted dependabot alert](/assets/images/help/repository/dependabot-alerts-select-closed-alert.png)
+2. Optionally, if the alert was dismissed and you wish to reopen it, click **Reopen**.
+  ![Screenshot showing the "Reopen" button](/assets/images/help/repository/reopen-dismissed-alert.png)
+
+{% endif %}
+
 ## Further reading
 
 - "[About alerts for vulnerable dependencies](/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies)"{% ifversion fpt or ghec or ghes > 3.2 %}
diff --git a/translations/es-ES/content/developers/webhooks-and-events/events/issue-event-types.md b/translations/es-ES/content/developers/webhooks-and-events/events/issue-event-types.md
index c7ccfa8b72..4129df5265 100644
--- a/translations/es-ES/content/developers/webhooks-and-events/events/issue-event-types.md
+++ b/translations/es-ES/content/developers/webhooks-and-events/events/issue-event-types.md
@@ -320,6 +320,16 @@ The pull request's `HEAD` branch was restored to the last known commit.
 |:----------|:----------------:|:-----------------:|
 | 
  • Pull requests
 | **X** | **X** |
 
+## head_ref_force_pushed
+
+The pull request's HEAD branch was force pushed.
+
+### Availability
+
+|Issue type | Issue events API | Timeline events API|
+|:----------|:----------------:|:-----------------:|
+| 
  • Pull requests
 | **X** | **X** |
+
 ### Event object properties
 
 {% data reusables.issue-events.issue-event-common-properties %}
diff --git a/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
index 444975d812..1af7563239 100644
--- a/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
+++ b/translations/es-ES/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md
@@ -1,6 +1,6 @@
 ---
 title: Administrar las direcciones IP permitidas en tu organización
-intro: Puedes restringir el acceso a los activos de tu organización si configuras una lista de direcciones IP que se pueden conectar a ella.
+intro: You can restrict access to your organization's private assets by configuring a list of IP addresses that are allowed to connect.
 product: '{% data reusables.gated-features.allowed-ip-addresses %}'
 redirect_from:
   - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization
@@ -19,7 +19,7 @@ Los propietarios de las organizaciones pueden administrar las direcciones IP per
 
 ## Acerca de las direcciones IP permitidas
 
-Puedes restringir el acceso a los activos de la organización configurando un listado de direcciones IP específicas permitidas. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
+You can restrict access to private organization assets by configuring an allow list for specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
 
 {% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %}
 
@@ -27,7 +27,7 @@ Puedes restringir el acceso a los activos de la organización configurando un li
 
 Si configuras una lista de direcciones permitidas, también puedes elegir agregar automáticamente a ella cualquier dirección IP que hayas configurado para las {% data variables.product.prodname_github_apps %} que instales en tu organización. El creador de una {% data variables.product.prodname_github_app %} puede configurar una lista de direcciones permitidas para su aplicación, las cuales especifiquen las direcciones IP en las cuales se ejecuta esta. Al heredar la lista de direcciones permitidas en la tuya, estás evitando las solicitudes de conexión de la aplicación que se está rehusando. Para obtener más información, consulta la sección "[Permitir el acceso mediante {% data variables.product.prodname_github_apps %}](#allowing-access-by-github-apps)".
 
-También puedes configurar las direcciones IP permitidas para las organizaciones en una cuenta empresarial. Para obtener más información, consulta la sección "[Requerir políticas para la configuración de seguridad en tu empresa](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise)".
+También puedes configurar las direcciones IP permitidas para las organizaciones en una cuenta empresarial. Para obtener más información, consulta la sección "[Requerir políticas para la configuración de seguridad en tu empresa](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)".
 
 ## Agregar una dirección IP permitida
 
diff --git a/translations/es-ES/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/translations/es-ES/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
index 0c7d52b579..1e53639563 100644
--- a/translations/es-ES/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
+++ b/translations/es-ES/content/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization.md
@@ -109,11 +109,14 @@ Some of the features listed below are limited to organizations using {% data var
 | Enable project boards | | | | **X** | **X** |
 | Configure [pull request merges](/articles/configuring-pull-request-merges) | | | | **X** | **X** |
 | Configure [a publishing source for {% data variables.product.prodname_pages %}](/articles/configuring-a-publishing-source-for-github-pages) | | | | **X** | **X** |
+| [Manage branch protection rules](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule) | | | | | **X** |
 | [Push to protected branches](/articles/about-protected-branches) | | | | **X** | **X** |
+| Merge pull requests on protected branches, even if there are no approving reviews | | | | | **X** |{% ifversion fpt or ghes > 3.4 or ghae-issue-6337 or ghec %}
+| Create tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules) | | | | **X** | **X** |
+| Delete tags that match a [tag protection rule](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules) | | | | | **X** |{% endif %}
 | [Create and edit repository social cards](/articles/customizing-your-repositorys-social-media-preview) | | | | **X** | **X** |{% ifversion fpt or ghec %}
 | Limit [interactions in a repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)| | | | **X** | **X** |{% endif %}
 | Delete an issue (see "[Deleting an issue](/articles/deleting-an-issue)") | | | | | **X** |
-| Merge pull requests on protected branches, even if there are no approving reviews | | | | | **X** |
 | [Define code owners for a repository](/articles/about-code-owners) | | | | | **X** |
 | Add a repository to a team (see "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" for details) | | | | | **X** |
 | [Manage outside collaborator access to a repository](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** |
diff --git a/translations/es-ES/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md b/translations/es-ES/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
index 4fcd5f4736..522f701391 100644
--- a/translations/es-ES/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
+++ b/translations/es-ES/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization.md
@@ -84,6 +84,8 @@ You can only choose an additional permission if it's not already included in the
 - **Set interaction limits**: Temporarily restrict certain users from commenting, opening issues, or creating pull requests in your public repository to enforce a period of limited activity. For more information, see "[Limiting interactions in your repository](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)."
 - **Set the social preview**: Add an identifying image to your repository that appears on social media platforms when your repository is linked. For more information, see "[Customizing your repository's social media preview](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)."
 - **Push commits to protected branches**: Push to a branch that is marked as a protected branch.
+- **Create protected tags**: Create tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."
+- **Delete protected tags**: Delete tags that match a tag protection rule. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."
 
 ### Security
 
diff --git a/translations/es-ES/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/translations/es-ES/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
index a40b935eeb..f8665b5646 100644
--- a/translations/es-ES/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
+++ b/translations/es-ES/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md
@@ -22,8 +22,6 @@ Si habilitas pero no exiges SAML SSO, los miembros de la organización que elija
 
 {% data reusables.saml.saml-disabled-linked-identities-removed %}
 
-{% data reusables.saml.cannot-update-existing-saml-settings %}
-
 ## Habilitar y probar el inicio de sesión único SAML para tu organización
 
 Antes de requerir el SSO de SAML en tu organización, asegúrate de que la hayas preparado. Para obtener más información, consulta "[Preparación para exigir inicio de sesión único SAML en tu organización](/articles/preparing-to-enforce-saml-single-sign-on-in-your-organization)".
diff --git a/translations/es-ES/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/translations/es-ES/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
index 0a7db9d2c6..1ce2df0be4 100644
--- a/translations/es-ES/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
+++ b/translations/es-ES/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
@@ -36,10 +36,6 @@ When you enable auto assignment, any time your team has been requested to review
 
 When code owners are automatically requested for review, the team is still removed and replaced with individuals unless a branch protection rule is configured to require review from code owners. If such a branch protection rule is in place, the team request cannot be removed and so the individual request will appear in addition.
 
-{% ifversion fpt %}
-To further enhance your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
-{% endif %}
-
 ### Routing algorithms
 
 Code review assignments automatically choose and assign reviewers based on one of two possible algorithms. 
diff --git a/translations/es-ES/content/packages/index.md b/translations/es-ES/content/packages/index.md
index 2facc9b57c..c90daa9b1a 100644
--- a/translations/es-ES/content/packages/index.md
+++ b/translations/es-ES/content/packages/index.md
@@ -12,11 +12,11 @@ featuredLinks:
     - /packages/learn-github-packages/installing-a-package
   popular:
     - /packages/working-with-a-github-packages-registry/working-with-the-npm-registry
-    - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
+    - '{% ifversion fpt or ghec%}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
     - /packages/learn-github-packages
     - /packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry
   guideCards:
-    - '{% ifversion fpt %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
+    - '{% ifversion fpt or ghec %}/packages/working-with-a-github-packages-registry/working-with-the-container-registry{% else %}/packages/working-with-a-github-packages-registry/working-with-the-docker-registry{% endif %}'
     - /packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry
 changelog:
   label: packages
diff --git a/translations/es-ES/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md b/translations/es-ES/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
index b7650ff4b4..dc433c384c 100644
--- a/translations/es-ES/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
+++ b/translations/es-ES/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md
@@ -1,6 +1,6 @@
 ---
 title: Working with the Docker registry
-intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry, which uses the package namespace `https://docker.pkg.github.com`.{% endif %}'
+intro: '{% ifversion fpt or ghec %}The Docker registry has now been replaced by the {% data variables.product.prodname_container_registry %}.{% else %}You can push and pull your Docker images using the {% data variables.product.prodname_registry %} Docker registry.{% endif %}'
 product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /articles/configuring-docker-for-use-with-github-package-registry
diff --git a/translations/es-ES/content/pages/getting-started-with-github-pages/about-github-pages.md b/translations/es-ES/content/pages/getting-started-with-github-pages/about-github-pages.md
index 6f05a8fd66..72814d0494 100644
--- a/translations/es-ES/content/pages/getting-started-with-github-pages/about-github-pages.md
+++ b/translations/es-ES/content/pages/getting-started-with-github-pages/about-github-pages.md
@@ -92,21 +92,21 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat
 ## Limits on use of {% data variables.product.prodname_pages %}
 
 {% ifversion fpt or ghec %}
-{% data variables.product.prodname_pages %} sites created after June 15, 2016 and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
+{% data variables.product.prodname_pages %} sites created after June 15, 2016, and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
 
 ### Prohibited uses
 {% endif %}
-{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
+{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web-hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
 
-In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get rich quick schemes, sexually obscene content, and violent or threatening content or activity.
+In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get-rich-quick schemes, sexually obscene content, and violent or threatening content or activity.
 
 ### Usage limits
 {% data variables.product.prodname_pages %} sites are subject to the following usage limits:
 
-  - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?"](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations){% endif %}
+  - {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1 GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations)"{% endif %}
   - Published {% data variables.product.prodname_pages %} sites may be no larger than 1 GB.
 {% ifversion fpt or ghec %}
-  - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100GB per month.
+  - {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100 GB per month.
   - {% data variables.product.prodname_pages %} sites have a *soft* limit of 10 builds per hour.
 
 If your site exceeds these usage quotas, we may not be able to serve your site, or you may receive a polite email from {% data variables.contact.contact_support %} suggesting strategies for reducing your site's impact on our servers, including putting a third-party content distribution network (CDN) in front of your site, making use of other {% data variables.product.prodname_dotcom %} features such as releases, or moving to a different hosting service that might better fit your needs.
diff --git a/translations/es-ES/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md b/translations/es-ES/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
index 0c90178f10..133488a738 100644
--- a/translations/es-ES/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
+++ b/translations/es-ES/content/repositories/creating-and-managing-repositories/duplicating-a-repository.md
@@ -35,13 +35,13 @@ Before you can push the original repository to your new copy, or _mirror_, of th
   ```
 3. Mirror-push to the new repository.
   ```shell
-  $ cd old-repository
+  $ cd old-repository.git
   $ git push --mirror https://{% data variables.command_line.codeblock %}/exampleuser/new-repository.git
   ```
 4. Remove the temporary local repository you created earlier.
   ```shell
   $ cd ..
-  $ rm -rf old-repository
+  $ rm -rf old-repository.git
   ```
 
 ## Mirroring a repository that contains {% data variables.large_files.product_name_long %} objects
@@ -53,7 +53,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th
   ```
 3. Navigate to the repository you just cloned.
   ```shell
-  $ cd old-repository
+  $ cd old-repository.git
   ```
 4. Pull in the repository's {% data variables.large_files.product_name_long %} objects.
   ```shell
@@ -70,7 +70,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th
 7. Remove the temporary local repository you created earlier.
   ```shell
   $ cd ..
-  $ rm -rf old-repository
+  $ rm -rf old-repository.git
   ```
 
 ## Mirroring a repository in another location
diff --git a/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
new file mode 100644
index 0000000000..00480d6ad3
--- /dev/null
+++ b/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
@@ -0,0 +1,28 @@
+---
+title: Configuring tag protection rules
+shortTitle: Tag protection rules
+intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags.
+product: '{% data reusables.gated-features.tag-protection-rules %}'
+versions:
+  fpt: '*'
+  ghes: '>3.4'
+  ghae: issue-6337
+  ghec: '*'
+---
+
+{% note %}
+
+**Note:** Tag protection rules are currently in beta and subject to change.
+
+{% endnote %}
+
+When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions in the repository will be able to create protected tags, and only users with admin permissions in the repository will be able to delete protected tags. Para obtener más información, consulta la sección "[Roles de repositorio para una organización](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)".
+
+Additionally, you can create custom repository roles to allow other groups of users to create or delete tags that match tag protection rules. Para obtener más información, consulta la sección "[Administrar los roles personalizados de repositorio en una organización](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)".
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-settings %}
+1. In the "Code and automation" section of the sidebar, click **{% octicon "tag" aria-label="The tag icon" %} Tags**.
+1. Click **New rule**. ![New tag protection rule](/assets/images/help/repository/new-tag-protection-rule.png)
+1. Under "Tag name pattern", type the pattern of the tags you want to protect. In this example, typing "\*" protects all tags. ![Set tag protection pattern](/assets/images/help/repository/set-tag-protection-pattern.png)
+1. Click **Add rule**. ![Add tag protection rule](/assets/images/help/repository/add-tag-protection-rule.png)
diff --git a/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md b/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
index 2f7ec4b5cd..a364ef9e68 100644
--- a/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
+++ b/translations/es-ES/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md
@@ -17,6 +17,7 @@ children:
   - /enabling-anonymous-git-read-access-for-a-repository
   - /about-email-notifications-for-pushes-to-your-repository
   - /configuring-autolinks-to-reference-external-resources
+  - /configuring-tag-protection-rules
 shortTitle: Administrar la configuración de un repositorio
 ---
 
diff --git a/translations/es-ES/content/rest/guides/basics-of-authentication.md b/translations/es-ES/content/rest/guides/basics-of-authentication.md
index 7799c5bb6c..59db9d3566 100644
--- a/translations/es-ES/content/rest/guides/basics-of-authentication.md
+++ b/translations/es-ES/content/rest/guides/basics-of-authentication.md
@@ -29,7 +29,7 @@ Primero, necesitas [registrar tu aplicación][new oauth app]. A cada aplicación
 
 Puedes llenar toda la información como más te guste, con excepción de la **URL de rellamado para la autorización**. Esta es fácilmente la parte más importante para configurar tu aplicación. Es la URL de rellamado a la cual {% data variables.product.product_name %} devuelve al usuario después de una autenticación exitosa.
 
-Ya que estamos ejecutando un servidor común de Sinatra, la ubicación de la instancia local se configura como `http://localhost:4567`. Vamos a llenar la URL de rellamado como `http://localhost:4567/callback`.
+Since we're running a regular Sinatra server, the location of the local instance is set to `http://127.0.0.1:4567`. Let's fill in the callback URL as `http://127.0.0.1:4567/callback`.
 
 ## Aceptar la autorización del usuario
 
@@ -80,7 +80,7 @@ Posteriormente, pega este contenido en _views/index.erb_:
 
 También, ten en cuenta que la URL utiliza el parámetro de consulta `scope` para definir los [alcances][oauth scopes] que solicita la aplicación. Para nuestra aplicación, estamos solicitando el alcance `user:email` para leer las direcciones de correo electrónico privadas.
 
-Navega en tu buscador hacia `http://localhost:4567`. Después de dar clic en el enlace, se te llevará a {% data variables.product.product_name %} y se te mostrará un diálogo que se ve más o menos así: ![Diálogo de OAuth de GitHub](/assets/images/oauth_prompt.png)
+Navigate your browser to `http://127.0.0.1:4567`. Después de dar clic en el enlace, se te llevará a {% data variables.product.product_name %} y se te mostrará un diálogo que se ve más o menos así: ![Diálogo de OAuth de GitHub](/assets/images/oauth_prompt.png)
 
 Si confías en ti mismo, da clic en **Autorizar App**. ¡Oh-oh! Sinatra te arroja un error `404`. ¡¿Qué pasa?!
 
@@ -175,7 +175,7 @@ Podemos hacer lo que queramos con nuestros resultados. En este caso, solo las va
 
 ## Implementar la autenticación "persistente"
 
-Estaríamos hablando de un pésimo modelo si requerimos que los usuarios inicien sesión en la app cada vez que necesiten acceder a la página web. Por ejemplo, intenta navegar directamente a `http://localhost:4567/basic`. Obtendrás un error.
+Estaríamos hablando de un pésimo modelo si requerimos que los usuarios inicien sesión en la app cada vez que necesiten acceder a la página web. For example, try navigating directly to `http://127.0.0.1:4567/basic`. Obtendrás un error.
 
 ¿Qué pasaría si pudiéramos evitar todo el proceso de "da clic aquí", y solo lo _recordáramos_, mientras que los usuarios sigan en sesión dentro de
 {% data variables.product.product_name %}, y pudieran acceder a esta aplicación? Agárrate,
@@ -294,7 +294,7 @@ Después, crea un archivo en _views_, el cual se llame _advanced.erb_ y pega est
 
 ```
 
-Desde la líne de comandos, llama a `ruby advanced_server.rb`, lo cual inicia tu servidor en el puerto `4567` -- el mismo puerto que utilizamos cuando tuvimos una app de Sinatra sencilla. Cuando navegas a `http://localhost:4567`, la app llama a `authenticate!`, lo cual te redirige a `/callback`. Entonces, `/callback` nos regresa a `/` y, ya que estuvimos autenticados, interpreta a _advanced.erb_.
+Desde la líne de comandos, llama a `ruby advanced_server.rb`, lo cual inicia tu servidor en el puerto `4567` -- el mismo puerto que utilizamos cuando tuvimos una app de Sinatra sencilla. When you navigate to `http://127.0.0.1:4567`, the app calls `authenticate!` which redirects you to `/callback`. Entonces, `/callback` nos regresa a `/` y, ya que estuvimos autenticados, interpreta a _advanced.erb_.
 
 Podríamos simplificar completamente esta ruta redonda si solo cambiamos nuestra URL de rellamado en {% data variables.product.product_name %} a `/`. Pero, ya que tanto _server.rb_ como _advanced.rb_ dependen de la misma URL de rellamado, necesitamos hacer un poco más de ajustes para que funcione.
 
diff --git a/translations/es-ES/data/features/reopen-dependabot-alerts.yml b/translations/es-ES/data/features/reopen-dependabot-alerts.yml
new file mode 100644
index 0000000000..bd672e3a76
--- /dev/null
+++ b/translations/es-ES/data/features/reopen-dependabot-alerts.yml
@@ -0,0 +1,7 @@
+---
+#Reference 5861
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>3.4'
+  ghae: 'issue-5861'
diff --git a/translations/es-ES/data/reusables/gated-features/tag-protection-rules.md b/translations/es-ES/data/reusables/gated-features/tag-protection-rules.md
new file mode 100644
index 0000000000..3f8d774374
--- /dev/null
+++ b/translations/es-ES/data/reusables/gated-features/tag-protection-rules.md
@@ -0,0 +1 @@
+{% ifversion ghae %}Tag protection rules are available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else%}Tag protection rules are available {% endif %}in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% ifversion fpt or ghec %}{% data reusables.gated-features.more-info %}{% endif %}
diff --git a/translations/es-ES/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md b/translations/es-ES/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
index ad17976c02..da6a01b1a1 100644
--- a/translations/es-ES/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
+++ b/translations/es-ES/data/reusables/identity-and-permissions/ip-allow-lists-example-and-restrictions.md
@@ -1 +1 @@
-Por ejemplo, puedes permitir el acceso desde la única dirección IP de tu red de oficina. La lista de direcciones IP permitidas bloqueará el acceso mediante la web, las API y Git desde cualquier dirección IP que no se encuentre en ella.
+Por ejemplo, puedes permitir el acceso desde la única dirección IP de tu red de oficina. The allow list for IP addresses will block access to private resources via the web, API, and Git from any IP addresses that are not on the allow list.
diff --git a/translations/es-ES/data/reusables/saml/cannot-update-existing-saml-settings.md b/translations/es-ES/data/reusables/saml/cannot-update-existing-saml-settings.md
deleted file mode 100644
index 22983550ed..0000000000
--- a/translations/es-ES/data/reusables/saml/cannot-update-existing-saml-settings.md
+++ /dev/null
@@ -1,5 +0,0 @@
-{% note %}
-
-**Note:** When SAML SSO is enabled, the only setting you can update on {% data variables.product.prodname_dotcom %} for your existing SAML configuration is the SAML certificate. If you need to update the Sign on URL or Issuer, you must first disable SAML SSO and then reconfigure SAML SSO with the new settings.
-
-{% endnote %}
diff --git a/translations/es-ES/data/reusables/scim/emu-scim-rate-limit.md b/translations/es-ES/data/reusables/scim/emu-scim-rate-limit.md
new file mode 100644
index 0000000000..f6317a7545
--- /dev/null
+++ b/translations/es-ES/data/reusables/scim/emu-scim-rate-limit.md
@@ -0,0 +1,5 @@
+{% note %}
+
+**Note:** To avoid exceeding the rate limit on {% data variables.product.product_name %}, do not assign more than 1,000 users per hour to the IdP application. If you use groups to assign users to the IdP application, do not add more than 100 users to each group per hour. If you exceed these thresholds, attempts to provision users may fail with a "rate limit" error.
+
+{% endnote %}
\ No newline at end of file
diff --git a/translations/log/es-resets.csv b/translations/log/es-resets.csv
index 0810ee8f73..d39fa29f58 100644
--- a/translations/log/es-resets.csv
+++ b/translations/log/es-resets.csv
@@ -129,7 +129,6 @@ translations/es-ES/content/code-security/supply-chain-security/keeping-your-depe
 translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates.md,Listed in localization-support#489
 translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot.md,Listed in localization-support#489
 translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates.md,Listed in localization-support#489
-translations/es-ES/content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md,broken liquid tags
 translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies.md,Listed in localization-support#489
 translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates.md,Listed in localization-support#489
 translations/es-ES/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies.md,Listed in localization-support#489

From e18396c7fd3585b2a9bf548cde87f4e733c21f5d Mon Sep 17 00:00:00 2001
From: Peter Bengtsson 
Date: Tue, 8 Mar 2022 20:08:49 -0500
Subject: [PATCH 26/41] avoid mocking in robots.txt testing (#26018)

* avoid mocking in robots.txt testing

* remove package
---
 package-lock.json             | 274 ----------------------------------
 package.json                  |   1 -
 tests/rendering/robots-txt.js |  19 +--
 3 files changed, 6 insertions(+), 288 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5450c2fadc..051eaf2d2e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -147,7 +147,6 @@
         "make-promises-safe": "^5.1.0",
         "minimatch": "^5.0.0",
         "mkdirp": "^1.0.4",
-        "mock-express-response": "^0.3.0",
         "mockdate": "^3.0.5",
         "nock": "^13.2.2",
         "nodemon": "^2.0.15",
@@ -14894,149 +14893,6 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
       "optional": true
     },
-    "node_modules/mock-express-request": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/mock-express-request/-/mock-express-request-0.2.2.tgz",
-      "integrity": "sha512-EymHjY1k1jWIsaVaCsPdFterWO18gcNwQMb99OryhSBtIA33SZJujOLeOe03Rf2DTV997xLPyl2I098WCFm/mA==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "^1.3.4",
-        "fresh": "^0.5.2",
-        "lodash": "^4.17.4",
-        "mock-req": "^0.2.0",
-        "parseurl": "^1.3.2",
-        "range-parser": "^1.2.0",
-        "type-is": "^1.6.15"
-      }
-    },
-    "node_modules/mock-express-response": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/mock-express-response/-/mock-express-response-0.3.0.tgz",
-      "integrity": "sha512-1rw9Ccd4+7eI8uaM5AX3NCP63o5g5DFLtpusJziPO1b42WTZxgVaN95LsWBJSrpslp6Eg2Qc2xM27wxC7GMeVg==",
-      "dev": true,
-      "dependencies": {
-        "content-disposition": "^0.5.2",
-        "content-type": "^1.0.4",
-        "cookie": "^0.3.1",
-        "cookie-signature": "^1.0.6",
-        "depd": "^1.1.1",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "mock-express-request": "^0.2.2",
-        "mock-res": "^0.5.0",
-        "on-finished": "^2.3.0",
-        "proxy-addr": "^2.0.2",
-        "qs": "^6.5.1",
-        "send": "^0.16.1",
-        "utils-merge": "^1.0.1",
-        "vary": "^1.1.2"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/mock-express-response/node_modules/mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/mock-express-response/node_modules/send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/mock-express-response/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/mock-express-response/node_modules/statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mock-req": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/mock-req/-/mock-req-0.2.0.tgz",
-      "integrity": "sha1-dJRGgE0sAGFpNC7nvmu6HP/VNMI=",
-      "dev": true
-    },
-    "node_modules/mock-res": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/mock-res/-/mock-res-0.5.0.tgz",
-      "integrity": "sha1-mDaL6wnfdT9k9m2U5VNql7NqJDA=",
-      "dev": true
-    },
     "node_modules/mockdate": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
@@ -34004,136 +33860,6 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
       "optional": true
     },
-    "mock-express-request": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/mock-express-request/-/mock-express-request-0.2.2.tgz",
-      "integrity": "sha512-EymHjY1k1jWIsaVaCsPdFterWO18gcNwQMb99OryhSBtIA33SZJujOLeOe03Rf2DTV997xLPyl2I098WCFm/mA==",
-      "dev": true,
-      "requires": {
-        "accepts": "^1.3.4",
-        "fresh": "^0.5.2",
-        "lodash": "^4.17.4",
-        "mock-req": "^0.2.0",
-        "parseurl": "^1.3.2",
-        "range-parser": "^1.2.0",
-        "type-is": "^1.6.15"
-      }
-    },
-    "mock-express-response": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/mock-express-response/-/mock-express-response-0.3.0.tgz",
-      "integrity": "sha512-1rw9Ccd4+7eI8uaM5AX3NCP63o5g5DFLtpusJziPO1b42WTZxgVaN95LsWBJSrpslp6Eg2Qc2xM27wxC7GMeVg==",
-      "dev": true,
-      "requires": {
-        "content-disposition": "^0.5.2",
-        "content-type": "^1.0.4",
-        "cookie": "^0.3.1",
-        "cookie-signature": "^1.0.6",
-        "depd": "^1.1.1",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "mock-express-request": "^0.2.2",
-        "mock-res": "^0.5.0",
-        "on-finished": "^2.3.0",
-        "proxy-addr": "^2.0.2",
-        "qs": "^6.5.1",
-        "send": "^0.16.1",
-        "utils-merge": "^1.0.1",
-        "vary": "^1.1.2"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "send": {
-          "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "~1.6.2",
-            "mime": "1.4.1",
-            "ms": "2.0.0",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.0",
-            "statuses": "~1.4.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-          "dev": true
-        }
-      }
-    },
-    "mock-req": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/mock-req/-/mock-req-0.2.0.tgz",
-      "integrity": "sha1-dJRGgE0sAGFpNC7nvmu6HP/VNMI=",
-      "dev": true
-    },
-    "mock-res": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/mock-res/-/mock-res-0.5.0.tgz",
-      "integrity": "sha1-mDaL6wnfdT9k9m2U5VNql7NqJDA=",
-      "dev": true
-    },
     "mockdate": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
diff --git a/package.json b/package.json
index e43a16a77f..0dd6e1a9cf 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,6 @@
     "make-promises-safe": "^5.1.0",
     "minimatch": "^5.0.0",
     "mkdirp": "^1.0.4",
-    "mock-express-response": "^0.3.0",
     "mockdate": "^3.0.5",
     "nock": "^13.2.2",
     "nodemon": "^2.0.15",
diff --git a/tests/rendering/robots-txt.js b/tests/rendering/robots-txt.js
index c7e3871e93..c6010bb3e8 100644
--- a/tests/rendering/robots-txt.js
+++ b/tests/rendering/robots-txt.js
@@ -1,8 +1,6 @@
 import languages from '../../lib/languages.js'
 import robotsParser from 'robots-parser'
-import robotsMiddleware from '../../middleware/robots.js'
 import { get } from '../helpers/supertest.js'
-import MockExpressResponse from 'mock-express-response'
 import { jest } from '@jest/globals'
 
 describe('robots.txt', () => {
@@ -36,17 +34,12 @@ describe('robots.txt', () => {
   })
 
   it('disallows indexing of azurecontainer.io domains', async () => {
-    const req = {
-      hostname: 'docs-internal-preview-12345-asdfz.azurecontainer.io',
-      path: '/robots.txt',
-    }
-    const res = new MockExpressResponse()
-    const next = () => {
-      /* no op */
-    }
-
-    await robotsMiddleware(req, res, next)
-    expect(res._getString()).toEqual('User-agent: *\nDisallow: /')
+    const res = await get('/robots.txt', {
+      headers: {
+        host: 'docs-internal-preview-12345-asdfz.azurecontainer.io',
+      },
+    })
+    expect(res.text).toEqual('User-agent: *\nDisallow: /')
   })
 
   it('does not have duplicate lines', () => {

From 95297c3c9d0f380a7d48238d605fa09280985cc9 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson 
Date: Tue, 8 Mar 2022 20:14:49 -0500
Subject: [PATCH 27/41] Simplify getBreadcrumbs (#26015)

* fix getBreadcrumbs

* don't go too deep

* remove commented out code
---
 components/page-header/Breadcrumbs.tsx    |   1 -
 middleware/contextualizers/breadcrumbs.js | 113 ++++++----------------
 tests/rendering/breadcrumbs.js            |  14 ---
 3 files changed, 31 insertions(+), 97 deletions(-)

diff --git a/components/page-header/Breadcrumbs.tsx b/components/page-header/Breadcrumbs.tsx
index c312df4b5d..c84155f95c 100644
--- a/components/page-header/Breadcrumbs.tsx
+++ b/components/page-header/Breadcrumbs.tsx
@@ -6,7 +6,6 @@ import styles from './Breadcrumbs.module.scss'
 
 export type BreadcrumbT = {
   title: string
-  documentType?: string
   href?: string
 }
 
diff --git a/middleware/contextualizers/breadcrumbs.js b/middleware/contextualizers/breadcrumbs.js
index 737201d442..5b0524f4b9 100644
--- a/middleware/contextualizers/breadcrumbs.js
+++ b/middleware/contextualizers/breadcrumbs.js
@@ -1,3 +1,5 @@
+import liquid from '../../lib/render-content/liquid.js'
+
 export default async function breadcrumbs(req, res, next) {
   if (!req.context.page) return next()
   if (req.context.page.hidden) return next()
@@ -9,95 +11,42 @@ export default async function breadcrumbs(req, res, next) {
     return next()
   }
 
-  const currentSiteTree =
-    req.context.siteTree[req.context.currentLanguage][req.context.currentVersion]
-  const fallbackSiteTree = req.context.siteTree.en[req.context.currentVersion]
-
-  req.context.breadcrumbs = await getBreadcrumbs(
-    // Array of child pages on the root, i.e., the product level.
-    currentSiteTree.childPages,
-    fallbackSiteTree.childPages,
-    req.context.currentPath.slice(3),
-    req.context.currentLanguage
-  )
+  req.context.breadcrumbs = await getBreadcrumbs(req)
 
   return next()
 }
 
-async function getBreadcrumbs(
-  pageArray,
-  fallbackPageArray,
-  currentPathWithoutLanguage,
-  intendedLanguage
-) {
-  // Find the page that starts with the requested path
-  let childPage = findPageWithPath(currentPathWithoutLanguage, pageArray)
-
-  // Find the page in the fallback page array (likely the English sub-tree)
-  const fallbackChildPage =
-    findPageWithPath(currentPathWithoutLanguage, fallbackPageArray || []) || childPage
-
-  // No matches, we bail
-  if (!childPage && !fallbackChildPage) {
-    return []
+async function getBreadcrumbs(req) {
+  const crumbs = []
+  const { currentPath, currentVersion } = req.context
+  const split = currentPath.split('/')
+  while (split.length > 2 && split[split.length - 1] !== currentVersion) {
+    const href = split.join('/')
+    const page = req.context.pages[href]
+    crumbs.push({
+      href,
+      title: await getShortTitle(page, req.context),
+    })
+    split.pop()
   }
+  crumbs.reverse()
 
-  // Didn't find the intended page, but found the fallback
-  if (!childPage) {
-    childPage = fallbackChildPage
-  }
-
-  const breadcrumb = {
-    documentType: childPage.page.documentType,
-    // give the breadcrumb the intendedLanguage, so nav through breadcrumbs doesn't inadvertantly change the user's selected language
-    href: `/${intendedLanguage}/${childPage.href.slice(4)}`,
-    title: childPage.renderedShortTitle || childPage.renderedFullTitle,
-  }
-
-  // Recursively loop through the childPages and create each breadcrumb, until we reach the
-  // point where the current siteTree page is the same as the requested page. Then stop.
-  if (childPage.childPages && currentPathWithoutLanguage !== childPage.href.slice(3)) {
-    return [
-      breadcrumb,
-      ...(await getBreadcrumbs(
-        childPage.childPages,
-        fallbackChildPage.childPages,
-        currentPathWithoutLanguage,
-        intendedLanguage
-      )),
-    ]
-  } else {
-    return [breadcrumb]
-  }
+  return crumbs
 }
 
-// Finds the page that starts with or equals the requested path in the array of
-// pages e.g. if the current page is /actions/learn-github-actions/understanding-github-actions,
-// depending on the pages in the pageArray agrument, would find:
-//
-// * /actions
-// * /actions/learn-github-actions
-// * /actions/learn-github-actions/understanding-github-actions
-function findPageWithPath(pageToFind, pageArray) {
-  return pageArray.find((page) => {
-    const pageWithoutLanguage = page.href.slice(3)
-    const numPathSegments = pageWithoutLanguage.split('/').length
-    const pageToFindNumPathSegments = pageToFind.split('/').length
-
-    if (pageToFindNumPathSegments > numPathSegments) {
-      // if the current page to find has more path segments, add a trailing
-      // slash to the page comparison to avoid an overlap like:
-      //
-      // * /github-cli/github-cli/about-github-cli with /github
-      return pageToFind.startsWith(`${pageWithoutLanguage}/`)
-    } else if (pageToFindNumPathSegments === numPathSegments) {
-      // if the current page has the same number of path segments, only match
-      // if the paths are the same to avoid an overlap like:
-      //
-      // * /get-started/using-github with /get-started/using-git
-      return pageToFind === pageWithoutLanguage
-    } else {
-      return false
+async function getShortTitle(page, context) {
+  if (page.rawShortTitle) {
+    if (page.rawShortTitle.includes('{')) {
+      // Can't easily cache this because the `page` is reused for multiple
+      // permalinks. We could do what the `Page.render()` method does which
+      // specifically caches based on the `context.currentPath` but at
+      // this point it's probably not worth it.
+      return await liquid.parseAndRender(page.rawShortTitle, context)
     }
-  })
+    return page.shortTitle
+  }
+  if (page.rawTitle.includes('{')) {
+    return await liquid.parseAndRender(page.rawTitle, context)
+  }
+  return page.title
 }
diff --git a/tests/rendering/breadcrumbs.js b/tests/rendering/breadcrumbs.js
index 9f1680fd9a..e2847780f2 100644
--- a/tests/rendering/breadcrumbs.js
+++ b/tests/rendering/breadcrumbs.js
@@ -120,7 +120,6 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github?json=breadcrumbs')
       const expected = [
         {
-          documentType: 'product',
           href: '/en/github',
           title: 'GitHub',
         },
@@ -134,17 +133,14 @@ describe('breadcrumbs', () => {
       )
       const expected = [
         {
-          documentType: 'product',
           href: '/en/issues',
           title: 'GitHub Issues',
         },
         {
-          documentType: 'category',
           href: '/en/issues/tracking-your-work-with-issues',
           title: 'Issues',
         },
         {
-          documentType: 'article',
           href: '/en/issues/tracking-your-work-with-issues/quickstart',
           title: 'Quickstart for GitHub Issues',
         },
@@ -158,17 +154,14 @@ describe('breadcrumbs', () => {
       )
       const expected = [
         {
-          documentType: 'product',
           href: '/en/account-and-profile',
           title: 'Account and profile',
         },
         {
-          documentType: 'category',
           href: '/en/account-and-profile/setting-up-and-managing-your-github-user-account',
           title: 'User accounts',
         },
         {
-          documentType: 'mapTopic',
           href: '/en/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings',
           title: 'User account settings',
         },
@@ -182,22 +175,18 @@ describe('breadcrumbs', () => {
       )
       const expected = [
         {
-          documentType: 'product',
           href: '/en/account-and-profile',
           title: 'Account and profile',
         },
         {
-          documentType: 'category',
           href: '/en/account-and-profile/setting-up-and-managing-your-github-user-account',
           title: 'User accounts',
         },
         {
-          documentType: 'mapTopic',
           href: '/en/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings',
           title: 'User account settings',
         },
         {
-          documentType: 'article',
           href: '/en/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard',
           title: 'Your personal dashboard',
         },
@@ -211,17 +200,14 @@ describe('breadcrumbs', () => {
       )
       const expected = [
         {
-          documentType: 'product',
           href: '/en/github',
           title: 'GitHub',
         },
         {
-          documentType: 'category',
           href: '/en/github/site-policy',
           title: 'Site policy',
         },
         {
-          documentType: 'article',
           href: '/en/github/site-policy/github-privacy-statement',
           title: 'GitHub Privacy Statement',
         },

From 8bd8331ef8b15c09fa92221a1b85269ef7d3570b Mon Sep 17 00:00:00 2001
From: Joshua Walker <3141202+joshuawalker@users.noreply.github.com>
Date: Wed, 9 Mar 2022 23:34:19 +1300
Subject: [PATCH 28/41] Update must know password reusable, add one more
 instance

---
 ...ring-your-account-if-you-lose-your-2fa-credentials.md | 9 +++++++--
 data/reusables/accounts/you-must-know-your-password.md   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md
index 021e173134..8c265e5235 100644
--- a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md
+++ b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md
@@ -22,7 +22,6 @@ shortTitle: Recover an account with 2FA
 **Warnings**: 
 
 - {% data reusables.two_fa.support-may-not-help %}
-- {% data reusables.accounts.you-must-know-your-password %}
 
 {% endwarning %}
 
@@ -32,7 +31,13 @@ shortTitle: Recover an account with 2FA
 
 Use one of your recovery codes to automatically regain entry into your account. You may have saved your recovery codes to a password manager or your computer's downloads folder. The default filename for recovery codes is `github-recovery-codes.txt`. For more information about recovery codes, see "[Configuring two-factor authentication recovery methods](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)."
 
-{% data reusables.two_fa.username-password %}
+1. Type your username and password to prompt authentication.
+
+    {% warning %}
+
+    **Warning**: {% data reusables.accounts.you-must-know-your-password %}
+    
+    {% endwarning %}
 
 {% ifversion fpt or ghec %}
 1. Under "Having problems?", click **Use a recovery code or request a reset**.
diff --git a/data/reusables/accounts/you-must-know-your-password.md b/data/reusables/accounts/you-must-know-your-password.md
index f4795c3909..7e671d4127 100644
--- a/data/reusables/accounts/you-must-know-your-password.md
+++ b/data/reusables/accounts/you-must-know-your-password.md
@@ -1 +1 @@
-If you protect your personal account with two-factor authentication but do not know your password, you will not be able to generate a one-time password to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)."
+If you protect your personal account with two-factor authentication but do not know your password, you will not be able to follow these steps to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[Updating your {% data variables.product.prodname_dotcom %} access credentials](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)."

From c51fa948a1cea9ee6f23db9a1d5508a723021e4f Mon Sep 17 00:00:00 2001
From: Felicity Chapman 
Date: Wed, 9 Mar 2022 11:40:07 +0000
Subject: [PATCH 29/41] Update landing page, guides page, etc. for code
 security following addition of GHEC version (#26009)

---
 content/code-security/guides.md               |  5 +++
 content/code-security/index.md                | 28 ++++++------
 data/learning-tracks/code-security.yml        | 45 ++++++++++---------
 .../code-security/code-examples.yml           |  9 ++--
 4 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/content/code-security/guides.md b/content/code-security/guides.md
index 43a3da3bbf..99bf070513 100644
--- a/content/code-security/guides.md
+++ b/content/code-security/guides.md
@@ -31,6 +31,7 @@ includeGuides:
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/tracking-code-scanning-alerts-in-issues-using-task-lists
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts
+  - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository
@@ -38,6 +39,7 @@ includeGuides:
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow
+  - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/viewing-code-scanning-logs
   - /code-security/code-scanning/integrating-with-code-scanning/about-integration-with-code-scanning
   - /code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning
   - /code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github
@@ -45,6 +47,7 @@ includeGuides:
   - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system
   - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system
   - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system
+  - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli
   - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system
   - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system
   - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
@@ -58,6 +61,8 @@ includeGuides:
   - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory
   - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory
   - /code-security/security-overview/about-the-security-overview
+  - /code-security/security-overview/filtering-alerts-in-the-security-overview
+  - /code-security/security-overview/viewing-the-security-overview
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions
   - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
diff --git a/content/code-security/index.md b/content/code-security/index.md
index 4cc88fec92..ec13e102f5 100644
--- a/content/code-security/index.md
+++ b/content/code-security/index.md
@@ -8,17 +8,17 @@ featuredLinks:
   guides:
     - /code-security/getting-started/securing-your-repository
     - /code-security/getting-started/securing-your-organization
-    - '{% ifversion fpt %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}'
-    - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}'
+    - '{% ifversion fpt or ghec %}/code-security/repository-security-advisories/creating-a-repository-security-advisory{% endif %}'
+    - '{% ifversion ghes or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif%}'
   guideCards:
-    - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}'
-    - '{% ifversion fpt %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}'
-    - '{% ifversion fpt %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}'
-    - '{% ifversion ghes %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}'
-    - '{% ifversion ghes %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}'
-    - '{% ifversion ghes or ghae %}/code-security/secret-security/configuring-secret-scanning-for-your-repositories{% endif %}'
-    - '{% ifversion ghae %}/code-security/secure-coding/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}'
-    - '{% ifversion ghae %}/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository{% endif %}'
+    - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/understanding-your-software-supply-chain/exploring-the-dependencies-of-a-repository{% endif %}'
+    - '{% ifversion ghes < 3.3 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}'
+    - '{% ifversion ghes < 3.3 or ghae %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}'
+    - '{% ifversion ghae %}/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}'
+    - '{% ifversion ghae %}/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system{% endif %}'
   popular:
     - '{% ifversion ghes %}/admin/release-notes{% endif %}'
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
@@ -26,11 +26,11 @@ featuredLinks:
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot
-    - '{% ifversion ghae %}/code-security/secret-security/about-secret-scanning{% endif %}'
+    - '{% ifversion ghae %}/code-security/secret-scanning/about-secret-scanning{% endif %}'
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies
-    - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}'
-    - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}'
-    - '{% ifversion ghes or ghae %}/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}'
+    - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages{% endif %}'
+    - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow{% endif %}'
+    - '{% ifversion ghes < 3.3 or ghae %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/running-codeql-code-scanning-in-a-container{% endif %}'
 changelog:
   label: security-and-compliance
   versions:
diff --git a/data/learning-tracks/code-security.yml b/data/learning-tracks/code-security.yml
index dd4bee8c68..fa02e07ec7 100644
--- a/data/learning-tracks/code-security.yml
+++ b/data/learning-tracks/code-security.yml
@@ -2,7 +2,7 @@
 security_advisories:
   title: 'Fix and disclose a security vulnerability'
   description: 'Using repository security advisories to privately fix a reported vulnerability and get a CVE.'
-  featured_track: '{% ifversion fpt %}true{% else %}false{% endif %}'
+  featured_track: '{% ifversion fpt or ghec %}true{% else %}false{% endif %}'
   guides:
     - /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
     - /code-security/repository-security-advisories/creating-a-repository-security-advisory
@@ -13,32 +13,32 @@ security_advisories:
     - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory
     - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory
 
-# Feature available on dotcom and GHES
+# Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track
 dependabot_alerts:
   title: 'Get notifications for vulnerable dependencies'
   description: 'Set up Dependabot to alert you to new vulnerabilities in your dependencies.'
   guides:
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
-    - '{% ifversion not ghae %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}'
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors
 
-# Feature available only on dotcom, so articles available hidden to hide the learning track in other versions
+# Feature available on dotcom and GHES 3.3+, so articles available on GHAE and earlier GHES hidden to hide the learning track
 dependabot_security_updates:
   title: 'Get pull requests to update your vulnerable dependencies'
   description: 'Set up Dependabot to create pull requests when new vulnerabilities are reported.'
   guides:
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates
-    - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}'
-    - '{% ifversion fpt %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/github/administering-a-repository/managing-repository-settings/managing-security-and-analysis-settings-for-your-repository{% endif %}'
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
-    - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}'
+    - '{% ifversion fpt or ghec or ghes > 3.2 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies{% endif %}'
 
-# Feature available only on dotcom
+# Feature available only on dotcom and GHES 3.3+
 dependency_version_updates:
   title: 'Keep your dependencies up-to-date'
   description: 'Use Dependabot to check for new releases and create pull requests to update your dependencies.'
@@ -54,32 +54,34 @@ dependency_version_updates:
     - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
     - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors
 
-# Feature available in all versions from GHES 3.0 up
+# Feature available in GHEC, GHES 3.0 up, and GHAE. Feature limited on FPT so hidden there.
 secret_scanning:
   title: 'Scan for secrets'
   description: 'Set up secret scanning to guard against accidental check-ins of tokens, passwords, and other secrets to your repository.'
   guides:
-    - /code-security/secret-scanning/about-secret-scanning
-    - /code-security/secret-scanning/configuring-secret-scanning-for-your-repositories
-    - /code-security/secret-scanning/defining-custom-patterns-for-secret-scanning
-    - /code-security/secret-scanning/managing-alerts-from-secret-scanning
+    - '{% ifversion not fpt %}/code-security/secret-scanning/about-secret-scanning{% endif %}'
+    - '{% ifversion not fpt %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}'
+    - '{% ifversion not fpt %}/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning{% endif %}'
+    - '{% ifversion not fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning{% endif %}'
+    - '{% ifversion not fpt %}/code-security/secret-scanning/secret-scanning-patterns{% endif %}'
 
-# Security overview feature available only on dotcom currently, so other articles hidden to hide the learning path in other versions
+# Security overview feature available in GHEC and GHES 3.2+, so other articles hidden to hide the learning path in other versions
 security_alerts:
   title: 'Explore and manage security alerts'
   description: 'Learn where to find and resolve security alerts.'
   guides:
-    - /code-security/security-overview/about-the-security-overview
-    - '{% ifversion fpt %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}'
-    - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}'
-    - '{% ifversion fpt %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}'
-    - '{% ifversion fpt %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/about-the-security-overview {% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/security-overview/viewing-the-security-overview {% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/secret-scanning/managing-alerts-from-secret-scanning {% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository{% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/triaging-code-scanning-alerts-in-pull-requests{% endif %}'
+    - '{% ifversion ghec or ghes > 3.1 %}/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository{% endif %}'
 
 # Feature available in all versions from GHES 2.22 up
 code_security_actions:
   title: 'Run code scanning with GitHub Actions'
   description: 'Check your default branch and every pull request to keep vulnerabilities and errors out of your repository.'
-  featured_track: '{% ifversion ghae or ghes > 2.22 %}true{% else %}false{% endif %}'
+  featured_track: '{% ifversion ghae or ghes %}true{% else %}false{% endif %}'
   guides:
     - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning
     - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/setting-up-code-scanning-for-a-repository
@@ -106,6 +108,5 @@ code_security_ci:
     - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system
     - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system
     - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system
-    - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system
-    - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system
+    - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli
     - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/troubleshooting-codeql-runner-in-your-ci-system
diff --git a/data/product-examples/code-security/code-examples.yml b/data/product-examples/code-security/code-examples.yml
index e06f436c6f..4a9dc89aaa 100644
--- a/data/product-examples/code-security/code-examples.yml
+++ b/data/product-examples/code-security/code-examples.yml
@@ -19,9 +19,9 @@
     - GitHub Actions
 
 # Security policies
-- title: Microsoft security policy
+- title: Microsoft security policy template
   description: Example security policy
-  href: /microsoft/microsoft.github.io/blob/master/SECURITY.MD
+  href: https://github.com/microsoft/repo-templates/blob/main/shared/SECURITY.md
   tags:
     - Security policy
 - title: Electron security policy
@@ -50,8 +50,9 @@
   versions:
     fpt: '*'
     ghec: '*'
+    ghes: '>=3.3'
 
-# Dependabot configuration only relevant to GitHub.com
+# Dependabot configuration only relevant to GitHub.com and GHES 3.3+
 # Convert "languages" to "package-ecosystems" for Dependabot configurations
 - title: Super linter configuration
   description: Example Dependabot version updates configuration from the Super linter repository.
@@ -69,6 +70,7 @@
   versions:
     fpt: '*'
     ghec: '*'
+    ghes: '>=3.3'
 
 - title: Dependabot version update PR
   description: Example pull request generated by the Dependabot version updates configuration in the Super linter repository.
@@ -81,3 +83,4 @@
   versions:
     fpt: '*'
     ghec: '*'
+    ghes: '>=3.3'

From df9481e291a509be54b602bb18bf6988922b2ca3 Mon Sep 17 00:00:00 2001
From: Ramya Parimi <33761166+ramyaparimi@users.noreply.github.com>
Date: Wed, 9 Mar 2022 08:48:31 -0600
Subject: [PATCH 30/41] Update move-ready-to-merge-pr.yaml (#26014)

---
 .github/workflows/move-ready-to-merge-pr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/move-ready-to-merge-pr.yaml b/.github/workflows/move-ready-to-merge-pr.yaml
index f9f5c9871b..535ead7355 100644
--- a/.github/workflows/move-ready-to-merge-pr.yaml
+++ b/.github/workflows/move-ready-to-merge-pr.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: move PR
         uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
-          project: Docs team reviews
+          project: Docs open source board
           column: Triage
           repo-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }}
 

From a186d387ca5dd18873b4530a6cf84f5cf5085e43 Mon Sep 17 00:00:00 2001
From: Mike Surowiec 
Date: Wed, 9 Mar 2022 09:17:17 -0600
Subject: [PATCH 31/41] fix: don't use brackets for single option glob, fix OS
 sync action (#26058)

---
 .github/workflows/azure-preview-env-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml
index 98ebb266f4..912f08df90 100644
--- a/.github/workflows/azure-preview-env-deploy.yml
+++ b/.github/workflows/azure-preview-env-deploy.yml
@@ -165,8 +165,8 @@ jobs:
           rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components
           rsync -rptovR --ignore-missing-args ./user-code/lib/./**/*.{js,ts} ./lib
           rsync -rptovR --ignore-missing-args ./user-code/middleware/./**/*.{js,ts} ./middleware
-          rsync -rptovR ./user-code/pages/./**/*.{tsx} ./pages
-          rsync -rptovR ./user-code/stylesheets/./**/*.{scss} ./stylesheets
+          rsync -rptovR ./user-code/pages/./**/*.tsx ./pages
+          rsync -rptovR ./user-code/stylesheets/./**/*.scss ./stylesheets
 
       # In addition to making the final image smaller, we also save time by not sending unnecessary files to the docker build context
       - name: 'Prune for preview env'

From 994340bb89a0e015f82e6c816da9addd3f27c72b Mon Sep 17 00:00:00 2001
From: Laura Coursen 
Date: Wed, 9 Mar 2022 09:30:37 -0600
Subject: [PATCH 32/41] [GHEC version] Version content about setting
 permissions for adding outside collaborators (#25993)

---
 ...borators-to-repositories-in-your-organization.md |  8 ++++----
 ...viewing-people-with-access-to-your-repository.md | 10 ++++++++--
 ...-permissions-for-adding-outside-collaborators.md | 13 ++++++++++---
 .../gated-features/restrict-add-collaborator.md     |  1 -
 .../getting-started/managing-org-policies.md        |  2 +-
 lib/redirects/static/redirect-exceptions.txt        |  6 ++++++
 6 files changed, 29 insertions(+), 11 deletions(-)
 delete mode 100644 data/reusables/gated-features/restrict-add-collaborator.md

diff --git a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
index b0595cd814..770c8fe053 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md
@@ -22,7 +22,11 @@ An outside collaborator is a person who is not a member of your organization, bu
 
 {% data reusables.organizations.outside-collaborators-use-seats %}
 
+{% ifversion fpt %}
+Organizations that use {% data variables.product.prodname_ghe_cloud %} can restrict the ability to invite collaborators. For more information, see "[Setting permissions for adding outside collaborators](/enterprise-cloud@latest/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+{% else %}
 An organization owner can restrict the ability to invite collaborators. For more information, see "[Setting permissions for adding outside collaborators](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)."
+{% endif %}
 
 {% ifversion ghes %}
 Before you can add someone as an outside collaborator on a repository, the person must have a user account on {% data variables.product.product_location %}. If your enterprise uses an external authentication system such as SAML or LDAP, the person you want to add must sign in through that system to create an account. If the person does not have access to the authentication system and built-in authentication is enabled for your enterprise, a site admin can create a user account for the person. For more information, see "[Using built-in authentication](/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-built-in-authentication#inviting-users)."
@@ -32,10 +36,6 @@ Before you can add someone as an outside collaborator on a repository, the perso
 If your organization requires two-factor authentication, all outside collaborators must enable two-factor authentication before accepting your invitation to collaborate on a repository. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization)."
 {% endif %}
 
-{% ifversion fpt %}
-To further support your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
-{% endif %}
-
 ## Adding outside collaborators to a repository
 
 {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
index 31b96a366c..72b20ec508 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md
@@ -22,8 +22,6 @@ You can use this information to help off-board people, gather data for complianc
 
 {% ifversion fpt %}
 Organizations that use {% data variables.product.prodname_ghe_cloud %} can also export a CSV list of people who have access to a repository. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository).
-
-{% data reusables.enterprise.link-to-ghec-trial %}
 {% endif %}
 
 {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5974 %}
@@ -44,6 +42,14 @@ You can see a combined overview of teams and people with access to your reposito
 {% ifversion ghec or ghes or ghae %}
 ## Exporting a list of people with access to your repository
 
+{% ifversion ghec %}
+{% note %}
+
+**Note:** Only organizations that use {% data variables.product.prodname_ghe_cloud %} can export a list of people with access to a repository. {% data reusables.enterprise.link-to-ghec-trial %}
+
+{% endnote %}
+{% endif %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.accessing-repository-graphs %}
 {% data reusables.repositories.accessing-repository-people %}
diff --git a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
index 44b80ce85d..223541b244 100644
--- a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
+++ b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
@@ -1,13 +1,11 @@
 ---
 title: Setting permissions for adding outside collaborators
 intro: 'To protect your organization''s data and the number of paid licenses used in your organization, you can allow only owners to invite outside collaborators to organization repositories.'
-product: '{% data reusables.gated-features.restrict-add-collaborator %}'
 redirect_from:
   - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories
   - /articles/setting-permissions-for-adding-outside-collaborators
   - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators
 versions:
-  fpt: '*'
   ghes: '*'
   ghae: '*'
   ghec: '*'
@@ -17,7 +15,16 @@ topics:
 shortTitle: Set collaborator policy
 ---
 
-Organization owners, and members with admin privileges for a repository, can invite outside collaborators to work on the repository. You can also restrict outside collaborator invite permissions to only organization owners.
+By default, anyone with admin access to a repository can invite outside collaborators to work on the repository. You can choose to restrict the ability to invite outside collaborators to organization owners only.
+
+
+{% ifversion ghec %}
+{% note %}
+
+**Note:** Only organizations that use {% data variables.product.prodname_ghe_cloud %} can restrict the ability to invite outside collaborators to organization owners. {% data reusables.enterprise.link-to-ghec-trial %}
+
+{% endnote %}
+{% endif %}
 
 {% data reusables.organizations.outside-collaborators-use-seats %}
 
diff --git a/data/reusables/gated-features/restrict-add-collaborator.md b/data/reusables/gated-features/restrict-add-collaborator.md
deleted file mode 100644
index 63a7c54409..0000000000
--- a/data/reusables/gated-features/restrict-add-collaborator.md
+++ /dev/null
@@ -1 +0,0 @@
-Restricting the ability to add outside collaborators to owners is available with {% data variables.product.prodname_ghe_cloud %}. For more information, see "[GitHub's products](/articles/githubs-products)."
diff --git a/data/reusables/getting-started/managing-org-policies.md b/data/reusables/getting-started/managing-org-policies.md
index 717d24f2ed..9951b2f572 100644
--- a/data/reusables/getting-started/managing-org-policies.md
+++ b/data/reusables/getting-started/managing-org-policies.md
@@ -1,5 +1,5 @@
 You can manage permissions and policies for a number of different actions and features in your organization.
 
-For example, to protect your organization's data and number of paid licenses, you can choose to allow only organization owners to invite outside collaborators to organization repositories. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Setting permissions for adding outside collaborators](/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)."
+For example, to protect your organization's data, you can restrict repository creation in your organization. You can also choose to allow or prevent the forking of private repositories owned by your organization. For more information, see "[Restricting repository creation in your organization](/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization)" and "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)."
 
 For the full list of settings you can configure for your organization, see "[Managing organization settings](/organizations/managing-organization-settings)."
diff --git a/lib/redirects/static/redirect-exceptions.txt b/lib/redirects/static/redirect-exceptions.txt
index 84ae925469..d32e59eda4 100644
--- a/lib/redirects/static/redirect-exceptions.txt
+++ b/lib/redirects/static/redirect-exceptions.txt
@@ -440,3 +440,9 @@
 - /github/administering-a-repository/managing-alerts-from-secret-scanning
 - /code-security/secret-security/managing-alerts-from-secret-scanning
 - /code-security/secret-scanning/managing-alerts-from-secret-scanning
+
+/enterprise-cloud@latest/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators
+- /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories
+- /articles/setting-permissions-for-adding-outside-collaborators
+- /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators
+- /organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators
\ No newline at end of file

From fcda086e138ff59dc4950cbe5cc4ff02e61f703a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson 
Date: Wed, 9 Mar 2022 11:32:05 -0500
Subject: [PATCH 33/41] make enterprise 3.0 redirects work (#26041)

* make enterprise 3.0 redirects work

* improve tests and better variable name
---
 lib/enterprise-server-releases.js             | 12 ++-
 lib/get-redirect.js                           | 24 ++++--
 middleware/archived-enterprise-versions.js    | 41 ++++++++++-
 .../routing/deprecated-enterprise-versions.js | 73 ++++++++++++++++++-
 tests/unit/get-redirect.js                    | 43 ++++++++++-
 5 files changed, 181 insertions(+), 12 deletions(-)

diff --git a/lib/enterprise-server-releases.js b/lib/enterprise-server-releases.js
index 77367cb2f3..697e062354 100644
--- a/lib/enterprise-server-releases.js
+++ b/lib/enterprise-server-releases.js
@@ -14,8 +14,18 @@ export const next = '3.5'
 export const nextNext = '3.6'
 
 export const supported = ['3.4', '3.3', '3.2', '3.1']
+
+// This indicates the point where we started treating redirect lookups
+// to be a *function* rather than a big *lookup object*.
+// This is important distinguish because we need to leverage that
+// when dealing with redirects specifically in these archived
+// enterprise versions.
+// When you're archiving a version, add the new archived number to this
+// array and you should never need to touch the `deprecated` array
+// on the line just below.
+export const deprecatedWithFunctionalRedirects = ['3.0']
 export const deprecated = [
-  '3.0',
+  ...deprecatedWithFunctionalRedirects,
   '2.22',
   '2.21',
   '2.20',
diff --git a/lib/get-redirect.js b/lib/get-redirect.js
index 52810ac88d..849dbaca47 100644
--- a/lib/get-redirect.js
+++ b/lib/get-redirect.js
@@ -2,21 +2,32 @@ import { languageKeys } from './languages.js'
 import nonEnterpriseDefaultVersion from './non-enterprise-default-version.js'
 
 import { allVersions } from './all-versions.js'
-import { latest, supported } from './enterprise-server-releases.js'
+import {
+  latest,
+  supported,
+  deprecatedWithFunctionalRedirects,
+} from './enterprise-server-releases.js'
 
 const languagePrefixRegex = new RegExp(`^/(${languageKeys.join('|')})/`)
 const nonEnterpriseDefaultVersionPrefix = `/${nonEnterpriseDefaultVersion}`
 
-// Return the new URI if there is one, otherwise return undefined.
-export default function getRedirect(uri, context) {
-  const { redirects, userLanguage } = context
+const supportedAndRecentlyDeprecated = [...supported, ...deprecatedWithFunctionalRedirects]
 
+export function splitPathByLanguage(uri, userLanguage) {
   let language = userLanguage || 'en'
   let withoutLanguage = uri
   if (languagePrefixRegex.test(uri)) {
     language = uri.match(languagePrefixRegex)[1]
     withoutLanguage = uri.replace(languagePrefixRegex, '/')
   }
+  return [language, withoutLanguage]
+}
+
+// Return the new URI if there is one, otherwise return undefined.
+export default function getRedirect(uri, context) {
+  const { redirects, userLanguage } = context
+
+  const [language, withoutLanguage] = splitPathByLanguage(uri, userLanguage)
 
   let destination
 
@@ -54,7 +65,6 @@ export default function getRedirect(uri, context) {
     if (withoutLanguage === '/enterprise-server') {
       return basicCorrection
     }
-    // console.log({ basicCorrection })
   } else if (withoutLanguage.startsWith('/enterprise-server@latest')) {
     // E.g. '/enterprise-server@latest' or '/enterprise-server@latest/3.3/foo'
     basicCorrection =
@@ -67,9 +77,9 @@ export default function getRedirect(uri, context) {
     }
   } else if (
     withoutLanguage.startsWith('/enterprise/') &&
-    supported.includes(withoutLanguage.split('/')[2])
+    supportedAndRecentlyDeprecated.includes(withoutLanguage.split('/')[2])
   ) {
-    // E.g. '/enterprise/3.3' or '/enterprise/3.3/foo'
+    // E.g. '/enterprise/3.3' or '/enterprise/3.3/foo' or '/enterprise/3.0/foo
 
     // If the URL is without a language, and no redirect is necessary,
     // but it has as version prefix, the language has to be there
diff --git a/middleware/archived-enterprise-versions.js b/middleware/archived-enterprise-versions.js
index 5263022b79..b8df1506a1 100644
--- a/middleware/archived-enterprise-versions.js
+++ b/middleware/archived-enterprise-versions.js
@@ -4,6 +4,7 @@ import statsd from '../lib/statsd.js'
 import {
   firstVersionDeprecatedOnNewSite,
   lastVersionWithoutArchivedRedirectsFile,
+  deprecatedWithFunctionalRedirects,
 } from '../lib/enterprise-server-releases.js'
 import patterns from '../lib/patterns.js'
 import versionSatisfiesRange from '../lib/version-satisfies-range.js'
@@ -13,6 +14,7 @@ import got from 'got'
 import { readCompressedJsonFileFallbackLazily } from '../lib/read-json-file.js'
 import { cacheControlFactory } from './cache-control.js'
 import { pathLanguagePrefixed, languagePrefixPathRegex } from '../lib/languages.js'
+import getRedirect, { splitPathByLanguage } from '../lib/get-redirect.js'
 
 function splitByLanguage(uri) {
   let language = null
@@ -35,6 +37,7 @@ const archivedFrontmatterFallbacks = readCompressedJsonFileFallbackLazily(
 )
 
 const cacheControl = cacheControlFactory(60 * 60 * 24 * 365)
+const noCacheControl = cacheControlFactory(0)
 
 // Combine all the things you need to make sure the response is
 // aggresively cached.
@@ -99,6 +102,39 @@ export default async function archivedEnterpriseVersions(req, res, next) {
 
   const redirectCode = pathLanguagePrefixed(req.path) ? 301 : 302
 
+  if (deprecatedWithFunctionalRedirects.includes(requestedVersion)) {
+    const redirectTo = getRedirect(req.path, req.context)
+    if (redirectTo) {
+      if (redirectCode === 301) {
+        cacheControl(res)
+      } else {
+        noCacheControl(res)
+      }
+      res.removeHeader('set-cookie')
+      return res.redirect(redirectCode, redirectTo)
+    }
+
+    const redirectJson = await getRemoteJSON(getProxyPath('redirects.json', requestedVersion), {
+      retry: retryConfiguration,
+      // This is allowed to be different compared to the other requests
+      // we make because downloading the `redirects.json` once is very
+      // useful because it caches so well.
+      // And, as of 2021 that `redirects.json` is 10MB so it's more likely
+      // to time out.
+      timeout: 1000,
+    })
+    const [language, withoutLanguage] = splitPathByLanguage(req.path, req.context.userLanguage)
+    const newRedirectTo = redirectJson[withoutLanguage]
+    if (newRedirectTo) {
+      if (redirectCode === 301) {
+        cacheControl(res)
+      } else {
+        noCacheControl(res)
+      }
+      res.removeHeader('set-cookie')
+      return res.redirect(redirectCode, `/${language}${newRedirectTo}`)
+    }
+  }
   // redirect language-prefixed URLs like /en/enterprise/2.10 -> /enterprise/2.10
   // (this only applies to versions <2.13)
   if (
@@ -135,7 +171,10 @@ export default async function archivedEnterpriseVersions(req, res, next) {
     }
   }
 
-  if (versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutArchivedRedirectsFile}`)) {
+  if (
+    versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutArchivedRedirectsFile}`) &&
+    !deprecatedWithFunctionalRedirects.includes(requestedVersion)
+  ) {
     const redirectJson = await getRemoteJSON(getProxyPath('redirects.json', requestedVersion), {
       retry: retryConfiguration,
       // This is allowed to be different compared to the other requests
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
index 6b6074eef1..affcd7df28 100644
--- a/tests/routing/deprecated-enterprise-versions.js
+++ b/tests/routing/deprecated-enterprise-versions.js
@@ -1,9 +1,11 @@
+import supertest from 'supertest'
+import { describe, jest, test } from '@jest/globals'
+
 import createApp from '../../lib/app.js'
 import enterpriseServerReleases from '../../lib/enterprise-server-releases.js'
 import { get, getDOM } from '../helpers/supertest.js'
 import { SURROGATE_ENUMS } from '../../middleware/set-fastly-surrogate-key.js'
-import supertest from 'supertest'
-import { jest } from '@jest/globals'
+import { PREFERRED_LOCALE_COOKIE_NAME } from '../../middleware/detect-language.js'
 
 jest.useFakeTimers('legacy')
 
@@ -89,6 +91,73 @@ describe('enterprise deprecation', () => {
   })
 })
 
+// Starting with the deprecation of 3.0, it's the first time we deprecate
+// enterprise versions since redirects is a *function* rather than a
+// lookup in a big object.
+describe('recently deprecated redirects', () => {
+  test('basic enterprise 3.0 redirects', async () => {
+    const res = await get('/enterprise/3.0')
+    expect(res.statusCode).toBe(302)
+    expect(res.headers.location).toBe('/en/enterprise-server@3.0')
+    expect(res.headers['set-cookie']).toBeUndefined()
+    // Deliberately no cache control because it is user-dependent
+    expect(res.headers['cache-control']).toBe('private, no-store')
+  })
+  test('basic enterprise 3.0 redirects by cookie', async () => {
+    const res = await get('/enterprise/3.0', {
+      headers: {
+        Cookie: `${PREFERRED_LOCALE_COOKIE_NAME}=ja`,
+      },
+    })
+    expect(res.statusCode).toBe(302)
+    expect(res.headers.location).toBe('/ja/enterprise-server@3.0')
+  })
+  test('already languaged enterprise 3.0 redirects', async () => {
+    const res = await get('/en/enterprise/3.0')
+    expect(res.statusCode).toBe(301)
+    expect(res.headers.location).toBe('/en/enterprise-server@3.0')
+    // 301 redirects are safe to cache aggressively
+    expect(res.headers['set-cookie']).toBeUndefined()
+    expect(res.headers['cache-control']).toContain('public')
+    expect(res.headers['cache-control']).toMatch(/max-age=\d+/)
+  })
+  test('redirects enterprise-server 3.0 with actual redirect without language', async () => {
+    const res = await get(
+      '/enterprise-server@3.0/github/getting-started-with-github/githubs-products'
+    )
+    expect(res.statusCode).toBe(302)
+    expect(res.headers['set-cookie']).toBeUndefined()
+    // Deliberately no cache control because it is user-dependent
+    expect(res.headers['cache-control']).toBe('private, no-store')
+    // This is based on
+    // https://github.com/github/help-docs-archived-enterprise-versions/blob/master/3.0/redirects.json
+    expect(res.headers.location).toBe(
+      '/en/enterprise-server@3.0/get-started/learning-about-github/githubs-products'
+    )
+  })
+  test('redirects enterprise-server 3.0 with actual redirect with language', async () => {
+    const res = await get(
+      '/ja/enterprise-server@3.0/github/getting-started-with-github/githubs-products'
+    )
+    expect(res.statusCode).toBe(301)
+    expect(res.headers['set-cookie']).toBeUndefined()
+    expect(res.headers['cache-control']).toContain('public')
+    expect(res.headers['cache-control']).toMatch(/max-age=\d+/)
+    // This is based on
+    // https://github.com/github/help-docs-archived-enterprise-versions/blob/master/3.0/redirects.json
+    expect(res.headers.location).toBe(
+      '/ja/enterprise-server@3.0/get-started/learning-about-github/githubs-products'
+    )
+  })
+  test('follow redirects enterprise-server 3.0 with actual redirect without language', async () => {
+    const res = await get(
+      '/enterprise-server@3.0/github/getting-started-with-github/githubs-products',
+      { followAllRedirects: true }
+    )
+    expect(res.statusCode).toBe(200)
+  })
+})
+
 describe('deprecation banner', () => {
   test('renders a deprecation warning banner on oldest supported Enterprise version', async () => {
     const $ = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
diff --git a/tests/unit/get-redirect.js b/tests/unit/get-redirect.js
index ad425e0be3..fd401e4d86 100644
--- a/tests/unit/get-redirect.js
+++ b/tests/unit/get-redirect.js
@@ -1,6 +1,36 @@
-import getRedirect from '../../lib/get-redirect.js'
+import { describe, expect, test } from '@jest/globals'
+
+import getRedirect, { splitPathByLanguage } from '../../lib/get-redirect.js'
 import { latest } from '../../lib/enterprise-server-releases.js'
 
+describe('splitPathByLanguage', () => {
+  test('basic', () => {
+    const [language, withoutLanguage] = splitPathByLanguage('/foo/')
+    expect(language).toBe('en')
+    expect(withoutLanguage).toBe('/foo/')
+  })
+  test('already has /en in it', () => {
+    const [language, withoutLanguage] = splitPathByLanguage('/en/foo/')
+    expect(language).toBe('en')
+    expect(withoutLanguage).toBe('/foo/')
+  })
+  test('basic with different fallback', () => {
+    const [language, withoutLanguage] = splitPathByLanguage('/foo/', 'ja')
+    expect(language).toBe('ja')
+    expect(withoutLanguage).toBe('/foo/')
+  })
+  test('already has /en different fallback', () => {
+    const [language, withoutLanguage] = splitPathByLanguage('/en/foo/', 'ja')
+    expect(language).toBe('en')
+    expect(withoutLanguage).toBe('/foo/')
+  })
+  test('unrecognized prefix is ignored', () => {
+    const [language, withoutLanguage] = splitPathByLanguage('/sv/foo/')
+    expect(language).toBe('en')
+    expect(withoutLanguage).toBe('/sv/foo/')
+  })
+})
+
 describe('getRedirect basics', () => {
   it('should sometimes not correct the version prefix', () => {
     // This essentially tests legacy entries that come from the
@@ -162,4 +192,15 @@ describe('getRedirect basics', () => {
     ctx.userLanguage = null
     expect(getRedirect('/foo', ctx)).toBe(`/en/bar`)
   })
+
+  it('should work for some deprecated enterprise-server URLs too', () => {
+    // Starting with enterprise-server 3.0, we have made redirects become
+    // a *function* rather than a lookup on a massive object.
+    const ctx = {
+      pages: {},
+      redirects: {},
+    }
+    expect(getRedirect('/enterprise/3.0', ctx)).toBe('/en/enterprise-server@3.0')
+    expect(getRedirect('/enterprise/3.0/foo', ctx)).toBe('/en/enterprise-server@3.0/foo')
+  })
 })

From 5d5c3e971b7d214121b09818e186ec939b54a14f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson 
Date: Wed, 9 Mar 2022 11:45:18 -0500
Subject: [PATCH 34/41] add context to liquid rendering in linting tests
 (#26055)

* HACK

* back

* remove consolelog

* remove debugging

* remove more debugging
---
 tests/linting/lint-files.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/linting/lint-files.js b/tests/linting/lint-files.js
index 95001c216f..0db91779e2 100644
--- a/tests/linting/lint-files.js
+++ b/tests/linting/lint-files.js
@@ -25,6 +25,7 @@ import allowedVersionOperators from '../../lib/liquid-tags/ifversion-supported-o
 import semver from 'semver'
 import { jest } from '@jest/globals'
 import { getDiffFiles } from '../helpers/diff-files.js'
+import loadSiteData from '../../lib/site-data.js'
 
 jest.useFakeTimers('legacy')
 
@@ -410,6 +411,9 @@ if (
 
 describe('lint markdown content', () => {
   if (mdToLint.length < 1) return
+
+  const siteData = loadSiteData()
+
   describe.each(mdToLint)('%s', (markdownRelPath, markdownAbsPath) => {
     let content,
       ast,
@@ -453,12 +457,14 @@ describe('lint markdown content', () => {
         }
       })
 
+      const context = { site: siteData.en.site }
+
       // visit is not async-friendly so we need to do an async map to parse the YML snippets
       yamlScheduledWorkflows = (
         await Promise.all(
           yamlScheduledWorkflows.map(async (snippet) => {
             // If we don't parse the Liquid first, yaml loading chokes on {% raw %} tags
-            const rendered = await renderContent.liquid.parseAndRender(snippet)
+            const rendered = await renderContent.liquid.parseAndRender(snippet, context)
             const parsed = yaml.load(rendered)
             return parsed.on.schedule
           })
@@ -1031,6 +1037,9 @@ describe('lint GHAE release notes', () => {
 
 describe('lint learning tracks', () => {
   if (learningTracksToLint.length < 1) return
+
+  const siteData = loadSiteData()
+
   describe.each(learningTracksToLint)('%s', (yamlRelPath, yamlAbsPath) => {
     let dictionary
     let dictionaryError = false
@@ -1066,7 +1075,7 @@ describe('lint learning tracks', () => {
       const productVersions = getApplicableVersions(data.versions, productTocPath)
 
       const featuredTracks = {}
-      const context = { enterpriseServerVersions }
+      const context = { enterpriseServerVersions, site: siteData.en.site }
 
       // For each of the product's versions, render the learning track data and look for a featured track.
       await Promise.all(

From 28e81ba93b36b0037c11aedc7d0e76ad6ced1a10 Mon Sep 17 00:00:00 2001
From: Grace Park 
Date: Wed, 9 Mar 2022 09:41:48 -0800
Subject: [PATCH 35/41] adding copy code to code samples in rest docs (#26043)

---
 components/rest/CodeBlock.tsx       | 66 ++++++++++++++++++++++++-----
 components/rest/RestCodeSamples.tsx | 14 +-----
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/components/rest/CodeBlock.tsx b/components/rest/CodeBlock.tsx
index a9e9fd6386..9ae467cf65 100644
--- a/components/rest/CodeBlock.tsx
+++ b/components/rest/CodeBlock.tsx
@@ -1,24 +1,68 @@
 import cx from 'classnames'
+import { CheckIcon, CopyIcon } from '@primer/octicons-react'
+import { Tooltip } from '@primer/react'
+
+import useClipboard from 'components/hooks/useClipboard'
 
 import styles from './CodeBlock.module.scss'
 
 type Props = {
   verb?: string
+  headingLang?: string
   codeBlock: string
   highlight?: string
 }
 
-export function CodeBlock({ verb, codeBlock, highlight }: Props) {
+export function CodeBlock({ verb, headingLang, codeBlock, highlight }: Props) {
+  const [isCopied, setCopied] = useClipboard(codeBlock, {
+    successDuration: 1400,
+  })
+
   return (
-    
-      
-        {verb && (
-          
-            {verb}
-          
-        )}{' '}
-        {codeBlock}
-      
-    

+    

+      {headingLang && (
+        

+          {headingLang === 'JavaScript' ? (
+            
+              {headingLang} (
+              
+                @octokit/core.js
+              
+              )
+            
+          ) : (
+            `${headingLang}`
+          )}
+          
+            
+          
+        

+      )}
+      
+        
+          {verb && (
+            
+              {verb}
+            
+          )}{' '}
+          {codeBlock}
+        
+        {!headingLang && (
+          
+            
+          
+        )}
+      

+    

   )
 }
diff --git a/components/rest/RestCodeSamples.tsx b/components/rest/RestCodeSamples.tsx
index 6c52c31d97..71c8e7e640 100644
--- a/components/rest/RestCodeSamples.tsx
+++ b/components/rest/RestCodeSamples.tsx
@@ -18,22 +18,10 @@ export function RestCodeSamples({ slug, xCodeSamples }: Props) {
       {xCodeSamples.map((sample, index) => {
         const sampleElements: JSX.Element[] = []
         if (sample.lang !== 'Ruby') {
-          sampleElements.push(
-            sample.lang === 'JavaScript' ? (
-              

-                {sample.lang} (
-                
-                  @octokit/core.js
-                
-                )
-              

-            ) : (
-              
{sample.lang}

-            )
-          )
           sampleElements.push(
             

From 8f0d270d569f56a97a6ed453947c165da7646f01 Mon Sep 17 00:00:00 2001
From: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>
Date: Wed, 9 Mar 2022 12:54:34 -0800
Subject: [PATCH 36/41] Add codespaces to product names (#26062)

---
 contributing/content-style-guide.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md
index e312c7c593..3dc7b2d444 100644
--- a/contributing/content-style-guide.md
+++ b/contributing/content-style-guide.md
@@ -322,6 +322,7 @@ Take care to distinguish between product names and product elements. For more in
 | Product | Element |
 | --- | --- |
 | GitHub Actions | an action |
+| GitHub Codespaces | a codespace |
 | GitHub Packages | a package |
 | GitHub Pages | a GitHub Pages site |
 
@@ -594,7 +595,7 @@ Avoid ending a sentence with a preposition unless the rewritten sentence would s
 
 ### Product names
 
-See the “Product names” section of this guide.
+See the “[Product names](#product-names)” section of this guide.
 
 ### Terms to use or avoid
 

From 58286e0eb6ce1d6dba94313eae99e165ba28744b Mon Sep 17 00:00:00 2001
From: Robert Sese 
Date: Wed, 9 Mar 2022 16:13:59 -0600
Subject: [PATCH 37/41] Add missing key for GraphQL template reusable (#26045)

Co-authored-by: Peter Bengtsson 

Co-authored-by: Peter Bengtsson 
---
 data/ui.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/ui.yml b/data/ui.yml
index 98fff7d844..38fa911b1e 100644
--- a/data/ui.yml
+++ b/data/ui.yml
@@ -90,6 +90,7 @@ contribution_cta:
 products:
   graphql:
     reference:
+      implements: Implements
       fields: Fields
       arguments: Arguments
       name: Name

From b16be00f3e86e44be08ea1930d3628c174355843 Mon Sep 17 00:00:00 2001
From: Grace Park 
Date: Wed, 9 Mar 2022 15:55:17 -0800
Subject: [PATCH 38/41] adding copy button click event (#26074)

---
 components/lib/events.ts      | 10 ++++++++++
 components/rest/CodeBlock.tsx |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/lib/events.ts b/components/lib/events.ts
index 9570a50f96..8bb16ed2b9 100644
--- a/components/lib/events.ts
+++ b/components/lib/events.ts
@@ -245,6 +245,15 @@ function initClipboardEvent() {
   })
 }
 
+function initCopyButtonEvent() {
+  document.documentElement.addEventListener('click', (evt) => {
+    const target = evt.target as HTMLElement
+    const button = target.closest('.js-btn-copy') as HTMLButtonElement
+    if (!button) return
+    sendEvent({ type: EventType.navigate, navigate_label: 'copy icon button' })
+  })
+}
+
 function initLinkEvent() {
   document.documentElement.addEventListener('click', (evt) => {
     const target = evt.target as HTMLElement
@@ -267,6 +276,7 @@ export default function initializeEvents() {
   initPageAndExitEvent() // must come first
   initLinkEvent()
   initClipboardEvent()
+  initCopyButtonEvent()
   initPrintEvent()
   // survey event in ./survey.js
   // experiment event in ./experiment.js
diff --git a/components/rest/CodeBlock.tsx b/components/rest/CodeBlock.tsx
index 9ae467cf65..7b91081347 100644
--- a/components/rest/CodeBlock.tsx
+++ b/components/rest/CodeBlock.tsx
@@ -34,7 +34,7 @@ export function CodeBlock({ verb, headingLang, codeBlock, highlight }: Props) {
             `${headingLang}`
           )}
           
-            
           
@@ -57,7 +57,7 @@ export function CodeBlock({ verb, headingLang, codeBlock, highlight }: Props) {
         
         {!headingLang && (
           
-            
           

From 0dda6a1893ce678d7f424659bee1dbf48d376ab9 Mon Sep 17 00:00:00 2001
From: Grace Park 
Date: Wed, 9 Mar 2022 16:55:26 -0800
Subject: [PATCH 39/41] remove copy icon from non code samples (#26075)

---
 components/rest/CodeBlock.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/components/rest/CodeBlock.tsx b/components/rest/CodeBlock.tsx
index 7b91081347..0f8886fdad 100644
--- a/components/rest/CodeBlock.tsx
+++ b/components/rest/CodeBlock.tsx
@@ -8,6 +8,7 @@ import styles from './CodeBlock.module.scss'
 
 type Props = {
   verb?: string
+  // Only Code samples should have a copy icon - if there's a headingLang it's a code sample
   headingLang?: string
   codeBlock: string
   highlight?: string
@@ -55,13 +56,6 @@ export function CodeBlock({ verb, headingLang, codeBlock, highlight }: Props) {
           )}{' '}
           {codeBlock}
         
-        {!headingLang && (
-          
-            
-          
-        )}
) From 01baeda3c0db2c5de1917ba9b9e86da078830791 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 9 Mar 2022 20:57:40 -0500 Subject: [PATCH 40/41] sync serialize sitedata to disk (#25749) * sync serialize sitedata to disk * use os.tmpdir * refactor tests * debugging * use log * debugging * louder about syntax errors * warn-before-tests * louder about disk-caching redirects * less loud * only in development again --- .github/workflows/test.yml | 5 ++++ lib/site-data.js | 43 ++++++++++++++++++++++----- script/warm-before-tests.mjs | 22 ++++++++++++++ tests/content/category-pages.js | 8 +---- tests/content/glossary.js | 7 ++--- tests/content/site-data-references.js | 23 ++++++-------- tests/content/site-data.js | 23 ++------------ tests/unit/liquid.js | 6 +--- 8 files changed, 77 insertions(+), 60 deletions(-) create mode 100755 script/warm-before-tests.mjs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 909ddc9200..c86acc9c46 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -132,6 +132,11 @@ jobs: - name: Run build script run: npm run build + - name: Warm possible disk caching + env: + NODE_ENV: test + run: ./script/warm-before-tests.mjs + - name: Run tests env: DIFF_FILE: get_diff_files.txt diff --git a/lib/site-data.js b/lib/site-data.js index e48dc9c55b..7734f45f9c 100755 --- a/lib/site-data.js +++ b/lib/site-data.js @@ -1,3 +1,5 @@ +import fs from 'fs' +import os from 'os' import path from 'path' import flat from 'flat' import { get, set } from 'lodash-es' @@ -5,17 +7,42 @@ import languages from './languages.js' import dataDirectory from './data-directory.js' import encodeBracketedParentheses from './encode-bracketed-parentheses.js' -const loadSiteDataFromDir = (dir) => ({ - site: { - data: dataDirectory(path.join(dir, 'data'), { - preprocess: (dataString) => encodeBracketedParentheses(dataString.trimEnd()), - ignorePatterns: [/README\.md$/], - }), - }, +const TEMP_DIRECTORY = process.env.RUNNER_TEMP || os.tmpdir() + +function diskMemoize(prefix, fn) { + const useCache = process.env.NODE_ENV !== 'development' + return (dir) => { + const cacheFileName = `${prefix}.${dir.replace(/[^\w]+/g, '-').toLowerCase() || 'en'}.json` + if (useCache) { + try { + return JSON.parse(fs.readFileSync(cacheFileName, 'utf-8')) + } catch (err) { + if (!(err.code === 'ENOENT' || err instanceof SyntaxError)) throw err + } + } + + const result = fn(dir) + if (useCache) { + fs.writeFileSync(cacheFileName, JSON.stringify(result), 'utf-8') + console.log(`Disk-cache miss on ${cacheFileName}`, new Date()) + } + return result + } +} + +const loadSiteDataFromDir = diskMemoize(path.join(TEMP_DIRECTORY, 'docs-site-data'), (dir) => { + return { + site: { + data: dataDirectory(path.join(dir, 'data'), { + preprocess: (dataString) => encodeBracketedParentheses(dataString.trimEnd()), + ignorePatterns: [/README\.md$/], + }), + }, + } }) export default function loadSiteData() { - // load english site data + // load English site data const siteData = { en: loadSiteDataFromDir(languages.en.dir), } diff --git a/script/warm-before-tests.mjs b/script/warm-before-tests.mjs new file mode 100755 index 0000000000..99bfc4ba03 --- /dev/null +++ b/script/warm-before-tests.mjs @@ -0,0 +1,22 @@ +#!/usr/bin/env node + +// [start-readme] +// +// It runs the warmServer() function because that function can do things +// like writing to disk as a caching mechanism. +// When jest runs tests, it starts multiple concurrent processes, +// even if it runs it serially (`--runInBand`) so it's highly likely +// that two concurrent processes both attempt to writing to +// the same exact file. By running this script before anything +// begins, we can be certain that files that should have been created +// are created. +// +// [end-readme] + +import warmServer from '../lib/warm-server.js' + +main() + +async function main() { + await warmServer() +} diff --git a/tests/content/category-pages.js b/tests/content/category-pages.js index 72a6661659..244ccf4e20 100644 --- a/tests/content/category-pages.js +++ b/tests/content/category-pages.js @@ -17,13 +17,7 @@ const slugger = new GithubSlugger() const contentDir = path.join(__dirname, '../../content') describe('category pages', () => { - let siteData - - beforeAll(async () => { - // Load the English site data - const allSiteData = await loadSiteData() - siteData = allSiteData.en.site - }) + const siteData = loadSiteData().en.site const walkOptions = { globs: ['*/index.md', 'enterprise/*/index.md'], diff --git a/tests/content/glossary.js b/tests/content/glossary.js index 5038586248..12bbae0664 100644 --- a/tests/content/glossary.js +++ b/tests/content/glossary.js @@ -1,10 +1,7 @@ import loadSiteData from '../../lib/site-data.js' describe('glossaries', () => { - let glossaries - beforeAll(async () => { - glossaries = (await loadSiteData()).en.site.data.glossaries - }) + const glossaries = loadSiteData().en.site.data.glossaries test('are broken into external, internal, and candidates', async () => { const keys = Object.keys(glossaries) @@ -41,7 +38,7 @@ describe('glossaries', () => { }) test('non-English external glossary is in correct order', async () => { - const vals = (await loadSiteData()).ja.site.data.glossaries.external + const vals = loadSiteData().ja.site.data.glossaries.external vals.forEach((val, i) => { expect(val.term.localeCompare(vals[i + 1], 'ja')).toBeGreaterThan(0) }) diff --git a/tests/content/site-data-references.js b/tests/content/site-data-references.js index 0c13801baf..8ecfa10fc9 100644 --- a/tests/content/site-data-references.js +++ b/tests/content/site-data-references.js @@ -11,17 +11,12 @@ import { jest } from '@jest/globals' const __dirname = path.dirname(fileURLToPath(import.meta.url)) +const siteData = loadSiteData() +const pages = (await loadPages()).filter((page) => page.languageCode === 'en') + describe('data references', () => { jest.setTimeout(60 * 1000) - let data, pages - - beforeAll(async () => { - data = await loadSiteData() - pages = await loadPages() - pages = pages.filter((page) => page.languageCode === 'en') - }) - test('every data reference found in English content files is defined and has a value', () => { let errors = [] expect(pages.length).toBeGreaterThan(0) @@ -30,7 +25,7 @@ describe('data references', () => { const file = path.join('content', page.relativePath) const pageRefs = getDataReferences(page.markdown) pageRefs.forEach((key) => { - const value = get(data.en, key) + const value = get(siteData.en, key) if (typeof value !== 'string') errors.push({ key, value, file }) }) }) @@ -50,7 +45,7 @@ describe('data references', () => { const { data: metadata } = frontmatter(fileContents, { filepath: page.fullPath }) const metadataRefs = getDataReferences(JSON.stringify(metadata)) metadataRefs.forEach((key) => { - const value = get(data.en, key) + const value = get(siteData.en, key) if (typeof value !== 'string') errors.push({ key, value, metadataFile }) }) }) @@ -62,7 +57,7 @@ describe('data references', () => { test('every data reference found in English reusable files is defined and has a value', async () => { let errors = [] - const allReusables = data.en.site.data.reusables + const allReusables = siteData.en.site.data.reusables const reusables = Object.values(allReusables) expect(reusables.length).toBeGreaterThan(0) @@ -78,7 +73,7 @@ describe('data references', () => { const reusableRefs = getDataReferences(JSON.stringify(reusablesPerFile)) reusableRefs.forEach((key) => { - const value = get(data.en, key) + const value = get(siteData.en, key) if (typeof value !== 'string') errors.push({ key, value, reusableFile }) }) }) @@ -90,7 +85,7 @@ describe('data references', () => { test('every data reference found in English variable files is defined and has a value', async () => { let errors = [] - const allVariables = data.en.site.data.variables + const allVariables = siteData.en.site.data.variables const variables = Object.values(allVariables) expect(variables.length).toBeGreaterThan(0) @@ -106,7 +101,7 @@ describe('data references', () => { const variableRefs = getDataReferences(JSON.stringify(variablesPerFile)) variableRefs.forEach((key) => { - const value = get(data.en, key) + const value = get(siteData.en, key) if (typeof value !== 'string') errors.push({ key, value, variableFile }) }) }) diff --git a/tests/content/site-data.js b/tests/content/site-data.js index 2bf594f529..fa728fe6c4 100644 --- a/tests/content/site-data.js +++ b/tests/content/site-data.js @@ -1,21 +1,17 @@ import { fileURLToPath } from 'url' import path from 'path' -import fs from 'fs' import { get, isPlainObject, has } from 'lodash-es' import flat from 'flat' +import walkSync from 'walk-sync' import { ParseError } from 'liquidjs' import loadSiteData from '../../lib/site-data.js' import patterns from '../../lib/patterns.js' import { liquid } from '../../lib/render-content/index.js' -import walkSync from 'walk-sync' const __dirname = path.dirname(fileURLToPath(import.meta.url)) describe('siteData module (English)', () => { - let data - beforeAll(async () => { - data = await loadSiteData() - }) + const data = loadSiteData() test('makes an object', async () => { expect(isPlainObject(data)).toBe(true) @@ -49,21 +45,6 @@ describe('siteData module (English)', () => { expect(reusable.includes('任意のページの左上で')).toBe(true) }) - test('backfills missing translated site data with English values', async () => { - const newFile = path.join(__dirname, '../../data/newfile.yml') - fs.writeFileSync(newFile, 'newvalue: bar') - try { - const data = loadSiteData() - expect(get(data, 'en.site.data.newfile.newvalue')).toEqual('bar') - expect(get(data, 'ja.site.data.newfile.newvalue')).toEqual('bar') - } finally { - // If an error is thrown above, it will still "bubble up" - // to the jest reporter, but we still always need to clean up - // the temporary file. - fs.unlinkSync(newFile) - } - }) - test('all Liquid tags are valid', async () => { const dataMap = flat(data) for (const key in dataMap) { diff --git a/tests/unit/liquid.js b/tests/unit/liquid.js index 9a3661bc1d..131bb3d8cb 100644 --- a/tests/unit/liquid.js +++ b/tests/unit/liquid.js @@ -191,11 +191,7 @@ describe('liquid template parser', () => { // Create a fake req so we can test the feature versions middleware const req = { language: 'en', query: {} } - let siteData - beforeAll(async () => { - const allSiteData = await loadSiteData() - siteData = allSiteData.en.site - }) + const siteData = loadSiteData().en.site test('does not render in FPT because feature is not available in FPT', async () => { req.context = { From 345047e09d2ee72011f40f755db72e19d382cf19 Mon Sep 17 00:00:00 2001 From: Rohan Mukherjee Date: Thu, 10 Mar 2022 17:37:16 +0530 Subject: [PATCH 41/41] fix: change `tag-ignore` to `tags-ignore` --- .../workflows/section-run-on-specific-branches-or-tags.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md b/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md index 2b526c3408..e3a47d5e23 100644 --- a/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md +++ b/data/reusables/actions/workflows/section-run-on-specific-branches-or-tags.md @@ -5,7 +5,7 @@ Use the `branches` filter when you want to include branch name patterns or when Use the `tags` filter when you want to include tag name patterns or when you want to both include and exclude tag names patterns. Use the `tags-ignore` filter when you only want to exclude tag name patterns. You cannot use both the `tags` and `tags-ignore` filters for the same event in a workflow. -If you define only `tags`/`tag-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tag-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. +If you define only `tags`/`tags-ignore` or only `branches`/`branches-ignore`, the workflow won't run for events affecting the undefined Git ref. If you define neither `tags`/`tags-ignore` or `branches`/`branches-ignore`, the workflow will run for events affecting either branches or tags. If you define both `branches`/`branches-ignore` and [`paths`](#onpushpull_requestpull_request_targetpathspaths-ignore), the workflow will only run when both filters are satisfied. The `branches`, `branches-ignore`, `tags`, and `tags-ignore` keywords accept glob patterns that use characters like `*`, `**`, `+`, `?`, `!` and others to match more than one branch or tag name. If a name contains any of these characters and you want a literal match, you need to *escape* each of these special characters with `\`. For more information about glob patterns, see the "[Filter pattern cheat sheet](/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet)."