diff --git a/translations/es-ES/data/reusables/audit_log/audit-log-action-categories.md b/translations/es-ES/data/reusables/audit_log/audit-log-action-categories.md
index b3b9159cdc..3c05a65e56 100644
--- a/translations/es-ES/data/reusables/audit_log/audit-log-action-categories.md
+++ b/translations/es-ES/data/reusables/audit_log/audit-log-action-categories.md
@@ -12,7 +12,7 @@
| `billing` | Contains activities related to an organization's billing.
{%- endif %}
{%- ifversion ghec or ghes or ghae %}
-| `business` | Contains activities related to business settings for an enterprise.
+| `business` | Contiene actividades relacionadas con los ajustes de negocio para una empresa.
{%- endif %}
{%- ifversion ghec or ghes or ghae %}
| `business` | Contiene actividades relacionadas con los ajustes de negocio para una empresa.
@@ -125,7 +125,7 @@
{%- ifversion ghec or ghes > 3.1 %}
| `restrict_notification_delivery` | Contains activities related to the restriction of email notifications to approved or verified domains for an enterprise.
{%- endif %}
-{%- ifversion ghec or ghes > 3.4 or ghae-issue-6271 %}
+{%- if custom-repository-roles %}
| `role` | Contains activities related to [custom repository roles](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization).
{%- endif %}
{%- ifversion ghec or ghes or ghae %}
diff --git a/translations/es-ES/data/reusables/education/about-github-education-link.md b/translations/es-ES/data/reusables/education/about-github-education-link.md
index 0b7bef1699..73ead2eac9 100644
--- a/translations/es-ES/data/reusables/education/about-github-education-link.md
+++ b/translations/es-ES/data/reusables/education/about-github-education-link.md
@@ -1,3 +1,3 @@
-As a student or faculty member at an accredited educational institution, you can apply for GitHub Education benefits, which includes access to GitHub Global Campus. Global Campus is a portal that allows the GitHub Education Community to access their education benefits—all in one place! The Global Campus portal includes access to the GitHub Education Community, industry tools used by professional developers, events, [Campus TV](https://www.twitch.tv/githubeducation) content, GitHub Classroom, and other exclusive features to help students and teachers shape the next generation of software development.
+Si eres un alumno o miembro de una facultad en una institución educativa acreditada, puedes aplicar para obtener los beneficios de GitHub Education, lo que incluye el acceso al Campus global de GitHub. El Campus Global es un portal que permite que la comunidad de GitHub Education acceda a sus beneficios educativos; ¡todo en un solo lugar! El portal del Campus Global incluye el acceso a la Comunidad de GitHub Education, las herramientas de la industria que utilizan los desarrolladores profesionales, eventos, contenido de la [Campus TV](https://www.twitch.tv/githubeducation), GitHub Classroom y otras características exclusivas para ayudar a que los maestros y alumnos moldeen a la siguiente generación de desarrollo de software.
Antes de solicitar un descuento individual, comprueba si tu comunidad de aprendizaje ya está asociada con nosotros como escuela de {% data variables.product.prodname_campus_program %}. Para obtener más información, consulta la sección "[Acerca de la {% data variables.product.prodname_campus_program %}](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-campus-program)".
diff --git a/translations/es-ES/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md b/translations/es-ES/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md
index d220575548..f50a5571c8 100644
--- a/translations/es-ES/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md
+++ b/translations/es-ES/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md
@@ -1 +1 @@
-Si compras {% data variables.product.prodname_enterprise %} mediante un Acuerdo Empresarial de Microsoft, puedes conectar tu ID de Suscripción de Azure a tu cuenta empresarial para habilitar y pagar por el uso de {% data variables.product.prodname_actions %} y del {% data variables.product.prodname_registry %} más allá de las cantidades que se incluyen en tu cuenta.
+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 any {% data variables.product.prodname_codespaces %} usage, and for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage beyond the amounts included with your account.
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/add-key-to-web-flow-user.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/add-key-to-web-flow-user.md
new file mode 100644
index 0000000000..915aa29d22
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/add-key-to-web-flow-user.md
@@ -0,0 +1,14 @@
+1. Run the following command, replacing KEY-ID with your PGP key ID.
+
+ ```bash{:copy}
+ gpg --armor --export KEY-ID
+ ```
+1. Copy your PGP key, beginning with `-----BEGIN PGP PUBLIC KEY BLOCK-----` and ending with `-----END PGP PUBLIC KEY BLOCK-----`.
+1. Sign into {% data variables.product.prodname_ghe_server %} as the `web-flow` user.
+1. Add the public PGP key to the user's profile. For more information, see "[Adding a new GPG key to your {% data variables.product.prodname_dotcom %} account](/authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account)."
+
+ {% note %}
+
+ **Note:** Do not remove other public keys from the list of GPG keys. If a public key is deleted, any commits signed with the corresponding private key will no longer be marked as verified.
+
+ {% endnote %}
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/create-pgp-key-web-commit-signing.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/create-pgp-key-web-commit-signing.md
new file mode 100644
index 0000000000..9d86ff5622
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/create-pgp-key-web-commit-signing.md
@@ -0,0 +1,8 @@
+1. In the administrative shell, create a PGP key. Make note of the email address and key ID.
+
+ ```bash{:copy}
+ gpg --full-generate-key --pinentry-mode=loopback
+ ```
+
+ - Use the default key type and at least `4096` bits with no expiry.
+ - Use `web-flow` as the username.
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/email-settings.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/email-settings.md
new file mode 100644
index 0000000000..8b3a6fae5d
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/email-settings.md
@@ -0,0 +1,4 @@
+{% data reusables.enterprise_site_admin_settings.access-settings %}
+{% data reusables.enterprise_site_admin_settings.management-console %}
+2. En la parte superior de la página, haz clic en **Parámetros**. 
+3. En la barra lateral de la izquierda, haz clic en **Correo electrónico**. 
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-env-variable.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-env-variable.md
new file mode 100644
index 0000000000..435eea88fe
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-env-variable.md
@@ -0,0 +1,5 @@
+1. Define the key as a environment variable for {% data variables.product.product_name %}, replacing `` with the GPG key ID.
+
+ ```bash{:copy}
+ ghe-config "secrets.gpgverify.web-signing-key" "$(gpg --export-secret-keys -a | awk '{printf "%s\\n", $0}')"
+ ```
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-no-passphrase.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-no-passphrase.md
new file mode 100644
index 0000000000..d36ffce0fe
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/pgp-key-no-passphrase.md
@@ -0,0 +1 @@
+ - The PGP key **cannot** be protected by a passphrase.
diff --git a/translations/es-ES/data/reusables/enterprise_site_admin_settings/update-commit-signing-service.md b/translations/es-ES/data/reusables/enterprise_site_admin_settings/update-commit-signing-service.md
new file mode 100644
index 0000000000..74d0666247
--- /dev/null
+++ b/translations/es-ES/data/reusables/enterprise_site_admin_settings/update-commit-signing-service.md
@@ -0,0 +1,7 @@
+1. Update the settings for {% data variables.product.product_name %}'s commit signing service.
+
+ ```bash{:copy}
+ sudo consul-template -once -template /etc/consul-templates/etc/nomad-jobs/gpgverify/gpgverify.hcl.ctmpl:/etc/nomad-jobs/gpgverify/gpgverify.hcl
+
+ nomad job run /etc/nomad-jobs/gpgverify/gpgverify.hcl
+ ```
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/gated-features/packages.md b/translations/es-ES/data/reusables/gated-features/packages.md
index be454eea75..ee853904d2 100644
--- a/translations/es-ES/data/reusables/gated-features/packages.md
+++ b/translations/es-ES/data/reusables/gated-features/packages.md
@@ -1,5 +1,7 @@
+{% ifversion fpt or ghec or ghes < 3.5 %}
El {% data variables.product.prodname_registry %} se encuentra disponible con {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} para organizaciones, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %} 3.0 o superior y {% data variables.product.prodname_ghe_managed %}.{% ifversion ghes %} Para obtener más información sobre cómo mejorar tu instancia de {% data variables.product.prodname_ghe_server %}, consulta la sección "[Acerca de las mejoras a los lanzamientos nuevos](/admin/overview/about-upgrades-to-new-releases)" y refiérete al [{% data variables.enterprise.upgrade_assistant %}](https://support.github.com/enterprise/server-upgrade) para encontrar la ruta de mejora desde tu versión de lanzamiento actual.{% endif %}
{% ifversion fpt or ghec %}
{% data variables.product.prodname_registry %} no está disponible para repositorios privados que pertenezcan a cuentas que utilicen planes tradicionales por repositorio. Las cuentas que utilicen los planes tradicionales por repositorio tampoco podrán acceder al {% data variables.product.prodname_container_registry %} ya que estas cuentas se facturan por repositorio. {% data reusables.gated-features.more-info %}
{% endif %}
+{% endif %}
diff --git a/translations/es-ES/data/reusables/package_registry/authenticate-to-container-registry-steps.md b/translations/es-ES/data/reusables/package_registry/authenticate-to-container-registry-steps.md
index 10490aef74..7a4eea9666 100644
--- a/translations/es-ES/data/reusables/package_registry/authenticate-to-container-registry-steps.md
+++ b/translations/es-ES/data/reusables/package_registry/authenticate-to-container-registry-steps.md
@@ -1,7 +1,7 @@
1. Crea un token de acceso personal nuevo (PAT) con los alcances adecuados para las tareas que quieres realizar. Si tu organización requiere SSO, debes hablitarlo para tu token nuevo.
{% warning %}
- **Nota:** Predeterminadamente, cuando seleccionas el alcance `write:packages` para tu token de acceso personal (PAT) en la interface de usuario, también se seleccionará el alcance `repo`. El alcance `repo` ofrece un acceso amplio e innecesario, el cual te recomendamos no utilices para los flujos de trabajo de GitHub Actions en particualr. Para obtener más información, consulta la sección "[Fortalecimiento de la seguridad para las GitHub Actions](/actions/getting-started-with-github-actions/security-hardening-for-github-actions#considering-cross-repository-access)". Como medida alterna, puedes seleccionar solo el alcance de `write:packages` para tu PAT en la interface de usuario con esta url: `https://github.com/settings/tokens/new?scopes=write:packages`.
+ **Nota:** Predeterminadamente, cuando seleccionas el alcance `write:packages` para tu token de acceso personal (PAT) en la interface de usuario, también se seleccionará el alcance `repo`. El alcance `repo` ofrece un acceso amplio e innecesario, el cual te recomendamos no utilices para los flujos de trabajo de GitHub Actions en particualr. Para obtener más información, consulta la sección "[Fortalecimiento de la seguridad para las GitHub Actions](/actions/getting-started-with-github-actions/security-hardening-for-github-actions#considering-cross-repository-access)". As a workaround, you can select just the `write:packages` scope for your PAT in the user interface with this url: `https://{% ifversion fpt or ghec %}github.com{% else %}HOSTNAME{% endif %}/settings/tokens/new?scopes=write:packages`.
{% endwarning %}
@@ -16,10 +16,10 @@
$ export CR_PAT=YOUR_TOKEN
```
3. Utilizando el CLI para tu tipo de contenedor, ingresa en el
-servicio del {% data variables.product.prodname_container_registry %} en `ghcr.io`.
+{% data variables.product.prodname_container_registry %} service at `{% data reusables.package_registry.container-registry-hostname %}`.
{% raw %}
```shell
- $ echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
+ $ echo $CR_PAT | docker login {% endraw %}{% data reusables.package_registry.container-registry-hostname %}{% raw %} -u USERNAME --password-stdin
> Login Succeeded
```
{% endraw %}
diff --git a/translations/es-ES/data/reusables/package_registry/authenticate_with_pat_for_container_registry.md b/translations/es-ES/data/reusables/package_registry/authenticate_with_pat_for_container_registry.md
index 305bab644d..bce8a5e711 100644
--- a/translations/es-ES/data/reusables/package_registry/authenticate_with_pat_for_container_registry.md
+++ b/translations/es-ES/data/reusables/package_registry/authenticate_with_pat_for_container_registry.md
@@ -1,8 +1,8 @@
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec or ghes > 3.4 %}
-Para autenticarse en el {% data variables.product.prodname_container_registry %} dentro de un flujo de trabajo de {% data variables.product.prodname_actions %}, utiliza el `GITHUB_TOKEN` para tener la mejor experiencia en seguridad. Si tu flujo de trabajo está utilizando un token de acceso personal (PAT) para autenticarse en `ghcr.io`, entonces te recomendamos ampliamente que actualices tu flujo de trabajo para utilizar el `GITHUB_TOKEN`.
+Para autenticarse en el {% data variables.product.prodname_container_registry %} dentro de un flujo de trabajo de {% data variables.product.prodname_actions %}, utiliza el `GITHUB_TOKEN` para tener la mejor experiencia en seguridad. If your workflow is using a personal access token (PAT) to authenticate to `{% data reusables.package_registry.container-registry-hostname %}`, then we highly recommend you update your workflow to use the `GITHUB_TOKEN`.
-Para obtener orientación sobre cómo actualizar tus flujos de trabajo que se autentican en `ghcr.io` con un token de acceso personal, consulta la sección "[Mejorar un flujo de trabajo que acceda a `ghcr.io`](/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio)".
+{% ifversion fpt or ghec %}For guidance on updating your workflows that authenticate to `{% data reusables.package_registry.container-registry-hostname %}` with a personal access token, see "[Upgrading a workflow that accesses `ghcr.io`](/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio)."{% endif %}
Para obtener más información sobre el `GITHUB_TOKEN`, consulta la sección "[Autenticación en un flujo de trabajo](/actions/reference/authentication-in-a-workflow#using-the-github_token-in-a-workflow)".
diff --git a/translations/es-ES/data/reusables/package_registry/container-registry-example-hostname.md b/translations/es-ES/data/reusables/package_registry/container-registry-example-hostname.md
new file mode 100644
index 0000000000..b892c80e97
--- /dev/null
+++ b/translations/es-ES/data/reusables/package_registry/container-registry-example-hostname.md
@@ -0,0 +1 @@
+containers.github.companyname.com
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/package_registry/container-registry-ghes-beta.md b/translations/es-ES/data/reusables/package_registry/container-registry-ghes-beta.md
new file mode 100644
index 0000000000..4105fa740b
--- /dev/null
+++ b/translations/es-ES/data/reusables/package_registry/container-registry-ghes-beta.md
@@ -0,0 +1,11 @@
+{% ifversion ghes > 3.4 %}
+
+{% note %}
+
+**Note**: {% data variables.product.prodname_container_registry %} is currently in beta for {% data variables.product.product_name %} and subject to change.
+
+Both {% data variables.product.prodname_registry %} and subdomain isolation must be enabled to use {% data variables.product.prodname_container_registry %}. Para obtener más información, consulta la sección "[Trabajar con el registro de contenedores](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)."
+
+{% endnote %}
+
+{% endif %}
diff --git a/translations/es-ES/data/reusables/package_registry/container-registry-hostname.md b/translations/es-ES/data/reusables/package_registry/container-registry-hostname.md
new file mode 100644
index 0000000000..0d374afd0b
--- /dev/null
+++ b/translations/es-ES/data/reusables/package_registry/container-registry-hostname.md
@@ -0,0 +1 @@
+{% ifversion fpt or ghec %}ghcr.io{% elsif ghes > 3.4 %}containers.HOSTNAME{% else %}{% endif %}
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/package_registry/publish-docker-image.md b/translations/es-ES/data/reusables/package_registry/publish-docker-image.md
index 96fb2620a9..be03c6a689 100644
--- a/translations/es-ES/data/reusables/package_registry/publish-docker-image.md
+++ b/translations/es-ES/data/reusables/package_registry/publish-docker-image.md
@@ -8,12 +8,12 @@ on:
branches: ['release']
env:
- REGISTRY: ghcr.io
+ REGISTRY: {% data reusables.package_registry.container-registry-hostname %}
IMAGE_NAME: {% raw %}${{ github.repository }}{% endraw %}
jobs:
build-and-push-image:
- runs-on: ubuntu-latest
+ runs-on: {% ifversion ghes %}[self-hosted]{% else %}ubuntu-latest{% endif %}
permissions:
contents: read
packages: write
diff --git a/translations/es-ES/data/reusables/package_registry/visibility-and-access-permissions.md b/translations/es-ES/data/reusables/package_registry/visibility-and-access-permissions.md
index 320dbe1822..5291f8b786 100644
--- a/translations/es-ES/data/reusables/package_registry/visibility-and-access-permissions.md
+++ b/translations/es-ES/data/reusables/package_registry/visibility-and-access-permissions.md
@@ -1,4 +1,3 @@
-{% ifversion fpt or ghec %}
Si tienes permisos administrativos en una imagen de contenedor, peudes configurar los permisos de acceso para la imagen de contenedor en privados o públicos. Las imágenes públicas permiten el acceso anónimo y pueden extraerse sin autenticación o ingresar a ellas através del CLI.
Como administrador, también puedes otorgar permisos de acceso para una imagen de contenedor que esté separada de los permisos que configuraste a nivel de organización y de repositorio.
@@ -7,7 +6,6 @@ Para el caso de las imágenes que publique y le pertenezcan a una cuenta persona
| Permiso | Descripción del acceso |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| lectura | Puede descargar el paquete. Puede leer los metadatos del paquete. |
-| escritura | Puede cargar y descargar este paquete. Puede leer y escribir metadatos del paquete. |
-| admin | Puede cargar, descargar, borrar y administrar este paquete. Puede leer y escribir metadatos del paquete. Puede otorgar permisos del paquete. |
-{% endif %}
+| Read | Puede descargar el paquete. Puede leer los metadatos del paquete. |
+| Escritura | Puede cargar y descargar este paquete. Puede leer y escribir metadatos del paquete. |
+| Admin | Puede cargar, descargar, borrar y administrar este paquete. Puede leer y escribir metadatos del paquete. Puede otorgar permisos del paquete. |
diff --git a/translations/es-ES/data/reusables/pages/emu-org-only.md b/translations/es-ES/data/reusables/pages/emu-org-only.md
new file mode 100644
index 0000000000..a896584d4c
--- /dev/null
+++ b/translations/es-ES/data/reusables/pages/emu-org-only.md
@@ -0,0 +1,7 @@
+{% ifversion ghec %}
+{% note %}
+
+**Note:** If you're a {% data variables.product.prodname_managed_user %}, you can only publish {% data variables.product.prodname_pages %} sites from repositories owned by organizations. Para obtener más información, consulta la sección "[Acerca de {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#limitations-for-enterprise-managed-users)".
+
+{% endnote %}
+{% endif %}
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/pre-release-program/custom-roles-public-beta.md b/translations/es-ES/data/reusables/pre-release-program/custom-roles-public-beta.md
deleted file mode 100644
index 5401c7ba38..0000000000
--- a/translations/es-ES/data/reusables/pre-release-program/custom-roles-public-beta.md
+++ /dev/null
@@ -1,7 +0,0 @@
-{% ifversion ghec %}
-{% note %}
-
-**Nota:** Los roles de repositorio personalizados están disponibles como un lanzamiento beta público y podrían cambiar en cualquier momento durante este periodo.
-
-{% endnote %}
-{% endif %}
diff --git a/translations/es-ES/data/reusables/repositories/view-run.md b/translations/es-ES/data/reusables/repositories/view-run.md
index 982f1ebae1..b789b559bd 100644
--- a/translations/es-ES/data/reusables/repositories/view-run.md
+++ b/translations/es-ES/data/reusables/repositories/view-run.md
@@ -1,3 +1,3 @@
-1. From the list of workflow runs, click the name of the run to see the workflow run summary.
+1. Desde la lista de ejecuciones de flujo de trabajo, haz clic en el nombre del ejecutor para ver el resumen de ejecución del flujo de trabajo.

diff --git a/translations/es-ES/data/reusables/secret-scanning/partner-secret-list-private-repo.md b/translations/es-ES/data/reusables/secret-scanning/partner-secret-list-private-repo.md
index 494b648142..f49bf8a249 100644
--- a/translations/es-ES/data/reusables/secret-scanning/partner-secret-list-private-repo.md
+++ b/translations/es-ES/data/reusables/secret-scanning/partner-secret-list-private-repo.md
@@ -1,4 +1,4 @@
-| Proveedor | Secreto compatible | Slug de la API |
+| Proveedor | Secreto compatible | Secret type |
| ----------- | ----------------------- | ----------------- |
| Adafruit IO | Clave de IO de Adafruit | adafruit_io_key |
{%- ifversion fpt or ghec or ghes > 3.1 or ghae %}
diff --git a/translations/es-ES/data/reusables/secret-scanning/secret-list-private-push-protection.md b/translations/es-ES/data/reusables/secret-scanning/secret-list-private-push-protection.md
index c1cdcc433c..62fd51000f 100644
--- a/translations/es-ES/data/reusables/secret-scanning/secret-list-private-push-protection.md
+++ b/translations/es-ES/data/reusables/secret-scanning/secret-list-private-push-protection.md
@@ -1,4 +1,4 @@
-| Proveedor | Secreto compatible | Slug de la API |
+| Proveedor | Secreto compatible | Secret type |
| ------------------------- | -------------------------------------------------- | -------------------------------------------------------- |
| Adafruit IO | Clave de IO de Adafruit | adafruit_io_key |
| Alibaba Cloud | ID de Clave de Acceso a la Nube de Alibaba | alibaba_cloud_access_key_id |
diff --git a/translations/es-ES/data/reusables/server-statistics/csv-download.md b/translations/es-ES/data/reusables/server-statistics/csv-download.md
new file mode 100644
index 0000000000..ca13a3f86d
--- /dev/null
+++ b/translations/es-ES/data/reusables/server-statistics/csv-download.md
@@ -0,0 +1 @@
+4. To start your download, under "{% data variables.product.prodname_github_connect %}", click **Export**, then choose whether you want to download a JSON or CSV file. 
\ No newline at end of file
diff --git a/translations/es-ES/data/reusables/server-statistics/release-phase.md b/translations/es-ES/data/reusables/server-statistics/release-phase.md
new file mode 100644
index 0000000000..17f100fd26
--- /dev/null
+++ b/translations/es-ES/data/reusables/server-statistics/release-phase.md
@@ -0,0 +1,5 @@
+{% note %}
+
+**Note:** {% data variables.product.prodname_server_statistics %} is in public beta and subject to change.
+
+{% endnote %}
diff --git a/translations/es-ES/data/reusables/sponsors/country-of-residence.md b/translations/es-ES/data/reusables/sponsors/country-of-residence.md
deleted file mode 100644
index f7b71bb6f1..0000000000
--- a/translations/es-ES/data/reusables/sponsors/country-of-residence.md
+++ /dev/null
@@ -1,2 +0,0 @@
-1. Debajo de "País o región de residencia", utiliza el menú desplegable y selecciona tu ubicación de residencia. 
-2. Haz clic en **Save ** (guardar).
diff --git a/translations/es-ES/data/reusables/sponsors/tax-form-link.md b/translations/es-ES/data/reusables/sponsors/tax-form-link.md
index a575b6cfed..6ccf0a9173 100644
--- a/translations/es-ES/data/reusables/sponsors/tax-form-link.md
+++ b/translations/es-ES/data/reusables/sponsors/tax-form-link.md
@@ -1,2 +1,2 @@
-1. Da clic en **Formulario de impuestos**. 
+1. Click **tax forms**. 
2. Completa, firma y emite el formato de impuestos.
diff --git a/translations/es-ES/data/reusables/support/premium-support-features.md b/translations/es-ES/data/reusables/support/premium-support-features.md
index 25552a2c81..2011a45a06 100644
--- a/translations/es-ES/data/reusables/support/premium-support-features.md
+++ b/translations/es-ES/data/reusables/support/premium-support-features.md
@@ -4,4 +4,4 @@ Adicionalmente a todos los beneficios de {% data variables.contact.enterprise_su
- Un Acuerdo de nivel de servicio (SLA) con tiempos de respuesta iniciales garantizados.
- Acceso a contenido prémium.
- Verificaciones de salud programadas
- - Horas de asistencia administrativa
+ - Administration assistance hours ({% data variables.product.premium_plus_support_plan %} only)
diff --git a/translations/es-ES/data/variables/product.yml b/translations/es-ES/data/variables/product.yml
index 11a05c807d..22d26a6f0f 100644
--- a/translations/es-ES/data/variables/product.yml
+++ b/translations/es-ES/data/variables/product.yml
@@ -158,6 +158,8 @@ prodname_copilot: 'Copiloto de GitHub'
prodname_copilot_short: 'Copilot'
#Command Palette
prodname_command_palette: 'Paleta de Comandos de GitHub'
+#Server Statistics
+prodname_server_statistics: 'Server Statistics'
#Links
product_url: >-
{% ifversion fpt or ghec %}github.com{% else %}[hostname]{% endif %}
diff --git a/translations/es-ES/data/variables/release_candidate.yml b/translations/es-ES/data/variables/release_candidate.yml
index ec65ef6f94..f4379af822 100644
--- a/translations/es-ES/data/variables/release_candidate.yml
+++ b/translations/es-ES/data/variables/release_candidate.yml
@@ -1,2 +1,2 @@
---
-version: ''
+version: enterprise-server@3.5
diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv
index a5ebdbd4e2..757146fd9e 100644
--- a/translations/log/cn-resets.csv
+++ b/translations/log/cn-resets.csv
@@ -73,16 +73,22 @@ translations/zh-CN/content/admin/github-actions/managing-access-to-actions-from-
translations/zh-CN/content/admin/github-actions/managing-access-to-actions-from-githubcom/using-the-latest-version-of-the-official-bundled-actions.md,broken liquid tags
translations/zh-CN/content/admin/github-actions/using-github-actions-in-github-ae/index.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/index.md,rendering error
+translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/configuring-scim-provisioning-for-enterprise-managed-users-with-okta.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/configuring-scim-provisioning-for-enterprise-managed-users.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/managing-team-memberships-with-identity-provider-groups.md,broken liquid tags
+translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md,broken liquid tags
+translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-for-your-enterprise.md,broken liquid tags
+translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/index.md,broken liquid tags
translations/zh-CN/content/admin/index.md,broken liquid tags
translations/zh-CN/content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md,broken liquid tags
translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/overview/about-enterprise-accounts.md,Listed in localization-support#489
translations/zh-CN/content/admin/overview/about-enterprise-accounts.md,rendering error
+translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md,broken liquid tags
+translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md,broken liquid tags
translations/zh-CN/content/admin/packages/enabling-github-packages-with-aws.md,broken liquid tags
translations/zh-CN/content/admin/packages/enabling-github-packages-with-azure-blob-storage.md,broken liquid tags
translations/zh-CN/content/admin/packages/enabling-github-packages-with-minio.md,broken liquid tags
@@ -195,6 +201,7 @@ translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learni
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-at-your-educational-institution/index.md,broken liquid tags
translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/why-wasnt-my-application-for-a-student-developer-pack-approved.md,broken liquid tags
translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/about-using-makecode-arcade-with-github-classroom.md,broken liquid tags
+translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md,broken liquid tags
translations/zh-CN/content/education/manage-coursework-with-github-classroom/learn-with-github-classroom/view-autograding-results.md,broken liquid tags
translations/zh-CN/content/get-started/customizing-your-github-workflow/exploring-integrations/about-github-marketplace.md,broken liquid tags
translations/zh-CN/content/get-started/customizing-your-github-workflow/index.md,broken liquid tags
@@ -206,7 +213,7 @@ translations/zh-CN/content/get-started/learning-about-github/about-versions-of-g
translations/zh-CN/content/get-started/learning-about-github/githubs-products.md,rendering error
translations/zh-CN/content/get-started/learning-about-github/types-of-github-accounts.md,broken liquid tags
translations/zh-CN/content/get-started/onboarding/getting-started-with-github-ae.md,broken liquid tags
-translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md,broken liquid tags
+translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md,rendering error
translations/zh-CN/content/get-started/onboarding/getting-started-with-github-enterprise-server.md,broken liquid tags
translations/zh-CN/content/get-started/onboarding/getting-started-with-github-team.md,broken liquid tags
translations/zh-CN/content/get-started/onboarding/getting-started-with-your-github-account.md,broken liquid tags
@@ -225,7 +232,7 @@ translations/zh-CN/content/get-started/writing-on-github/editing-and-sharing-con
translations/zh-CN/content/issues/using-labels-and-milestones-to-track-work/managing-labels.md,broken liquid tags
translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md,broken liquid tags
translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md,broken liquid tags
-translations/zh-CN/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md,broken liquid tags
+translations/zh-CN/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md,rendering error
translations/zh-CN/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md,broken liquid tags
translations/zh-CN/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md,broken liquid tags
translations/zh-CN/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md,broken liquid tags
@@ -239,6 +246,7 @@ translations/zh-CN/content/packages/learn-github-packages/publishing-a-package.m
translations/zh-CN/content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md,broken liquid tags
translations/zh-CN/content/packages/quickstart.md,broken liquid tags
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry.md,broken liquid tags
+translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md,broken liquid tags
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md,broken liquid tags
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry.md,broken liquid tags
translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-npm-registry.md,broken liquid tags
@@ -278,9 +286,34 @@ translations/zh-CN/content/support/learning-about-github-support/about-ticket-pr
translations/zh-CN/data/learning-tracks/admin.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/2-20/15.yml,Listed in localization-support#489
translations/zh-CN/data/release-notes/enterprise-server/2-21/6.yml,Listed in localization-support#489
+translations/zh-CN/data/release-notes/enterprise-server/2-22/22.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-0/0.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-0/16.yml,broken liquid tags
translations/zh-CN/data/release-notes/enterprise-server/3-1/0.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/1.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/10.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/11.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/12.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/14.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/15.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/16.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/18.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/19.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/2.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/20.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/3.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/4.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/5.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/6.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/7.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/8.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml,broken liquid tags
+translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml,broken liquid tags
translations/zh-CN/data/release-notes/github-ae/2021-03/2021-03-03.yml,broken liquid tags
+translations/zh-CN/data/reusables/actions/actions-use-policy-settings.md,broken liquid tags
translations/zh-CN/data/reusables/actions/enterprise-common-prereqs.md,broken liquid tags
translations/zh-CN/data/reusables/actions/enterprise-marketplace-actions.md,broken liquid tags
translations/zh-CN/data/reusables/actions/enterprise-no-internet-actions.md,broken liquid tags
@@ -290,27 +323,48 @@ translations/zh-CN/data/reusables/actions/self-hosted-runner-auto-removal.md,bro
translations/zh-CN/data/reusables/actions/self-hosted-runners-prerequisites.md,broken liquid tags
translations/zh-CN/data/reusables/advanced-security/about-committer-numbers-ghec-ghes.md,broken liquid tags
translations/zh-CN/data/reusables/apps/deprecating_auth_with_query_parameters.md,Listed in localization-support#489
+translations/zh-CN/data/reusables/billing/ghes-with-no-enterprise-account.md,broken liquid tags
translations/zh-CN/data/reusables/code-scanning/codeql-context-for-actions-and-third-party-tools.md,broken liquid tags
translations/zh-CN/data/reusables/code-scanning/enterprise-enable-code-scanning-actions.md,broken liquid tags
translations/zh-CN/data/reusables/code-scanning/enterprise-enable-code-scanning.md,broken liquid tags
+translations/zh-CN/data/reusables/code-scanning/run-additional-queries.md,broken liquid tags
translations/zh-CN/data/reusables/code-scanning/upload-sarif-ghas.md,broken liquid tags
+translations/zh-CN/data/reusables/dependabot/dependabot-alerts-dependency-graph-enterprise.md,broken liquid tags
translations/zh-CN/data/reusables/dotcom_billing/downgrade-org-to-free.md,broken liquid tags
+translations/zh-CN/data/reusables/enterprise-accounts/emu-password-reset-session.md,broken liquid tags
+translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,rendering error
+translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md,broken liquid tags
+translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags
+translations/zh-CN/data/reusables/enterprise_installation/hardware-rec-table.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise_installation/upgrade-hardware-requirements.md,broken liquid tags
translations/zh-CN/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags
+translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,rendering error
+translations/zh-CN/data/reusables/gated-features/packages.md,broken liquid tags
+translations/zh-CN/data/reusables/gated-features/secret-scanning.md,broken liquid tags
+translations/zh-CN/data/reusables/getting-started/actions.md,broken liquid tags
+translations/zh-CN/data/reusables/getting-started/api.md,broken liquid tags
translations/zh-CN/data/reusables/getting-started/marketplace.md,broken liquid tags
+translations/zh-CN/data/reusables/github-connect/beta.md,broken liquid tags
translations/zh-CN/data/reusables/github-connect/send-contribution-counts-to-githubcom.md,broken liquid tags
translations/zh-CN/data/reusables/large_files/rejected_pushes.md,broken liquid tags
translations/zh-CN/data/reusables/notifications/vulnerable-dependency-notification-options.md,Listed in localization-support#489
+translations/zh-CN/data/reusables/organizations/team-synchronization.md,broken liquid tags
translations/zh-CN/data/reusables/package_registry/authenticate-packages.md,broken liquid tags
+translations/zh-CN/data/reusables/package_registry/authenticate-to-container-registry-steps.md,broken liquid tags
translations/zh-CN/data/reusables/package_registry/authenticate_with_pat_for_container_registry.md,broken liquid tags
translations/zh-CN/data/reusables/package_registry/docker_registry_deprecation_status.md,Listed in localization-support#489
translations/zh-CN/data/reusables/package_registry/next-steps-for-packages-enterprise-setup.md,broken liquid tags
translations/zh-CN/data/reusables/package_registry/packages-cluster-support.md,broken liquid tags
translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md,broken liquid tags
+translations/zh-CN/data/reusables/repositories/enable-security-alerts.md,broken liquid tags
translations/zh-CN/data/reusables/repositories/github-reviews-security-advisories.md,broken liquid tags
+translations/zh-CN/data/reusables/repositories/select-marketplace-apps.md,broken liquid tags
+translations/zh-CN/data/reusables/saml/saml-session-oauth.md,broken liquid tags
translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489
-translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error
+translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags
translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags
translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags
+translations/zh-CN/data/reusables/security-advisory/link-browsing-advisory-db.md,broken liquid tags
translations/zh-CN/data/reusables/sponsors/feedback.md,broken liquid tags
+translations/zh-CN/data/reusables/support/enterprise-resolving-and-closing-tickets.md,broken liquid tags
diff --git a/translations/log/es-resets.csv b/translations/log/es-resets.csv
index 62e837ee83..d3610cf372 100644
--- a/translations/log/es-resets.csv
+++ b/translations/log/es-resets.csv
@@ -106,6 +106,7 @@ translations/es-ES/content/code-security/code-scanning/integrating-with-code-sca
translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/sarif-support-for-code-scanning.md,broken liquid tags
translations/es-ES/content/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github.md,broken liquid tags
translations/es-ES/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system.md,broken liquid tags
+translations/es-ES/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md,broken liquid tags
translations/es-ES/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-runner-in-your-ci-system.md,broken liquid tags
translations/es-ES/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system.md,broken liquid tags
translations/es-ES/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-runner-in-your-ci-system.md,broken liquid tags
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 110fd7f44a..33e9bb501b 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
@@ -49,7 +49,7 @@ shortTitle: 查看组织中的人员
| 企业所有者 | 组织所有者 | 能够配置组织设置并通过团队等管理对组织资源的访问。 |
| 企业所有者 | 组织成员 | 能够访问组织资源和内容(如存储库),而无需访问组织的设置。 |
-要查看组织中的所有角色,请参阅“[组织中的角色](/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 %}
+要查看组织中的所有角色,请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)”。 {% if custom-repository-roles %} 组织成员还可以具有特定存储库的自定义角色。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。{% endif %}
有关企业所有者角色的更多信息,请参阅“[企业中的角色](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner)”。
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md
index 6f7ee6a306..647917344f 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-gradle.md
@@ -22,7 +22,7 @@ shortTitle: 构建和测试 Java & Gradle
## 简介
-本指南介绍如何使用 Gradle 构建系统为 Java 项目创建执行持续集成 (CI) 的工作流程。 您创建的工作流程将允许您查看拉取请求提交何时会在默认分支上导致构建或测试失败; 这个方法可帮助确保您的代码始终是健康的。 您可以扩展 CI 工作流程以缓存文件并且从工作流程运行上传构件。
+本指南介绍如何使用 Gradle 构建系统为 Java 项目创建执行持续集成 (CI) 的工作流程。 您创建的工作流程将允许您查看拉取请求提交何时会在默认分支上导致构建或测试失败; 这个方法可帮助确保您的代码始终是健康的。 您可以扩展 CI 工作流程以{% if actions-caching %}缓存文件并且{% endif %}从工作流程运行上传构件。
{% ifversion ghae %}
{% data reusables.actions.self-hosted-runners-software %}
@@ -110,12 +110,16 @@ steps:
arguments: -b ci.gradle package
```
+{% if actions-caching %}
+
## 缓存依赖项
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,可以缓存构建依赖项以加快工作流程运行速度。 成功运行后, `gradle/gradle-build-action` 会缓存 Gradle 用户主目录的重要部分。 在将来的作业中,将还原缓存,这样就不需要重新编译构建脚本,也不需要从远程包存储库下载依赖项。
+可以缓存构建依赖项以加快工作流程运行速度。 成功运行后, `gradle/gradle-build-action` 会缓存 Gradle 用户主目录的重要部分。 在将来的作业中,将还原缓存,这样就不需要重新编译构建脚本,也不需要从远程包存储库下载依赖项。
使用 `gradle/gradle-build-action` 操作时,缓存默认启用。 更多信息请参阅 [`gradle/gradle-build-action`](https://github.com/gradle/gradle-build-action#caching)。
+{% endif %}
+
## 将工作流数据打包为构件
构建成功且测试通过后,您可能想要上传生成的 Java 包作为构件。 这会将构建的包存储为工作流程运行的一部分,并允许您下载它们。 构件可帮助您在拉取请求合并之前在本地环境中测试并调试它们。 更多信息请参阅“[使用构件持久化工作流程](/actions/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md
index c5ac588c18..c019c4bbd4 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-java-with-maven.md
@@ -22,7 +22,7 @@ shortTitle: 使用 Maven 构建和测试 Java
## 简介
-本指南介绍如何使用 Maven 软件项目管理工具为 Java 项目创建执行持续集成 (CI) 的工作流程。 您创建的工作流程将允许您查看拉取请求提交何时会在默认分支上导致构建或测试失败; 这个方法可帮助确保您的代码始终是健康的。 您可以扩展 CI 工作流程以缓存文件并且从工作流程运行上传构件。
+本指南介绍如何使用 Maven 软件项目管理工具为 Java 项目创建执行持续集成 (CI) 的工作流程。 您创建的工作流程将允许您查看拉取请求提交何时会在默认分支上导致构建或测试失败; 这个方法可帮助确保您的代码始终是健康的。 您可以扩展 CI 工作流程以{% if actions-caching %}缓存文件并且{% endif %}从工作流程运行上传构件。
{% ifversion ghae %}
{% data reusables.actions.self-hosted-runners-software %}
@@ -99,9 +99,11 @@ steps:
run: mvn --batch-mode --update-snapshots verify
```
+{% if actions-caching %}
+
## 缓存依赖项
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您可以缓存依赖项以加速工作流程运行。 运行成功后,您的本地 Maven 仓库将存储在 GitHub 操作基础架构中。 在未来的工作流程运行中,缓存将会恢复,因此不需要从远程 Maven 仓库下载依赖项。 您可以简单地使用 [`setup-java` 操作](https://github.com/marketplace/actions/setup-java-jdk)缓存依赖项,也可使用 [`cache` 操作](https://github.com/actions/cache)进行自定义和更高级的配置。
+您可以缓存依赖项来加快工作流程运行。 成功运行后,本地 Maven 存储库将存储在缓存中。 在未来的工作流程运行中,缓存将会恢复,因此不需要从远程 Maven 仓库下载依赖项。 您可以简单地使用 [`setup-java` 操作](https://github.com/marketplace/actions/setup-java-jdk)缓存依赖项,也可使用 [`cache` 操作](https://github.com/actions/cache)进行自定义和更高级的配置。
```yaml{:copy}
steps:
@@ -118,6 +120,8 @@ steps:
此工作流程将保存本地 Maven 存储库的内容,位于运行器主目录的 `.m2` 目录。 缓存密钥是 _pom.xml_ 的哈希内容,因此更改 _pom.xml_ 将使缓存失效。
+{% endif %}
+
## 将工作流数据打包为构件
构建成功且测试通过后,您可能想要上传生成的 Java 包作为构件。 这会将构建的包存储为工作流程运行的一部分,并允许您下载它们。 构件可帮助您在拉取请求合并之前在本地环境中测试并调试它们。 更多信息请参阅“[使用构件持久化工作流程](/actions/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md
index 798aef968a..268fa4d715 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-net.md
@@ -120,7 +120,7 @@ steps:
run: dotnet add package Newtonsoft.Json --version 12.0.1
```
-{% ifversion fpt or ghec %}
+{% if actions-caching %}
### 缓存依赖项
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md
index f615250004..63a2c560a0 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-nodejs.md
@@ -136,7 +136,7 @@ jobs:
{% data variables.product.prodname_dotcom %} 托管的运行器安装了 npm 和 Yarn 依赖项管理器。 在构建和测试代码之前,可以使用 npm 和 Yarn 在工作流程中安装依赖项。 Windows 和 Linux {% data variables.product.prodname_dotcom %} 托管的运行器也安装了 Grunt、Gulp 和 Bower。
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您还可以缓存依赖项以加速工作流程。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% if actions-caching %}您也可以缓存依赖项来加快工作流程。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。{% endif %}
### 使用 npm 的示例
@@ -228,9 +228,11 @@ steps:
always-auth=true
```
+{% if actions-caching %}
+
### 缓存依赖项示例
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您可以使用 [`setup-node` 操作](https://github.com/actions/setup-node)缓存和恢复依赖项。
+您可以使用 [`setup-node` 操作](https://github.com/actions/setup-node)来缓存和还原依赖项。
以下示例缓存 npm 的依赖项。
@@ -278,7 +280,9 @@ steps:
- run: pnpm test
```
-如果您有自定义要求或需要更精确的缓存控制,则可以使用 [`cache` 操作](https://github.com/marketplace/actions/cache)。 更多信息请参阅“缓存依赖项以加快工作流程”。
+如果您有自定义要求或需要更精确的缓存控制,则可以使用 [`cache` 操作](https://github.com/marketplace/actions/cache)。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。
+
+{% endif %}
## 构建和测试代码
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-powershell.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-powershell.md
index 418daf8568..213055f218 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-powershell.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-powershell.md
@@ -104,7 +104,7 @@ jobs:
{% endnote %}
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您还可以缓存依赖项以加速工作流程。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% if actions-caching %}您也可以缓存依赖项来加快工作流程。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。{% endif %}
例如,以下作业将安装 `SqlServer` 和 `PSScriptAnalyzer` 模块:
@@ -128,9 +128,11 @@ jobs:
{% endnote %}
+{% if actions-caching %}
+
### 缓存依赖项
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您可以使用唯一密钥缓存 PowerShell 依赖项, 这样在使用 [`cache`](https://github.com/marketplace/actions/cache) 操作运行未来的工作流程时可以恢复依赖项。 更多信息请参阅“缓存依赖项以加快工作流程”。
+您可以使用唯一密钥缓存 PowerShell 依赖项,以在使用 [`cache`](https://github.com/marketplace/actions/cache) 操作运行未来的工作流程时恢复依赖项。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。
PowerShell 根据运行器的操作系统将其依赖项缓存在不同的位置。 例如,以下 Ubuntu 示例中使用的 `path` 位置在 Windows 操作系统中是不同的。
@@ -151,6 +153,8 @@ steps:
Install-Module SqlServer, PSScriptAnalyzer -ErrorAction Stop
```
+{% endif %}
+
## 测试代码
您可以使用与本地相同的命令来构建和测试代码。
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md
index d2dcbab7c2..bb2a754a7b 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-python.md
@@ -197,7 +197,7 @@ jobs:
{% data variables.product.prodname_dotcom %} 托管的运行器安装了 pip 软件包管理器。 在构建和测试代码之前,您可以使用 pip 从 PyPI 软件包注册表安装依赖项。 例如,下面的 YAML 安装或升级 `pip` 软件包安装程序以及 `setuptools` 和 `wheel` 软件包。
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您还可以缓存依赖项以加速工作流程。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% if actions-caching %}您也可以缓存依赖项来加快工作流程。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。{% endif %}
```yaml{:copy}
steps:
@@ -227,9 +227,11 @@ steps:
pip install -r requirements.txt
```
+{% if actions-caching %}
+
### 缓存依赖项
-使用 {% data variables.product.prodname_dotcom %} 托管的运行器时,您可以使用 [`setup-python` 操作](https://github.com/actions/setup-python)缓存和恢复依赖项。
+您可以使用 [`setup-python` 操作](https://github.com/actions/setup-python)来缓存和还原依赖项。
以下示例缓存 pip 的依赖项。
@@ -244,10 +246,12 @@ steps:
- run: pip test
```
-默认情况下, `setup-python` 操作会在整个存储库中搜索依赖项文件(对于 pip 为`requirements.txt`,对于 pipenv 为 `Pipfile.lock`)。 更多信息请参阅 `setup-python` 操作自述文件中的“缓存包依赖项”。
+默认情况下, `setup-python` 操作会在整个存储库中搜索依赖项文件(对于 pip 为`requirements.txt`,对于 pipenv 为 `Pipfile.lock`)。 更多信息请参阅 `setup-python` 自述文件中的“[缓存包依赖项](https://github.com/actions/setup-python#caching-packages-dependencies)”。
如果您有自定义要求或需要更精确的缓存控制,则可以使用 [`cache` 操作](https://github.com/marketplace/actions/cache)。 Pip 根据运行器的操作系统将依赖项缓存在不同的位置。 您需要缓存的路径可能不同于上面的 Ubuntu 示例,具体取决于您使用的操作系统。 更多信息请参阅 `cache` 操作存储库中的 [Python 缓存示例](https://github.com/actions/cache/blob/main/examples.md#python---pip)。
+{% endif %}
+
## 测试代码
您可以使用与本地相同的命令来构建和测试代码。
diff --git a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md
index b72b2650d1..37e8b8914c 100644
--- a/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md
+++ b/translations/zh-CN/content/actions/automating-builds-and-tests/building-and-testing-ruby.md
@@ -144,9 +144,11 @@ steps:
- run: bundle install
```
+{% if actions-caching %}
+
### 缓存依赖项
-如果您使用的是 {% data variables.product.prodname_dotcom %} 托管的运行器, `setup-ruby` 操作提供了在运行之间自动处理 gem 缓存的方法。
+`setup-ruby` 操作提供在运行之间自动处理 Gem 缓存的方法。
要启用缓存,请设置以下内容。
@@ -159,11 +161,11 @@ steps:
```
{% endraw %}
-这将配置 Bundler 以安装 gem 到 `vendor/cache`。 对于工作流程的每次成功运行,此文件夹将由 Actions 缓存,并重新下载用于后续的工作流程运行。 gemfile.lock 和 Ruby 版本的哈希值用作缓存密钥。 如果安装任何新 Gem 或更改版本,缓存将失效,Bundler 将进行全新安装。
+这将配置 Bundler 以安装 gem 到 `vendor/cache`。 对于工作流程的每次成功运行,此文件夹将由 {% data variables.product.prodname_actions %} 缓存,并重新下载用于后续的工作流程运行。 gemfile.lock 和 Ruby 版本的哈希值用作缓存密钥。 如果安装任何新 Gem 或更改版本,缓存将失效,Bundler 将进行全新安装。
**无 setup-ruby 的缓存**
-为了加强缓存控制,如果您使用的是 {% data variables.product.prodname_dotcom %} 托管的运行器,可以直接使用 `actions/cache` 操作。 更多信息请参阅“缓存依赖项以加快工作流程”。
+为了加强对缓存的控制,您可以直接使用 `actions/cache` 操作。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)”。
```yaml
steps:
@@ -195,6 +197,8 @@ steps:
bundle install --jobs 4 --retry 3
```
+{% endif %}
+
## 测试代码的矩阵
下面的示例矩阵在 Ubuntu 和 macOS 上测试 MRI、JRuby 和 TruffleRuby 的所有稳定版本和头部版本。
diff --git a/translations/zh-CN/content/actions/creating-actions/creating-a-composite-action.md b/translations/zh-CN/content/actions/creating-actions/creating-a-composite-action.md
index 0d730d7ff9..a04ed92992 100644
--- a/translations/zh-CN/content/actions/creating-actions/creating-a-composite-action.md
+++ b/translations/zh-CN/content/actions/creating-actions/creating-a-composite-action.md
@@ -75,7 +75,7 @@ shortTitle: 组合操作
outputs:
random-number:
description: "Random number"
- value: ${{ steps.random-number-generator.outputs.random-id }}
+ value: ${{ steps.random-number-generator.outputs.random-number }}
runs:
using: "composite"
steps:
diff --git a/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md b/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
index c820258204..7f1f1f5b95 100644
--- a/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
+++ b/translations/zh-CN/content/actions/creating-actions/metadata-syntax-for-github-actions.md
@@ -367,7 +367,7 @@ steps:
**示例:使用状态检查功能**
-`my backup step` 仅在组合操作的上一步失败时运行。 For more information, see "[Expressions](/actions/learn-github-actions/expressions#job-status-check-functions)."
+`my backup step` 仅在组合操作的上一步失败时运行。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions#status-check-functions)”。
diff --git a/translations/zh-CN/content/actions/deployment/about-deployments/about-continuous-deployment.md b/translations/zh-CN/content/actions/deployment/about-deployments/about-continuous-deployment.md
index 715aeb3218..3563fab070 100644
--- a/translations/zh-CN/content/actions/deployment/about-deployments/about-continuous-deployment.md
+++ b/translations/zh-CN/content/actions/deployment/about-deployments/about-continuous-deployment.md
@@ -31,7 +31,7 @@ _持续部署_ (CD) 是使用自动化发布和部署软件更新的做法。
{% data variables.product.prodname_actions %} 提供的功能使您可以更好地控制部署。 例如,您可以使用环境来要求批准才能继续作业,限制哪些分支可以触发工作流程,或限制对机密的访问。 {% ifversion fpt or ghae or ghes > 3.1 or ghec %} 可以使用并发性将 CD 管道限制为最多一个正在进行的部署和一个挂起的部署。 {% endif %}有关这些功能的详细信息,请参阅“[使用 GitHub Actions 进行部署](/actions/deployment/deploying-with-github-actions)”和“[使用环境进行部署](/actions/deployment/using-environments-for-deployment)”。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
## 使用 OpenID Connect 访问云资源
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md
index 11dc0f0870..c528ad1be3 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service.md
@@ -26,7 +26,7 @@ shortTitle: 部署到 Amazon ECS
在每次推送到 {% data variables.product.company_short %} 仓库中的 `main` 时,{% data variables.product.prodname_actions %} 工作流程将构建新的容器映像并将其推送到 Amazon ECR,然后将新的任务定义部署到 Amazon ECS。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-docker-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-docker-to-azure-app-service.md
index 6e43b571d2..5449c1c7d4 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-docker-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-docker-to-azure-app-service.md
@@ -21,7 +21,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 Docker 容器到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-java-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-java-to-azure-app-service.md
index 16b1d93472..805f797abe 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-java-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-java-to-azure-app-service.md
@@ -20,7 +20,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 Java 项目到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-net-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-net-to-azure-app-service.md
index 7f0bfd6b52..1b34e57d6e 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-net-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-net-to-azure-app-service.md
@@ -19,7 +19,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 .NET 项目到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-nodejs-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-nodejs-to-azure-app-service.md
index 0b033e619d..8b0034d35a 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-nodejs-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-nodejs-to-azure-app-service.md
@@ -25,7 +25,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建、测试并部署 Node.js 项目到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-php-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-php-to-azure-app-service.md
index e77632378b..4dcf405725 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-php-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-php-to-azure-app-service.md
@@ -19,7 +19,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 PHP 项目到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-python-to-azure-app-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-python-to-azure-app-service.md
index 564a02c398..332d630d7a 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-python-to-azure-app-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-python-to-azure-app-service.md
@@ -20,7 +20,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 Python 项目到 [Azure App Service](https://azure.microsoft.com/services/app-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-kubernetes-service.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-kubernetes-service.md
index 2e8b5948f3..a2ba5c7ed3 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-kubernetes-service.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-kubernetes-service.md
@@ -20,7 +20,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建并部署 Php 项目到 [Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-static-web-app.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-static-web-app.md
index 6b44e313a3..f09f79c51d 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-static-web-app.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-to-azure-static-web-app.md
@@ -20,7 +20,7 @@ topics:
本指南说明如何使用 {% data variables.product.prodname_actions %} 构建 Web 应用并将其部署到 [Azure Static Web App](https://azure.microsoft.com/services/app-service/static/)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-google-kubernetes-engine.md b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-google-kubernetes-engine.md
index 3ea2b16fb5..50fed7a377 100644
--- a/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-google-kubernetes-engine.md
+++ b/translations/zh-CN/content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-google-kubernetes-engine.md
@@ -26,7 +26,7 @@ shortTitle: 部署到 Google Kubernetes Engine
GKE 是 Google Cloud 的托管 Kubernetes 群集服务,可以在云中或您自己的数据中心中托管您的容器化工作负载。 更多信息请参阅 [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine)。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md
index 7d8e42f0cf..bf592c0b96 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
@@ -66,11 +67,14 @@ topics:
"jti": "example-id",
"sub": "repo:octo-org/octo-repo:environment:prod",
"environment": "prod",
- "aud": "https://github.com/octo-org",
+ "aud": "{% ifversion ghes %}https://HOSTNAME{% else %}https://github.com{% endif %}/octo-org",
"ref": "refs/heads/main",
"sha": "example-sha",
"repository": "octo-org/octo-repo",
"repository_owner": "octo-org",
+ "actor_id": "12",
+ "repository_id": "74",
+ "repository_owner_id": "65",
"run_id": "example-run-id",
"run_number": "10",
"run_attempt": "2",
@@ -81,22 +85,25 @@ topics:
"event_name": "workflow_dispatch",
"ref_type": "branch",
"job_workflow_ref": "octo-org/octo-automation/.github/workflows/oidc.yml@refs/heads/main",
- "iss": "https://token.actions.githubusercontent.com",
+ "iss": "{% ifversion ghes %}https://HOSTNAME/_services/token{% else %}https://token.actions.githubusercontent.com{% endif %}",
"nbf": 1632492967,
"exp": 1632493867,
"iat": 1632493567
}
```
-要查看 {% data variables.product.prodname_dotcom %} 的 OIDC 提供商支持的所有声明,请查看 https://token.actions.githubusercontent.com/.well-known/openid-configuration 中的 `claims_supported` 条目。
+要查看 {% data variables.product.prodname_dotcom %} 的 OIDC 提供商支持的所有声明,请查看以下位置的 `claims_supported` 条目:
+{% ifversion ghes %}`https://HOSTNAME/_services/token/.well-known/openid-configuration`{% else %}https://token.actions.githubusercontent.com/.well-known/openid-configuration{% endif %}。
令牌包括标准受众、颁发者和主题声明:
-| 声明 | 描述 |
-| ----- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `aud` | _(受众)_ 默认情况下,这是存储库所有者(如拥有存储库的组织)的 URL。 这是唯一可以自定义的声明。 您可以使用工具包命令设置自定义受众:[`core.getIDToken(audience)`](https://www.npmjs.com/package/@actions/core/v/1.6.0) |
-| `iss` | _(发行人)_ OIDC 令牌的发行人:`https://token.actions.githubusercontent.com` |
-| `sub` | _(主题)_ 定义要由云提供商验证的主题声明。 此设置对于确保仅以可预测的方式分配访问令牌至关重要。 |
+| 声明 | 描述 |
+| ------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `aud` | _(受众)_ 默认情况下,这是存储库所有者(如拥有存储库的组织)的 URL。 这是唯一可以自定义的声明。 您可以使用工具包命令设置自定义受众:[`core.getIDToken(audience)`](https://www.npmjs.com/package/@actions/core/v/1.6.0) |
+| `iss` | _(Issuer)_ OIDC 令牌的发行人: |
+| {% ifversion ghes %}`https://HOSTNAME/_services/token`{% else %}`https://token.actions.githubusercontent.com`{% endif %} | |
+| | |
+| `sub` | _(主题)_ 定义要由云提供商验证的主题声明。 此设置对于确保仅以可预测的方式分配访问令牌至关重要。 |
OIDC 令牌还包括其他标准声明:
@@ -112,22 +119,25 @@ OIDC 令牌还包括其他标准声明:
令牌还包括 {% data variables.product.prodname_dotcom %} 提供的自定义声明:
-| 声明 | 描述 |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `actor` | 发起工作流程运行的个人帐户。 |
-| `base_ref` | 工作流程运行中拉取请求的目标分支。 |
-| `environment` | 作业使用的环境的名称。 |
-| `event_name` | 触发工作流程运行的事件的名称。 |
-| `head_ref` | 工作流程运行中拉取请求的来源分支。 |
-| `job_workflow_ref` | 这是此作业使用的可重用工作流程的引用路径。 更多信息请参阅“[使用 OpenID 连接和可重用工作流程](/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows)”。 |
-| `ref` | _(引用)_ 触发工作流程运行的 git 引用。 |
-| `ref_type` | `ref` 的类型,例如:"branch"。 |
-| `仓库` | 运行工作流程的存储库。 |
-| `repository_owner` | 存储 `repository` 的组织的名称。 |
-| `run_id` | 触发工作流程的工作流程运行的 ID。 |
-| `run_number` | 此工作流程已运行的次数。 |
-| `run_attempt` | 此工作流程运行的重试次数。 |
-| `工作流程` | 工作流程的名称。 |
+| 声明 | 描述 |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `actor` | 发起工作流程运行的个人帐户。 |
+| `actor_id` | 发起工作流程运行的个人帐户的 ID。 |
+| `base_ref` | 工作流程运行中拉取请求的目标分支。 |
+| `environment` | 作业使用的环境的名称。 |
+| `event_name` | 触发工作流程运行的事件的名称。 |
+| `head_ref` | 工作流程运行中拉取请求的来源分支。 |
+| `job_workflow_ref` | 这是此作业使用的可重用工作流程的引用路径。 更多信息请参阅“[使用 OpenID 连接和可重用工作流程](/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows)”。 |
+| `ref` | _(引用)_ 触发工作流程运行的 git 引用。 |
+| `ref_type` | `ref` 的类型,例如:"branch"。 |
+| `仓库` | 运行工作流程的存储库。 |
+| `repository_id` | 运行工作流程的存储库的 ID。 |
+| `repository_owner` | 存储 `repository` 的组织的名称。 |
+| `repository_owner_id` | 存储 `repository` 的组织的 ID。 |
+| `run_id` | 触发工作流程的工作流程运行的 ID。 |
+| `run_number` | 此工作流程已运行的次数。 |
+| `run_attempt` | 此工作流程运行的重试次数。 |
+| `工作流程` | 工作流程的名称。 |
### 使用 OIDC 声明定义云角色的信任条件
@@ -199,12 +209,12 @@ OIDC 令牌中还支持许多其他声明,这些声明也可用于设置这些
要在云提供商的信任关系中配置主题,必须将主题字符串添加到其信任配置中。 以下示例演示了各种云提供商如何以不同的方式接受相同的 `repo:octo-org/octo-repo:ref:refs/heads/demo-branch` 主题:
-| | |
-| ------------------- | ------------------------------------------------------------------------------------------------- |
-| Amazon Web Services | `"token.actions.githubusercontent.com:sub": "repo:octo-org/octo-repo:ref:refs/heads/demo-branch"` |
-| Azure | `repo:octo-org/octo-repo:ref:refs/heads/demo-branch` |
-| Google Cloud 平台 | `(assertion.sub=='repo:octo-org/octo-repo:ref:refs/heads/demo-branch')` |
-| HashiCorp Vault | `bound_subject="repo:octo-org/octo-repo:ref:refs/heads/demo-branch"` |
+| | |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Amazon Web Services | `"{% ifversion ghes %}HOSTNAME/_services/token{% else %}token.actions.githubusercontent.com{% endif %}:sub": "repo:octo-org/octo-repo:ref:refs/heads/demo-branch"` |
+| Azure | `repo:octo-org/octo-repo:ref:refs/heads/demo-branch` |
+| Google Cloud 平台 | `(assertion.sub=='repo:octo-org/octo-repo:ref:refs/heads/demo-branch')` |
+| HashiCorp Vault | `bound_subject="repo:octo-org/octo-repo:ref:refs/heads/demo-branch"` |
更多信息请参阅“[为云提供商启用 OpenID Connect](#enabling-openid-connect-for-your-cloud-provider)”中列出的指南。
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
index 474360be80..2acbd1ab19 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
@@ -31,7 +32,7 @@ OpenID Connect (OIDC) 允许您的 {% data variables.product.prodname_actions %}
要将 {% data variables.product.prodname_dotcom %} OIDC 提供商添加到 IAM,请参阅 [AWS 文档](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html)。
-- 对于提供商 URL:使用 `https://token.actions.githubusercontent.com`
+- 对于提供程序 URL:使用 {% ifversion ghes %}`https://HOSTNAME/_services/token`{% else %}`https://token.actions.githubusercontent.com`{% endif %}
- 对于“受众”:如果您使用的是[官方操作](https://github.com/aws-actions/configure-aws-credentials),请使用 `sts.amazonaws.com`。
### 配置角色和信任策略
@@ -42,9 +43,9 @@ OpenID Connect (OIDC) 允许您的 {% data variables.product.prodname_actions %}
```json{:copy}
"Condition": {
- "StringEquals": {
- "token.actions.githubusercontent.com:aud": "sts.amazonaws.com",
- "token.actions.githubusercontent.com:sub": "repo:octo-org/octo-repo:ref:refs/heads/octo-branch"
+ "ForAllValues:StringEquals": {
+ "{% ifversion ghes %}HOSTNAME/_services/token{% else %}token.actions.githubusercontent.com{% endif %}:aud": "sts.amazonaws.com",
+ "{% ifversion ghes %}HOSTNAME/_services/token{% else %}token.actions.githubusercontent.com{% endif %}:sub": "repo:octo-org/octo-repo:ref:refs/heads/octo-branch"
}
}
```
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-azure.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
index 0d0f10e75d..a49264ded7 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md
index 4cfe5e3ffe..868ee2bcb6 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
index b36b348e7e..7262db9f21 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
@@ -39,7 +40,7 @@ OpenID Connect (OIDC) 允许您的 {% data variables.product.prodname_actions %}
- 为强化安全,请确保您已查看[“使用云配置 OIDC 信任”](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#configuring-the-oidc-trust-with-the-cloud)。 有关示例,请参阅[“在云提供商中配置主题”](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#configuring-the-subject-in-your-cloud-provider)。
- 要使服务帐户可用于配置,需要将其分配给 `roles/iam.workloadIdentityUser` 角色。 更多信息请参阅 [GCP 文档](https://cloud.google.com/iam/docs/workload-identity-federation?_ga=2.114275588.-285296507.1634918453#conditions)。
-- 要使用的颁发者 URL:`https://token.actions.githubusercontent.com`
+- 要使用的颁发者 URL:{% ifversion ghes %}`https://HOSTNAME/_services/token`{% else %}`https://token.actions.githubusercontent.com`{% endif %}
## 更新 {% data variables.product.prodname_actions %} 工作流程
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
index ce7e5e6f93..a3d8a64281 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
@@ -7,6 +7,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
type: tutorial
topics:
- Security
@@ -32,8 +33,8 @@ OpenID Connect (OIDC) 允许您的 {% data variables.product.prodname_actions %}
要将 OIDC 与 HashiCorp Vault 配合使用,您需要为 {% data variables.product.prodname_dotcom %} OIDC 提供商添加信任配置。 更多信息请参阅 HashiCorp Vault [文档](https://www.vaultproject.io/docs/auth/jwt)。
配置 Vault 接受 JSON Web 令牌 (JWT) 进行身份验证:
-- 对于 `oidc_discovery_url`,请使用 `https://token.actions.githubusercontent.com`
-- 对于 `bound_issuer`,请使用 `https://token.actions.githubusercontent.com`
+- 对于 `oidc_discovery_url`,请使用 {% ifversion ghes %}`https://HOSTNAME/_services/token`{% else %}`https://token.actions.githubusercontent.com`{% endif %}
+- 对于 `bound_issuer`,请使用 {% ifversion ghes %}`https://HOSTNAME/_services/token`{% else %}`https://token.actions.githubusercontent.com`{% endif %}
- 确保针对您的安全要求正确定义了 `bound_subject`。 更多信息请参阅[“使用云配置 OIDC 信任”](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#configuring-the-oidc-trust-with-the-cloud)和 [`hashicorp/vault-action`](https://github.com/hashicorp/vault-action)。
## 更新 {% data variables.product.prodname_actions %} 工作流程
@@ -45,8 +46,8 @@ OpenID Connect (OIDC) 允许您的 {% data variables.product.prodname_actions %}
要将 OIDC 集成添加到您的工作流程中,以允许他们访问 Vault 中的密钥,您需要添加以下代码更改:
-- Grant permission to fetch the token from the {% data variables.product.prodname_dotcom %} OIDC provider:
- - 工作流需要 `permissions:` 设置将 `id-token` 值设为 `write`。 This lets you fetch the OIDC token from every job in the workflow.
+- 授予从 {% data variables.product.prodname_dotcom %} OIDC 提供商获取令牌的权限:
+ - 工作流需要 `permissions:` 设置将 `id-token` 值设为 `write`。 这使您可以从工作流程中的每个作业中获取 OIDC 令牌。
- 向 {% data variables.product.prodname_dotcom %} OIDC 提供商请求 JWT,并将其提供给 HashiCorp Vault 以接收访问令牌:
- 您可以使用[操作工具包](https://github.com/actions/toolkit/)来获取作业的令牌,也可以使用 [`hashicorp/vault-action`](https://github.com/hashicorp/vault-action) 操作来获取 JWT 并从 Vault 接收访问令牌。
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/index.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/index.md
index 28f93c40b4..93f0738bd1 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/index.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/index.md
@@ -6,6 +6,7 @@ versions:
fpt: '*'
ghae: issue-4856
ghec: '*'
+ ghes: '>=3.5'
children:
- /about-security-hardening-with-openid-connect
- /configuring-openid-connect-in-amazon-web-services
diff --git a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md
index ec1d39731b..1ad05f7087 100644
--- a/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md
+++ b/translations/zh-CN/content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md
@@ -45,11 +45,14 @@ topics:
{
"jti": "example-id",
"sub": "repo:octo-org/octo-repo:environment:prod",
- "aud": "https://github.com/octo-org",
+ "aud": "{% ifversion ghes %}https://HOSTNAME{% else %}https://github.com{% endif %}/octo-org",
"ref": "refs/heads/main",
"sha": "example-sha",
"repository": "octo-org/octo-repo",
"repository_owner": "octo-org",
+ "actor_id": "12",
+ "repository_id": "74",
+ "repository_owner_id": "65",
"run_id": "example-run-id",
"run_number": "10",
"run_attempt": "2",
@@ -60,7 +63,7 @@ topics:
"event_name": "workflow_dispatch",
"ref_type": "branch",
"job_workflow_ref": "octo-org/octo-automation/.github/workflows/oidc.yml@refs/heads/main",
- "iss": "https://token.actions.githubusercontent.com",
+ "iss": "{% ifversion ghes %}https://HOSTNAME/_services/token{% else %}https://token.actions.githubusercontent.com{% endif %}",
"nbf": 1632492967,
"exp": 1632493867,
"iat": 1632493567
diff --git a/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md b/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
index 0a9a87d96b..6cc041f0dd 100644
--- a/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
+++ b/translations/zh-CN/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
@@ -18,7 +18,7 @@ versions:
## 关于环境
-Environments are used to describe a general deployment target like `production`, `staging`, or `development`. When a {% data variables.product.prodname_actions %} workflow deploys to an environment, the environment is displayed on the main page of the repository. 有关查看环境部署的详细信息,请参阅“[查看部署历史记录](/developers/overview/viewing-deployment-history)”。
+环境用于描述一般的部署目标,如`生产`、`暂存`或`开发`。 当 {% data variables.product.prodname_actions %} 工作流程部署到某个环境时,该环境将显示在存储库的主页上。 有关查看环境部署的详细信息,请参阅“[查看部署历史记录](/developers/overview/viewing-deployment-history)”。
您可以使用保护规则和机密配置环境。 当工作流程引用环境时,作业在环境的所有保护规则通过之前不会开始。 在所有环境保护规则通过之前,作业也不能访问在环境中定义的机密。
diff --git a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
index e283071d75..b907d981dd 100644
--- a/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
+++ b/translations/zh-CN/content/actions/learn-github-actions/environment-variables.md
@@ -147,7 +147,11 @@ jobs:
{%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5338 %}
| `GITHUB_REF_NAME` | {% data reusables.actions.ref_name-description %} For example, `feature-branch-1`.| | `GITHUB_REF_PROTECTED` | {% data reusables.actions.ref_protected-description %} | | `GITHUB_REF_TYPE` | {% data reusables.actions.ref_type-description %}
{%- endif %}
-| `GITHUB_REPOSITORY` |所有者和存储库名称。 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` |存储库所有者的姓名。 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` |工作流程运行日志和构件的保留天数。 例如 `90`。 | | `GITHUB_RUN_ATTEMPT` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试,此数字从 1 开始,并随着每次重新运行而递增。 例如 `3`。 | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} 例如 `1658821493`。 | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} 例如 `3`。 | | `GITHUB_SERVER_URL`| {% data variables.product.product_name %} 服务器的 URL。 例如:`https://{% data variables.product.product_url %}`。 | `GITHUB_SHA` | 触发工作流程的提交 SHA。 此提交 SHA 的值取决于触发工作流程的事件。 更多信息请参阅“[触发工作流程的事件](/actions/using-workflows/events-that-trigger-workflows)”。 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 | | `GITHUB_WORKFLOW` | 工作流程的名称。 例如 `My test workflow`。 如果工作流程文件未指定`名称`,则此变量的值是存储库中工作流程文件的完整路径。 | | `GITHUB_WORKSPACE` | 运行器上步骤的默认工作目录,以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 例如 `/home/runner/work/my-repo-name/my-repo-name`。 |
+| `GITHUB_REPOSITORY` |所有者和存储库名称。 例如 `octocat/Hello-World`。 | | `GITHUB_REPOSITORY_OWNER` |存储库所有者的姓名。 例如 `octocat`。 | | `GITHUB_RETENTION_DAYS` |工作流程运行日志和构件的保留天数。 例如 `90`。 | | `GITHUB_RUN_ATTEMPT` | 在存储库中运行的特定工作流程的每次尝试的唯一编号。 对于工作流程运行的第一次尝试,此数字从 1 开始,并随着每次重新运行而递增。 例如 `3`。 | | `GITHUB_RUN_ID` | {% data reusables.actions.run_id_description %} 例如 `1658821493`。 | | `GITHUB_RUN_NUMBER` | {% data reusables.actions.run_number_description %} 例如 `3`。 | | `GITHUB_SERVER_URL`| {% data variables.product.product_name %} 服务器的 URL。 例如:`https://{% data variables.product.product_url %}`。 | `GITHUB_SHA` | 触发工作流程的提交 SHA。 此提交 SHA 的值取决于触发工作流程的事件。 更多信息请参阅“[触发工作流程的事件](/actions/using-workflows/events-that-trigger-workflows)”。 例如 `ffac537e6cbbf934b08745a378932722df287a53`。 |
+{%- if actions-job-summaries %}
+| `GITHUB_STEP_SUMMARY` | 包含工作流程命令中作业摘要的文件在运行器上的路径。 此文件对于当前步骤是唯一的,并且会针对作业中的每个步骤进行更改。 例如,`/home/rob/runner/_layout/_work/_temp/_runner_file_commands/step_summary_1cb22d7f-5663-41a8-9ffc-13472605c76c`。 更多信息请参阅“[{% data variables.product.prodname_actions %} 的工作流程命令](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary)”。 |
+{%- endif %}
+| `GITHUB_WORKFLOW` |工作流程的名称。 例如 `My test workflow`。 如果工作流程文件未指定`名称`,则此变量的值是存储库中工作流程文件的完整路径。 | | `GITHUB_WORKSPACE` | 运行器上步骤的默认工作目录,以及使用[`检出`](https://github.com/actions/checkout)操作时存储库的默认位置。 例如 `/home/runner/work/my-repo-name/my-repo-name`。 |
{%- if actions-runner-arch-envvars %}
| `RUNNER_ARCH` | {% data reusables.actions.runner-arch-description %}
{%- endif %}
diff --git a/translations/zh-CN/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/zh-CN/content/actions/managing-workflow-runs/manually-running-a-workflow.md
index b018f50b6a..1c38375f05 100644
--- a/translations/zh-CN/content/actions/managing-workflow-runs/manually-running-a-workflow.md
+++ b/translations/zh-CN/content/actions/managing-workflow-runs/manually-running-a-workflow.md
@@ -70,4 +70,10 @@ gh run watch
使用 REST API 时,应将 `inputs` 和 `ref` 配置为请求正文参数。 如果忽略输入,则使用工作流程文件中定义的默认值。
+{% note %}
+
+**注意:** 您最多可以为 `workflow_dispatch` 事件定义 10 个 `inputs`。
+
+{% endnote %}
+
有关使用 REST API 的更多信息,请参阅“[创建工作流调度事件](/rest/reference/actions/#create-a-workflow-dispatch-event)”。
diff --git a/translations/zh-CN/content/actions/managing-workflow-runs/re-running-workflows-and-jobs.md b/translations/zh-CN/content/actions/managing-workflow-runs/re-running-workflows-and-jobs.md
index 15900b51e5..77465b8e69 100644
--- a/translations/zh-CN/content/actions/managing-workflow-runs/re-running-workflows-and-jobs.md
+++ b/translations/zh-CN/content/actions/managing-workflow-runs/re-running-workflows-and-jobs.md
@@ -27,13 +27,13 @@ Re-running a workflow{% if re-run-jobs %} or jobs in a workflow{% endif %} uses
{% data reusables.repositories.actions-tab %}
{% data reusables.repositories.navigate-to-workflow %}
{% data reusables.repositories.view-run %}
-{% ifversion fpt or ghes > 3.2 or ghae-issue-4721 or ghec %}
+{% ifversion fpt or ghes > 3.4 or ghae-issue-4721 or ghec %}
1. In the upper-right corner of the workflow, use the **Re-run jobs** drop-down menu, and select **Re-run all jobs**.
If no jobs failed, you will not see the **Re-run jobs** drop-down menu. Instead, click **Re-run all jobs**.

{% endif %}
-{% ifversion ghes < 3.3 or ghae %}
+{% ifversion ghes < 3.5 or ghae %}
1. In the upper-right corner of the workflow, use the **Re-run jobs** drop-down menu, and select **Re-run all jobs**.

{% endif %}
@@ -114,7 +114,7 @@ gh run rerun --job job-id
{% endif %}
-{% ifversion fpt or ghes > 3.2 or ghae-issue-4721 or ghec %}
+{% ifversion fpt or ghes > 3.4 or ghae-issue-4721 or ghec %}
## Reviewing previous workflow runs
You can view the results from your previous attempts at running a workflow. You can also view previous workflow runs using the API. For more information, see ["Get a workflow run"](/rest/reference/actions#get-a-workflow-run).
diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-circleci-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-circleci-to-github-actions.md
index 8467680b8d..d014f61dda 100644
--- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-circleci-to-github-actions.md
+++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-circleci-to-github-actions.md
@@ -82,6 +82,8 @@ CircleCI 和 {% data variables.product.prodname_actions %} 支持在配置文件
CircleCI 和 {% data variables.product.prodname_actions %} 提供在配置文件中手动缓存文件的方法。
+{% if actions-caching %}
+
下面是每个系统的语法示例:
@@ -119,7 +121,11 @@ GitHub Actions
-{% data variables.product.prodname_actions %} 缓存仅适用于 {% data variables.product.prodname_dotcom_the_website %} 托管的仓库。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% else %}
+
+{% data reusables.actions.caching-availability %}
+
+{% endif %}
{% data variables.product.prodname_actions %} 没有 CircleCI 的 Docker 层缓存(或 DLC)的等效项。
diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
index 634aaf98b1..3775649064 100644
--- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
+++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
@@ -309,6 +309,8 @@ GitLab CI/CD 和 {% data variables.product.prodname_actions %} 支持在管道
GitLab CI/CD 和 {% data variables.product.prodname_actions %} 在配置文件中提供了手动缓存工作流程文件的方法。
+{% if actions-caching %}
+
下面是每个系统的语法示例:
@@ -359,7 +361,11 @@ jobs:
-{% data variables.product.prodname_actions %} 缓存仅适用于 {% data variables.product.prodname_dotcom_the_website %} 托管的仓库。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% else %}
+
+{% data reusables.actions.caching-availability %}
+
+{% endif %}
## 构件
diff --git a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md
index 90976169f9..fc01153822 100644
--- a/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md
+++ b/translations/zh-CN/content/actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions.md
@@ -302,7 +302,11 @@ jobs:
## 缓存依赖项
-Travis CI 和 {% data variables.product.prodname_actions %} 可让您手动缓存依赖供以后使用。 此示例说明每个系统的缓存语法。
+Travis CI 和 {% data variables.product.prodname_actions %} 可让您手动缓存依赖供以后使用。
+
+{% if actions-caching %}
+
+此示例说明每个系统的缓存语法。
@@ -337,7 +341,11 @@ cache: npm
-{% data variables.product.prodname_actions %} 缓存仅适用于 {% data variables.product.prodname_dotcom_the_website %} 托管的仓库。 更多信息请参阅“缓存依赖项以加快工作流程”。
+{% else %}
+
+{% data reusables.actions.caching-availability %}
+
+{% endif %}
## 常见任务示例
diff --git a/translations/zh-CN/content/actions/publishing-packages/publishing-docker-images.md b/translations/zh-CN/content/actions/publishing-packages/publishing-docker-images.md
index 4ac311b63a..c7aff049ae 100644
--- a/translations/zh-CN/content/actions/publishing-packages/publishing-docker-images.md
+++ b/translations/zh-CN/content/actions/publishing-packages/publishing-docker-images.md
@@ -78,7 +78,7 @@ on:
jobs:
push_to_registry:
name: Push Docker image to Docker Hub
- runs-on: ubuntu-latest
+ runs-on: {% ifversion ghes %}[self-hosted]{% else %}ubuntu-latest{% endif %}
steps:
- name: Check out the repo
uses: {% data reusables.actions.action-checkout %}
@@ -108,12 +108,16 @@ jobs:
## 发布映像到 {% data variables.product.prodname_registry %}
+{% ifversion ghes > 3.4 %}
+{% data reusables.package_registry.container-registry-ghes-beta %}
+{% endif %}
+
{% data reusables.actions.release-trigger-workflow %}
在下面的示例工作流程中,我们使用 Docker `login-action`{% ifversion fpt or ghec %}、`metadata-action`{% endif %} 和 `build-push-action` 操作构建 Docker 映像,如果构建成功,则将构建的映像推送到 {% data variables.product.prodname_registry %}。
{% data variables.product.prodname_registry %} 需要的 `login-action` 选项包括:
-* `registry`:必须设置为 {% ifversion fpt or ghec %}`ghcr.io`{% else %}`docker.pkg.github.com`{% endif %}。
+* `registry`:必须设置为 {% ifversion fpt or ghec %}`ghcr.io`{% elsif ghes > 3.4 %}`{% data reusables.package_registry.container-registry-hostname %}`{% else %}`docker.pkg.github.com`{% endif %}。
* `username`:您可以使用 {% raw %}`${{ github.actor }}`{% endraw %} 上下文自动使用触发工作流程运行的用户的用户名。 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts#github-context)”。
* `password`:您可以使用自动生成的 `GITHUB_TOKEN` 密码作为密码。 更多信息请参阅“[使用 GITHUB_TOKEN 验证身份](/actions/automating-your-workflow-with-github-actions/authenticating-with-the-github_token)”。
@@ -126,9 +130,13 @@ jobs:
* `context`:将构建的上下文定义为位于指定路径中的文件集。{% endif %}
* `push`:如果设置为 `true`,则映像在构建成功后将被推送到注册表。{% ifversion fpt or ghec %}
* `tags` 和 `labels`:这些由 `metadata-action` 的输出填充。{% else %}
-* `tags`:必须设置为格式 `docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`。 例如,对于 `http://github.com/octo-org/octo-repo` 上名为 `octo-image` stored on {% data variables.product.prodname_dotcom %} 的映像,`tags` 选项应设置为 `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`。 您可以如下所示设置单个标记,或在列表中指定多个标记。{% endif %}
+* `tags`:必须以 {% ifversion ghes > 3.4 %}`{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION` 格式设置。
-{% ifversion fpt or ghec %}
+ 例如,对于存储在 `https://HOSTNAME/octo-org/octo-repo` 上 {% data variables.product.prodname_ghe_server %} 中的映像 `octo-image`,`tags` 选项应设置为 `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`{% else %}`docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`。
+
+ 例如,对于存储在 `http://github.com/octo-org/octo-repo` 上 {% data variables.product.prodname_dotcom %} 中的映像 `octo-image`,`tags` 选项应设置为 `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`{% endif %}。 您可以如下所示设置单个标记,或在列表中指定多个标记。{% endif %}
+
+{% ifversion fpt or ghec or ghes > 3.4 %}
{% data reusables.package_registry.publish-docker-image %}
上述工作流程通过推送到“发行版”分支触发。 它会检出 GitHub 仓库,并使用 `login-action` 登录到 {% data variables.product.prodname_container_registry %}。 然后,它将提取 Docker 映像的标签和标记。 最后,它使用 `build-push-action` 操作来构建映像并在 {% data variables.product.prodname_container_registry %} 上发布。
@@ -170,11 +178,15 @@ jobs:
{% ifversion ghae %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.event.release.tag_name }}{% endraw %}
```
-上述工作流程检出 {% data variables.product.prodname_dotcom %} 仓库,使用 `login-action` 登录到注册表,然后使用 `build-push-action` 操作:基于仓库的 `Dockerfile` 构建 Docker 映像;将该映像推送到 Docker 注册表,然后提交 SHA 和发行版本应用为映像标记。
+上述工作流程检出 {% data variables.product.product_name %} 仓库,使用 `login-action` 登录到注册表,然后使用 `build-push-action` 操作:基于仓库的 `Dockerfile` 构建 Docker 映像;将该映像推送到 Docker 注册表,然后提交 SHA 和发行版本应用为映像标记。
{% endif %}
## 发布映像到 Docker Hub 和 {% data variables.product.prodname_registry %}
+{% ifversion ghes > 3.4 %}
+{% data reusables.package_registry.container-registry-ghes-beta %}
+{% endif %}
+
在单一工作流程中,您可以对每个注册表使用 `login-action` 和 `build-push-action`> 操作,以将 Docker 映像发布到多个注册表。
下面的示例工作流程使用前面章节中的步骤(“[发布映像到 Docker Hub](#publishing-images-to-docker-hub)”和“[发布映像到 {% data variables.product.prodname_registry %}](#publishing-images-to-github-packages)”)来创建同时推送到两个注册表的单一工作流程。
@@ -191,7 +203,7 @@ on:
jobs:
push_to_registries:
name: Push Docker image to multiple registries
- runs-on: ubuntu-latest{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
+ runs-on: {% ifversion ghes %}[self-hosted]{% else %}ubuntu-latest{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
permissions:
packages: write
contents: read{% endif %}
@@ -205,10 +217,10 @@ jobs:
username: {% raw %}${{ secrets.DOCKER_USERNAME }}{% endraw %}
password: {% raw %}${{ secrets.DOCKER_PASSWORD }}{% endraw %}
- - name: Log in to the {% ifversion fpt or ghec %}Container{% else %}Docker{% endif %} registry
+ - name: Log in to the {% ifversion fpt or ghec or ghes > 3.4 %}Container{% else %}Docker{% endif %} registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
- registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghae %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}
+ registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghae %}docker.YOUR-HOSTNAME.com{% elsif ghes > 3.4 %}{% data reusables.package_registry.container-registry-hostname %}{% else %}docker.pkg.github.com{% endif %}
username: {% raw %}${{ github.actor }}{% endraw %}
password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
@@ -218,7 +230,7 @@ jobs:
with:
images: |
my-docker-hub-namespace/my-docker-hub-repository
- {% ifversion fpt or ghec %}ghcr.io/{% raw %}${{ github.repository }}{% endraw %}{% elsif ghae %}{% raw %}docker.YOUR-HOSTNAME.com/${{ github.repository }}/my-image{% endraw %}{% else %}{% raw %}docker.pkg.github.com/${{ github.repository }}/my-image{% endraw %}{% endif %}
+ {% ifversion fpt or ghec or ghes > 3.4 %}{% data reusables.package_registry.container-registry-hostname %}/{% raw %}${{ github.repository }}{% endraw %}{% elsif ghae %}{% raw %}docker.YOUR-HOSTNAME.com/${{ github.repository }}/my-image{% endraw %}{% else %}{% raw %}docker.pkg.github.com/${{ github.repository }}/my-image{% endraw %}{% endif %}
- name: Build and push Docker images
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
@@ -229,4 +241,4 @@ jobs:
labels: {% raw %}${{ steps.meta.outputs.labels }}{% endraw %}
```
-上面的工作流程检出 {% data variables.product.prodname_dotcom %} 仓库,使用两次 `login-action` 操作登录两个注册表,然后使用 `metadata-action` 操作生成标记和标签。 然后,`build-pow-action` 操作构建并推送 Docker 映像到 Docker Hub 和 {% ifversion fpt or ghec %}{% data variables.product.prodname_container_registry %}{% else %}Docker 注册表{% endif %}。
+上面的工作流程检出 {% data variables.product.product_name %} 仓库,使用两次 `login-action` 操作登录两个注册表,然后使用 `metadata-action` 操作生成标记和标签。 然后,`build-pow-action` 操作构建并推送 Docker 映像到 Docker Hub 和 {% ifversion fpt or ghec or ghes > 3.4 %}{% data variables.product.prodname_container_registry %}{% else %}Docker 注册表{% endif %}。
diff --git a/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md b/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md
index 5d522f2d45..34ecf03a66 100644
--- a/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md
+++ b/translations/zh-CN/content/actions/security-guides/encrypted-secrets.md
@@ -25,7 +25,7 @@ versions:
对于存储在环境级别的机密,您可以启用所需的审查者来控制对机密的访问。 在必要的审查者授予批准之前,工作流程作业无法访问环境机密。
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
{% note %}
diff --git a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md
index e338216e22..27a7959de7 100644
--- a/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md
+++ b/translations/zh-CN/content/actions/security-guides/security-hardening-for-github-actions.md
@@ -159,7 +159,7 @@ For more information, see "[About {% data variables.product.prodname_code_scanni
To help mitigate the risk of an exposed token, consider restricting the assigned permissions. For more information, see "[Modifying the permissions for the GITHUB_TOKEN](/actions/reference/authentication-in-a-workflow#modifying-the-permissions-for-the-github_token)."
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
## Using OpenID Connect to access cloud resources
@@ -291,7 +291,7 @@ A self-hosted runner can be added to various levels in your {% data variables.pr
- 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. For example, if each team owns their own organization, then it will be simplest if the runners are added at the organization level too.
- You could also add runners at the repository level, but this will add management overhead and also increases the numbers of runners you need, since you cannot share runners between repositories.
-{% ifversion fpt or ghec or ghae-issue-4856 %}
+{% ifversion fpt or ghec or ghae-issue-4856 or ghes > 3.4 %}
### Authenticating to your cloud provider
If you are using {% data variables.product.prodname_actions %} to deploy to a cloud provider, or intend to use HashiCorp Vault for secret management, then its recommended that you consider using OpenID Connect to create short-lived, well-scoped access tokens for your workflow runs. For more information, see "[About security hardening with OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."
diff --git a/translations/zh-CN/content/actions/using-jobs/using-a-matrix-for-your-jobs.md b/translations/zh-CN/content/actions/using-jobs/using-a-matrix-for-your-jobs.md
index 6cf64dbe09..94317dcc66 100644
--- a/translations/zh-CN/content/actions/using-jobs/using-a-matrix-for-your-jobs.md
+++ b/translations/zh-CN/content/actions/using-jobs/using-a-matrix-for-your-jobs.md
@@ -1,7 +1,7 @@
---
-title: Using a matrix for your jobs
+title: 对作业使用矩阵
shortTitle: 使用矩阵
-intro: Create a matrix to define variations for each job.
+intro: 创建矩阵以定义每个作业的变体。
versions:
fpt: '*'
ghes: '*'
@@ -15,11 +15,11 @@ redirect_from:
{% data reusables.actions.enterprise-beta %}
{% data reusables.actions.enterprise-github-hosted-runners %}
-## About matrix strategies
+## 关于矩阵策略
{% data reusables.actions.jobs.about-matrix-strategy %}
-## Using a matrix strategy
+## 使用矩阵策略
{% data reusables.actions.jobs.using-matrix-strategy %}
@@ -35,7 +35,7 @@ redirect_from:
{% data reusables.actions.jobs.matrix-from-context %}
-## Expanding or adding matrix configurations
+## 扩展或添加矩阵配置
{% data reusables.actions.jobs.matrix-include %}
@@ -47,14 +47,14 @@ redirect_from:
{% data reusables.actions.jobs.matrix-add-with-include %}
-## Excluding matrix configurations
+## 排除矩阵配置
{% data reusables.actions.jobs.matrix-exclude %}
-## Handling failures
+## 失败处理
{% data reusables.actions.jobs.section-using-a-build-matrix-for-your-jobs-failfast %}
-## Defining the maximum number of concurrent jobs
+## 定义并发作业的最大数量
{% data reusables.actions.jobs.section-using-a-build-matrix-for-your-jobs-max-parallel %}
diff --git a/translations/zh-CN/content/actions/using-workflows/about-workflows.md b/translations/zh-CN/content/actions/using-workflows/about-workflows.md
index 50b59306e4..7a5c37aea9 100644
--- a/translations/zh-CN/content/actions/using-workflows/about-workflows.md
+++ b/translations/zh-CN/content/actions/using-workflows/about-workflows.md
@@ -28,7 +28,7 @@ miniTocMaxHeadingLevel: 3
1. 一个或多个_作业_,每个作业将在_运行器_计算机上执行,并运行一系列一个或多个_步骤_。
1. 每个步骤都可以运行您定义的脚本,也可以运行操作,这是一个可重用的扩展,可以简化您的工作流程。
-For more information on these basic components, see "[Understanding GitHub Actions](/actions/learn-github-actions/understanding-github-actions#the-components-of-github-actions)."
+有关这些基本组件的详细信息,请参阅“[了解 GitHub Actions](/actions/learn-github-actions/understanding-github-actions#the-components-of-github-actions)”。

@@ -107,7 +107,7 @@ jobs:
### 使用矩阵
-{% data reusables.actions.jobs.about-matrix-strategy %} The matrix is created using the `strategy` keyword, which receives the build options as an array. For example, this matrix will run the job multiple times, using different versions of Node.js:
+{% data reusables.actions.jobs.about-matrix-strategy %} 矩阵是使用 `strategy` 关键字创建的,该关键字以数组的形式接收构建选项。 例如,此矩阵将使用不同版本的 Node.js 多次运行作业:
```yaml
jobs:
@@ -124,10 +124,10 @@ jobs:
更多信息请参阅“[对作业使用矩阵](/actions/using-jobs/using-a-matrix-for-your-jobs)”。
-{% ifversion fpt or ghec %}
+{% if actions-caching %}
### 缓存依赖项
-{% data variables.product.prodname_dotcom %} 托管的运行器启动为每个作业的新环境,如果您的作业定期重复使用依赖项,您可以考虑缓存这些文件以帮助提高性能。 缓存一旦创建,就可用于同一仓库中的所有工作流程。
+If your jobs regularly reuse dependencies, you can consider caching these files to help improve performance. 缓存一旦创建,就可用于同一仓库中的所有工作流程。
此示例演示如何缓存 `~/.npm` 目录:
diff --git a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
index f018757f32..8d92f84c86 100644
--- a/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
+++ b/translations/zh-CN/content/actions/using-workflows/caching-dependencies-to-speed-up-workflows.md
@@ -9,22 +9,20 @@ redirect_from:
- /actions/guides/caching-dependencies-to-speed-up-workflows
- /actions/advanced-guides/caching-dependencies-to-speed-up-workflows
versions:
- fpt: '*'
- ghec: '*'
+ feature: actions-caching
type: tutorial
topics:
- Workflows
+miniTocMaxHeadingLevel: 3
---
## 关于缓存工作流程依赖项
工作流程运行通常在不同运行之间重新使用相同的输出或下载的依赖项。 例如,Maven、Gradle、npm 和 Yarn 等软件包和依赖项管理工具都会对下载的依赖项保留本地缓存。
-{% data variables.product.prodname_dotcom %} 托管的运行器在一个干净的虚拟环境中启动,每次都必须下载依赖项,造成网络利用率提高、运行时间延长和成本增加。 为帮助加快重新创建这些文件,{% data variables.product.prodname_dotcom %} 可以缓存您在工作流程中经常使用的依赖项。
+{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %} 托管的运行器在一个干净的虚拟环境中启动,每次都必须下载依赖项,造成网络利用率提高、运行时间延长和成本增加。 {% endif %}为帮助加快重新创建诸如依赖项的文件,{% data variables.product.prodname_dotcom %} 可以缓存您在工作流程中经常使用的文件。
-要缓存作业的依赖项,您需要使用 {% data variables.product.prodname_dotcom %} 的 `cache` 操作。 该操作检索由唯一键标识的缓存。 更多信息请参阅 [`actions/cache`](https://github.com/actions/cache)。
-
-如果要缓存下面列出的包管理器,请考虑使用相应的 setup-* 操作,这些操作几乎不需要任何配置,并且易于使用。
+要缓存作业的依赖项,可以使用 {% data variables.product.prodname_dotcom %} 的 [`cache` 操作](https://github.com/actions/cache)。 该操作将创建并还原由唯一键标识的缓存。 或者,如果要缓存下面列出的包管理器,则使用其各自的 setup-* 操作时需要的配置最少,并且将为您创建和还原依赖项缓存。
{% warning %}
-**警告**:建议不要在公共仓库缓存中存储任何敏感信息。 例如,敏感信息可以包括存储在缓存路径的文件中的访问令牌或登录凭据。 此外,命令行接口 (CLI) 程序,例如 `docker login`,可以在配置文件中保存访问凭据。 具有读取访问权限的任何人都可以在仓库上创建拉取请求并访问缓存的内容。 仓库的复刻也可在基本分支上创建拉取请求,并在基本分支上访问缓存。
+**警告**:{% ifversion fpt or ghec %}将缓存与 {% data variables.product.prodname_actions %} 一起使用时,请注意以下事项:
+
+* {% endif %}我们建议您不要在缓存中存储任何敏感信息。 例如,敏感信息可以包括存储在缓存路径的文件中的访问令牌或登录凭据。 此外,命令行接口 (CLI) 程序,例如 `docker login`,可以在配置文件中保存访问凭据。 具有读取访问权限的任何人都可以在仓库上创建拉取请求并访问缓存的内容。 仓库的复刻也可在基本分支上创建拉取请求,并在基本分支上访问缓存。
+{%- ifversion fpt or ghec %}
+* 使用自托管运行器时,工作流程运行的缓存存储在 {% data variables.product.company_short %} 拥有的云存储上。 客户拥有的存储解决方案仅适用于 {% data variables.product.prodname_ghe_server %}。
+{%- endif %}
{% endwarning %}
-## 比较构件和依赖项缓存
+{% data reusables.actions.comparing-artifacts-caching %}
-构件与缓存类似,因为它们能够在 {% data variables.product.prodname_dotcom %} 上存储文件,但每项功能都提供不同的用例,不能互换使用。
-
-- 如果要在作业或工作流程运行之间重复使用不经常更改的文件,请使用缓存。
-- 如果要保存作业生成的文件,以便在工作流程结束后查看,则使用构件。 更多信息请参阅“[使用构件持久化工作流程](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
+有关工作流程运行工件的更多信息,请参阅“[使用工件持久化工作流程数据](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
## 访问缓存的限制
-使用 `cache` 操作的 `v2`,可以访问具有 `GITHUB_REF` 的任何事件所触发的工作流程中的缓存。 如果使用 `cache` 操作的 `v1`,您只能访问由 `push` 和 `pull_request` 事件触发的工作流程中的缓存,`pull_request` `closed` 事件除外。 更多信息请参阅“[触发工作流程的事件](/actions/reference/events-that-trigger-workflows)”。
-
工作流程可以访问和还原当前分支、基础分支(包括复刻的仓库的基本分支)或默认分支(通常是 `main`)中创建的缓存 例如,在默认分支上创建的缓存可从任何拉取请求访问。 另外,如果分支 `feature-b` 具有基础分支 `feature-a`,则触发于 `feature-b` 的工作流程可以访问默认分支 (`main`)、`feature-a` 和 `feature-b` 中创建的缓存。
-访问限制通过在不同分支之间创建逻辑边界来提供缓存隔离和安全。 例如, 为分支 `feature-a`(具有基础分支 `main`)创建的缓存将无法访问分支 `feature-b`(具有基础分支 `main`)的拉取请求。
+访问限制通过在不同分支之间创建逻辑边界来提供缓存隔离和安全。 例如, 为分支 `feature-a`(具有基础分支 `main`)创建的缓存将无法访问分支 `feature-c`(具有基础分支 `main`)的拉取请求。
仓库中的多个工作流程共享缓存条目。 可以从同一仓库和分支的另一个工作流程访问和恢复为工作流程中的分支创建的缓存。
## 使用 `cache` 操作
-`cache` 操作将尝试恢复基于您提供的 `key` 的缓存。 当操作找到缓存时,该操作会将缓存的文件还原到您配置的 `path`。
+[`cache` 操作](https://github.com/actions/cache)将尝试恢复基于您提供的 `key` 的缓存。 当操作找到缓存时,该操作会将缓存的文件还原到您配置的 `path`。
-如果没有精确匹配,操作在作业成功完成时将创建一个新的缓存条目。 新缓存将使用您提供的 `key` 并包含 `path` 目录中的文件。
+如果没有精确匹配,操作在作业成功完成时将自动创建一个新的缓存。 新缓存将使用您提供的 `key` 并包含 `path` 中指定的文件。
当 `key` 与现有缓存不匹配时,您可以选择性提供要使用的 `restore-keys` 列表。 `restore-keys` 列表很有用,因为 `restore-keys` 可以部分匹配缓存密钥。 有关匹配 `restore-keys` 的更多信息,请参阅“[匹配缓存密钥](#matching-a-cache-key)”。
-更多信息请参阅 [`actions/cache`](https://github.com/actions/cache)。
-
### `cache` 操作的输入参数
-- `key`:**必要** 保存缓存时创建的键,以及用于搜索缓存的键。 可以是变量、上下文值、静态字符串和函数的任何组合。 密钥最大长度为 512 个字符,密钥长度超过最大长度将导致操作失败。
-- `path`:**必要** 运行器上缓存或还原的文件路径。 路径可以是绝对路径或相对于工作区目录的路径。
- - 路径可以是目录或单个文件,并且支持 glob 模式。
- - 使用 `cache` 操作的 `v2`,可以指定单个路径,也可以在单独的行上添加多个路径。 例如:
+- `key`:**必要** 保存缓存时创建的键,以及用于搜索缓存的键。 它可以是变量、上下文值、静态字符串和函数的任何组合。 密钥最大长度为 512 个字符,密钥长度超过最大长度将导致操作失败。
+- `path`:**必要** 运行器上缓存或还原的文件路径。
+ - 可以指定单个路径,也可以在单独的行上添加多个路径。 例如:
```
- name: Cache Gradle packages
@@ -101,14 +96,15 @@ topics:
~/.gradle/caches
~/.gradle/wrapper
```
- - 对于 `cache` 操作的 `v1`,仅支持单个路径,它必须是一个目录。 您不能缓存单个文件。
+ - 您可以指定目录或单个文件,并且支持 glob 模式。
+ - 可以指定绝对路径或相对于工作区目录的路径。
- `restore-keys`:**可选** 包含备用恢复键的字符串,每个恢复键都放在新行上。 如果 `key` 未发生缓存命中,则按提供的查找和恢复缓存的顺序使用这些恢复密钥。 例如:
{% raw %}
```yaml
restore-keys: |
- npm-foobar-${{ hashFiles('package-lock.json') }}
- npm-foobar-
+ npm-feature-${{ hashFiles('package-lock.json') }}
+ npm-feature-
npm-
```
{% endraw %}
@@ -123,17 +119,15 @@ topics:
```yaml{:copy}
name: Caching with npm
-
on: push
-
jobs:
build:
runs-on: ubuntu-latest
-
steps:
- uses: {% data reusables.actions.action-checkout %}
- name: Cache node modules
+ id: cache-npm
uses: {% data reusables.actions.action-cache %}
env:
cache-name: cache-node-modules
@@ -146,7 +140,12 @@ jobs:
{% raw %}${{ runner.os }}-build-{% endraw %}
{% raw %}${{ runner.os }}-{% endraw %}
- - name: Install Dependencies
+ - if: {% raw %}${{ steps.cache-npm.outputs.cache-hit == false }}{% endraw %}
+ name: List the state of node modules
+ continue-on-error: true
+ run: npm list
+
+ - name: Install dependencies
run: npm install
- name: Build
@@ -156,23 +155,27 @@ jobs:
run: npm test
```
-当 `key` 匹配现有缓存时,被称为缓存命中,并且操作会将缓存的文件还原到 `path` 目录。
+当 `key` 匹配现有缓存时,被称为_缓存命中_,并且操作会将缓存的文件还原到 `path` 目录。
-当 `key` 不匹配现有缓存时,则被称为缓存错过,在作业成功完成时将创建一个新缓存。 发生缓存错过时,操作将搜索称为 `restore-keys` 的替代键值。
+当 `key` 不匹配现有缓存时,则被称为_缓存错过_,在作业成功完成时将自动创建一个新缓存。
+
+发生缓存未命中时,该操作还会在指定的 `restore-keys` 中搜索任何匹配项:
1. 如果您提供 `restore-keys`,`cache` 操作将按顺序搜索与 `restore-keys` 列表匹配的任何缓存。
- 当精确匹配时,操作会将缓存中的文件恢复至 `path` 目录。
- 如果没有精确匹配,操作将会搜索恢复键值的部分匹配。 当操作找到部分匹配时,最近的缓存将恢复到 `path` 目录。
-1. `cache` 操作完成,作业中的下一个工作流程步骤运行。
-1. 如果作业成功完成,则操作将创建一个包含 `path` 目录内容的新缓存。
+1. `cache` 操作完成,作业中的下一个步骤运行。
+1. 如果作业成功完成,则操作将自动创建一个包含 `path` 目录内容的新缓存。
-要在多个目录中缓存文件,您需要一个对每个目录使用 [`cache`](https://github.com/actions/cache) 操作的步骤。 创建缓存后,无法更改现有缓存的内容,但可以使用新键创建新缓存。
+有关缓存匹配过程的更详细说明,请参阅“[匹配缓存键](#matching-a-cache-key)”。 创建缓存后,无法更改现有缓存的内容,但可以使用新键创建新缓存。
### 使用上下文创建缓存键
-缓存键可以包括 {% data variables.product.prodname_actions %} 支持的任何上下文、函数、文本和运算符。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions)”。
+缓存键可以包括 {% data variables.product.prodname_actions %} 支持的任何上下文、函数、文本和运算符。 更多信息请参阅“[上下文](/actions/learn-github-actions/contexts)”和“[表达式](/actions/learn-github-actions/expressions)”。
-使用表达式创建 `key` 允许您在依赖项更改时自动创建新缓存。 例如,您可以使用计算 npm `package-lock.json` 文件哈希的表达式创建 `key`。
+使用表达式创建 `key` 允许您在依赖项更改时自动创建新缓存。
+
+例如,您可以使用计算 npm `package-lock.json` 文件哈希的表达式创建 `key`。 因此,当组成 `package-lock.json` 文件更改的依赖项时,缓存键会更改,并自动创建新的缓存。
{% raw %}
```yaml
@@ -186,19 +189,32 @@ npm-${{ hashFiles('package-lock.json') }}
npm-d5ea0750
```
+### 使用 `cache` 操作的输出
+
+您可以使用 `cache` 操作的输出来根据缓存命中或错过是否发生来执行某些操作。 如果存在缓存未命中(找不到指定 `key` 的缓存的完全匹配项),则 `cache-hit` 输出将设置为 `false`。
+
+在上面的示例工作流程中,有一个步骤列出了发生缓存未命中时 Node 模块的状态:
+
+```yaml
+- if: {% raw %}${{ steps.cache-npm.outputs.cache-hit == false }}{% endraw %}
+ name: List the state of node modules
+ continue-on-error: true
+ run: npm list
+```
+
## 匹配缓存键
`cache` 操作会先在包含工作流程运行的分支中搜索 `key` 和 `restore-key` 的缓存命中。 如果当前分支中没有命中,`cache` 操作将在父分支和上游分支中搜索 `key` 和 `restore-keys`。
-您可以提供一个出现 `key` 缓存错过时使用的恢复键列表。 您可以创建从最具体到最不具体的多个恢复键。 `cache` 操作按顺序搜索 `restore-keys`。 当键不直接匹配时,操作将搜索以恢复键为前缀的键。 如果恢复键值有多个部分匹配项,操作将返回最近创建的缓存。
+`restore-keys` 允许您指定在 `key` 上出现缓存错过时要使用的备用还原密钥列表。 您可以创建从最具体到最不具体的多个恢复键。 `cache` 操作按顺序搜索 `restore-keys`。 当键不直接匹配时,操作将搜索以恢复键为前缀的键。 如果恢复键值有多个部分匹配项,操作将返回最近创建的缓存。
### 使用多个恢复键值的示例
{% raw %}
```yaml
restore-keys: |
- npm-foobar-${{ hashFiles('package-lock.json') }}
- npm-foobar-
+ npm-feature-${{ hashFiles('package-lock.json') }}
+ npm-feature-
npm-
```
{% endraw %}
@@ -208,16 +224,16 @@ restore-keys: |
{% raw %}
```yaml
restore-keys: |
- npm-foobar-d5ea0750
- npm-foobar-
+ npm-feature-d5ea0750
+ npm-feature-
npm-
```
{% endraw %}
-恢复键值 `npm-foobar-` 与任何以字符串 `npm-foobar-` 开头的键值匹配。 例如,键值 `npm-foobar-fd3052de` 和 `npm-foobar-a9b253ff` 都与恢复键值匹配。 将使用创建日期最新的缓存。 此示例中的键值按以下顺序搜索:
+恢复键 `npm-feature-` 与任何以字符串 `npm-feature-` 开头的键值匹配。 例如,键值 `npm-feature-fd3052de` 和 `npm-feature-a9b253ff` 都与恢复键值匹配。 将使用创建日期最新的缓存。 此示例中的键值按以下顺序搜索:
-1. **`npm-foobar-d5ea0750`** 匹配特定的哈希。
-1. **`npm-foobar-`** 匹配前缀为 `npm-foobar-` 的缓存键值。
+1. **`npm-feature-d5ea0750`** 匹配特定的哈希。
+1. **`npm-feature-`** 匹配前缀为 `npm-feature-` 的缓存键值。
1. **`npm-`** 匹配前缀为 `npm-` 的任何键值。
#### 搜索优先级示例
@@ -230,18 +246,24 @@ restore-keys: |
npm-
```
-例如,如果拉取请求包含 `feature` 分支(当前范围)并针对默认分支 (`main`),操作将按以下顺序搜索 `key` 和 `restore-keys`:
+例如,如果拉取请求包含 `feature` 分支并针对默认分支 (`main`),操作将按以下顺序搜索 `key` 和 `restore-keys`:
-1. `feature` 分支范围中的键值 `npm-feature-d5ea0750`
-1. `feature` 分支范围中的键值 `npm-feature-`
-2. `feature` 分支范围中的键值 `npm-`
-1. `main` 分支范围中的键值 `npm-feature-d5ea0750`
-3. `main` 分支范围中的键值 `npm-feature-`
-4. `main` 分支范围中的键值 `npm`
+1. `feature` 分支中的键值 `npm-feature-d5ea0750`
+1. `feature` 分支中的键值 `npm-feature-`
+1. `feature` 分支中的键值 `npm-`
+1. `main` 分支中的键值 `npm-feature-d5ea0750`
+1. `main` 分支中的键值 `npm-feature-`
+1. `main` 分支中的键值 `npm`
## 使用限制和收回政策
-{% data variables.product.prodname_dotcom %} 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制,但存储库中所有缓存的总大小限制为 10 GB。 如果超过此限制,{% data variables.product.prodname_dotcom %} 将保存缓存,但会开始收回缓存,直到总大小小于 10 GB。
+{% data variables.product.prodname_dotcom %} 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制,但存储库中所有缓存的总大小限制为{% if actions-cache-policy-apis %} 默认情况下,每个存储库的限制为 10 GB,但此限制可能会有所不同,具体取决于企业所有者或存储库管理员设置的策略。{% else %} 10 GB。{% endif %}
+
+{% data reusables.actions.cache-eviction-process %}
+
+{% if actions-cache-policy-apis %}
+有关更改存储库缓存大小限制的策略的信息,请参阅“[在企业中实施 {% data variables.product.prodname_actions %} 策略](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#enforcing-a-policy-for-cache-storage-in-your-enterprise)”和“[管理存储库的 {% data variables.product.prodname_actions %} 设置](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#configuring-cache-storage-for-a-repository)”。
+{% endif %}
{% if actions-cache-management %}
diff --git a/translations/zh-CN/content/actions/using-workflows/creating-starter-workflows-for-your-organization.md b/translations/zh-CN/content/actions/using-workflows/creating-starter-workflows-for-your-organization.md
index 4810a582be..e34910efd6 100644
--- a/translations/zh-CN/content/actions/using-workflows/creating-starter-workflows-for-your-organization.md
+++ b/translations/zh-CN/content/actions/using-workflows/creating-starter-workflows-for-your-organization.md
@@ -37,7 +37,7 @@ topics:
{% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %}
{% note %}
-**注意:**为避免入门工作流程之间的重复,您可以从工作流程中调用可重用工作流程。 这有助于使您的工作流程更易于维护。 For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
+**注意:**为避免入门工作流程之间的重复,您可以从工作流程中调用可重用工作流程。 这有助于使您的工作流程更易于维护。 更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。
{% endnote %}
{% endif %}
diff --git a/translations/zh-CN/content/actions/using-workflows/index.md b/translations/zh-CN/content/actions/using-workflows/index.md
index 86303ae04d..39441cf890 100644
--- a/translations/zh-CN/content/actions/using-workflows/index.md
+++ b/translations/zh-CN/content/actions/using-workflows/index.md
@@ -27,11 +27,11 @@ children:
- /workflow-syntax-for-github-actions
- /workflow-commands-for-github-actions
- /reusing-workflows
+ - /caching-dependencies-to-speed-up-workflows
+ - /storing-workflow-data-as-artifacts
- /creating-starter-workflows-for-your-organization
- /using-starter-workflows
- /sharing-workflows-secrets-and-runners-with-your-organization
- - /caching-dependencies-to-speed-up-workflows
- - /storing-workflow-data-as-artifacts
- /using-github-cli-in-workflows
---
diff --git a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md
index c3a090642a..fad6066c82 100644
--- a/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md
+++ b/translations/zh-CN/content/actions/using-workflows/reusing-workflows.md
@@ -103,8 +103,13 @@ You can define inputs and secrets, which can be passed from the caller workflow
required: true
```
{% endraw %}
+ {% if actions-inherit-secrets-reusable-workflows %}
+ For details of the syntax for defining inputs and secrets, see [`on.workflow_call.inputs`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callinputs), [`on.workflow_call.secrets`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callsecrets) and [`on.workflow_call.secrets.inherit`](/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callsecretsinherit).
+1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step. If the secrets are inherited using `secrets: inherit`, you can reference them even if they are not defined in the `on` key.
+ {%- else %}
For details of the syntax for defining inputs and secrets, see [`on.workflow_call.inputs`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callinputs) and [`on.workflow_call.secrets`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callsecrets).
1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step.
+ {%- endif %}
{% raw %}
```yaml
@@ -189,6 +194,7 @@ When you call a reusable workflow, you can only use the following keywords in th
* [`jobs..with.`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idwithinput_id)
* [`jobs..secrets`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idsecrets)
* [`jobs..secrets.`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idsecretssecret_id)
+ {% if actions-inherit-secrets-reusable-workflows %}* [`jobs..secrets.inherit`](/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callsecretsinherit){% endif %}
* [`jobs..needs`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds)
* [`jobs..if`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif)
* [`jobs..permissions`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idpermissions)
diff --git a/translations/zh-CN/content/actions/using-workflows/storing-workflow-data-as-artifacts.md b/translations/zh-CN/content/actions/using-workflows/storing-workflow-data-as-artifacts.md
index e78d57d69c..7e9f72347d 100644
--- a/translations/zh-CN/content/actions/using-workflows/storing-workflow-data-as-artifacts.md
+++ b/translations/zh-CN/content/actions/using-workflows/storing-workflow-data-as-artifacts.md
@@ -56,6 +56,14 @@ To share data between jobs:
The steps of a job share the same environment on the runner machine, but run in their own individual processes. To pass data between steps in a job, you can use inputs and outputs. For more information about inputs and outputs, see "[Metadata syntax for {% data variables.product.prodname_actions %}](/articles/metadata-syntax-for-github-actions)."
+{% if actions-caching %}
+
+{% data reusables.actions.comparing-artifacts-caching %}
+
+For more information on dependency caching, see "[Caching dependencies to speed up workflows](/actions/using-workflows/caching-dependencies-to-speed-up-workflows#comparing-artifacts-and-dependency-caching)."
+
+{% endif %}
+
## Uploading build and test artifacts
You can create a continuous integration (CI) workflow to build and test your code. For more information about using {% data variables.product.prodname_actions %} to perform CI, see "[About continuous integration](/articles/about-continuous-integration)."
diff --git a/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md b/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md
index fbf133274c..f735e1d8e0 100644
--- a/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md
+++ b/translations/zh-CN/content/actions/using-workflows/workflow-commands-for-github-actions.md
@@ -111,13 +111,10 @@ core.setOutput('SELECTED_COLOR', 'green');
| `core.getInput` | 可使用环境变量 `INPUT_{NAME}` 访问 |
| `core.getState` | 可使用环境变量 `STATE_{NAME}` 访问 |
| `core.isDebug` | 可使用环境变量 `RUNNER_DEBUG` 访问 |
-| `core.saveState` | `save-state` |
-| `core.setCommandEcho` | `echo` |
-| `core.setFailed` | 用作 `::error` 和 `exit 1` 的快捷方式 |
-| `core.setOutput` | `set-output` |
-| `core.setSecret` | `add-mask` |
-| `core.startGroup` | `组` |
-| `core.warning` | `警告` |
+{%- if actions-job-summaries %}
+| `core.summary` | 可使用环境变量 `GITHUB_STEP_SUMMARY` 访问 |
+{%- endif %}
+| `core.saveState` | `save-state` | | `core.setCommandEcho` | `echo` | | `core.setFailed` | Used as a shortcut for `::error` and `exit 1` | | `core.setOutput` | `set-output` | | `core.setSecret` | `add-mask` | | `core.startGroup` | `group` | | `core.warning` | `warning` |
## 设置输出参数
@@ -563,14 +560,16 @@ echo "{environment_variable_name}={value}" >> $GITHUB_ENV
{% powershell %}
- 使用 PowerShell 版本 6 及更高版本:
-```pwsh{:copy}
-"{environment_variable_name}={value}" >> $env:GITHUB_ENV
-```
+
+ ```pwsh{:copy}
+ "{environment_variable_name}={value}" >> $env:GITHUB_ENV
+ ```
- 使用 PowerShell 版本 5.1 及更低版本:
-```powershell{:copy}
-"{environment_variable_name}={value}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-```
+
+ ```powershell{:copy}
+ "{environment_variable_name}={value}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+ ```
{% endpowershell %}
@@ -657,6 +656,150 @@ steps:
{% endpowershell %}
+{% if actions-job-summaries %}
+
+## 添加作业摘要
+
+{% bash %}
+
+```bash{:copy}
+echo "{markdown content}" >> $GITHUB_STEP_SUMMARY
+```
+
+{% endbash %}
+
+{% powershell %}
+
+```pwsh{:copy}
+"{markdown content}" >> $env:GITHUB_STEP_SUMMARY
+```
+
+{% endpowershell %}
+
+您可以为每个作业设置一些自定义 Markdown,以便将其显示在工作流程运行的摘要页面上。 可以使用作业摘要来显示和分组唯一内容(如测试结果摘要),以便查看工作流程运行结果的用户无需进入日志即可查看与运行相关的重要信息(如失败)。
+
+作业摘要支持 [{% data variables.product.prodname_dotcom %} 样式的 Markdown](https://github.github.com/gfm/),您可以将某个步骤的 Markdown 内容添加到 `GITHUB_STEP_SUMMARY` 环境文件中。 `GITHUB_STEP_SUMMARY` 对于作业中的每个步骤都是唯一的。 有关 `GITHUB_STEP_SUMMARY` 引用的每个步骤的文件的详细信息,请参阅“[环境文件](#environment-files)”。
+
+作业完成后,作业中所有步骤的摘要将组合到单个作业摘要中,并显示在工作流程运行摘要页上。 如果多个作业生成摘要,则作业摘要按作业完成时间排序。
+
+### 示例
+
+{% bash %}
+
+```bash{:copy}
+echo "### Hello world! :rocket:" >> $GITHUB_STEP_SUMMARY
+```
+
+{% endbash %}
+
+{% powershell %}
+
+```pwsh{:copy}
+"### Hello world! :rocket:" >> $env:GITHUB_STEP_SUMMARY
+```
+
+{% endpowershell %}
+
+
+
+### 多行 Markdown 内容
+
+对于多行 Markdown 内容,可以使用 `>>` 连续附加当前步骤的内容。 每个附加操作都会自动添加换行符。
+
+#### 示例
+
+{% bash %}
+
+```yaml
+- name: Generate list using Markdown
+ run: |
+ echo "This is the lead in sentence for the list" >> $GITHUB_STEP_SUMMARY
+ echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line
+ echo "- Lets add a bullet point" >> $GITHUB_STEP_SUMMARY
+ echo "- Lets add a second bullet point" >> $GITHUB_STEP_SUMMARY
+ echo "- How about a third one?" >> $GITHUB_STEP_SUMMARY
+```
+
+{% endbash %}
+
+{% powershell %}
+
+```yaml
+- name: Generate list using Markdown
+ run: |
+ "This is the lead in sentence for the list" >> $env:GITHUB_STEP_SUMMARY
+ "" >> $env:GITHUB_STEP_SUMMARY # this is a blank line
+ "- Lets add a bullet point" >> $env:GITHUB_STEP_SUMMARY
+ "- Lets add a second bullet point" >> $env:GITHUB_STEP_SUMMARY
+ "- How about a third one?" >> $env:GITHUB_STEP_SUMMARY
+```
+
+{% endpowershell %}
+
+### 覆盖作业摘要
+
+要清除当前步骤的所有内容,可以使用 `>` 覆盖以前添加的任何内容。
+
+#### 示例
+
+{% bash %}
+
+```yaml
+- name: Overwrite Markdown
+ run: |
+ echo "Adding some Markdown content" >> $GITHUB_STEP_SUMMARY
+ echo "There was an error, we need to clear the previous Markdown with some new content." > $GITHUB_STEP_SUMMARY
+```
+
+{% endbash %}
+
+{% powershell %}
+
+```yaml
+- name: Overwrite Markdown
+ run: |
+ "Adding some Markdown content" >> $env:GITHUB_STEP_SUMMARY
+ "There was an error, we need to clear the previous Markdown with some new content." > $env:GITHUB_STEP_SUMMARY
+```
+
+{% endpowershell %}
+
+### 删除作业摘要
+
+要完全删除当前步骤的摘要,可以删除 `GITHUB_STEP_SUMMARY` 引用的文件。
+
+#### 示例
+
+{% bash %}
+
+```yaml
+- name: Delete all summary content
+ run: |
+ echo "Adding Markdown content that we want to remove before the step ends" >> $GITHUB_STEP_SUMMARY
+ rm $GITHUB_STEP_SUMMARY
+```
+
+{% endbash %}
+
+{% powershell %}
+
+```yaml
+- name: Delete all summary content
+ run: |
+ "Adding Markdown content that we want to remove before the step ends" >> $env:GITHUB_STEP_SUMMARY
+ rm $env:GITHUB_STEP_SUMMARY
+```
+
+{% endpowershell %}
+
+步骤完成后,将上传作业摘要,后续步骤无法修改以前上传的 Markdown 内容。 摘要会自动屏蔽可能意外添加的任何机密。 如果作业摘要包含必须删除的敏感信息,则可以删除整个工作流程运行以删除其所有作业摘要。 更多信息请参阅“[删除工作流程运行](/actions/managing-workflow-runs/deleting-a-workflow-run)”。
+
+### 步骤分隔和限制
+
+作业摘要在步骤之间分隔,每个步骤的最大大小限制为 1MiB。 在步骤之间执行分隔,以便单个步骤中可能格式错误的 Markdown 无法破坏后续步骤的 Markdown 呈现。 如果为某个步骤添加的内容超过 1MiB,则该步骤的上传将失败,并且会创建错误注释。 作业摘要的上传失败不影响步骤或作业的整体状态。 每个作业最多显示 20 个步骤中的作业摘要。
+
+{% endif %}
+
## 添加系统路径
为系统 `PATH` 变量预先设置一个目录,并自动使其可用于当前作业中的所有后续操作;当前运行的操作无法访问更新的路径变量。 要查看作业的当前定义路径,您可以在步骤或操作中使用 `echo "$PATH"`。
@@ -678,21 +821,20 @@ echo "{path}" >> $GITHUB_PATH
### 示例
-此示例演示如何将用户 `$HOME/.local/bin` 目录添加到 `PATH`:
-
{% bash %}
+此示例演示如何将用户 `$HOME/.local/bin` 目录添加到 `PATH`:
+
```bash{:copy}
echo "$HOME/.local/bin" >> $GITHUB_PATH
```
{% endbash %}
+{% powershell %}
此示例演示如何将用户 `$env:HOMEPATH/.local/bin` 目录添加到 `PATH`:
-{% powershell %}
-
```pwsh{:copy}
"$env:HOMEPATH/.local/bin" >> $env:GITHUB_PATH
```
diff --git a/translations/zh-CN/content/actions/using-workflows/workflow-syntax-for-github-actions.md b/translations/zh-CN/content/actions/using-workflows/workflow-syntax-for-github-actions.md
index 967e4576ca..3f8f9c2fa6 100644
--- a/translations/zh-CN/content/actions/using-workflows/workflow-syntax-for-github-actions.md
+++ b/translations/zh-CN/content/actions/using-workflows/workflow-syntax-for-github-actions.md
@@ -95,7 +95,7 @@ jobs:
```
{% endraw %}
-For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
+更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。
#### `on.workflow_call.inputs..type`
@@ -124,7 +124,7 @@ on:
```
{% endraw %}
-有关如何引用作业输出的信息,请参阅 [`jobs..outputs`](#jobsjob_idoutputs)。 For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
+有关如何引用作业输出的信息,请参阅 [`jobs..outputs`](#jobsjob_idoutputs)。 更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。
### `on.workflow_call.secrets`
@@ -157,6 +157,42 @@ jobs:
```
{% endraw %}
+{% if actions-inherit-secrets-reusable-workflows %}
+
+#### `on.workflow_call.secrets.inherit`
+
+使用 `inherit` 关键字将调用工作流程的所有机密传递给被调用的工作流程。 这包括调用工作流程有权访问的所有机密,即组织、存储库和环境机密。 `inherit` 关键字可用于在同一组织内的存储库之间或同一企业中的组织之间传递机密。
+
+#### 示例
+
+{% raw %}
+
+```yaml
+on:
+ workflow_dispatch:
+
+jobs:
+ pass-secrets-to-workflow:
+ uses: ./.github/workflows/called-workflow.yml
+ secrets: inherit
+```
+
+```yaml
+on:
+ workflow_call:
+
+jobs:
+ pass-secret-to-action:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Use a repo or org secret from the calling workflow.
+ uses: echo ${{ secrets.CALLING_WORKFLOW_SECRET }}
+```
+
+{% endraw %}
+
+{%endif%}
+
#### `on.workflow_call.secrets.`
要与机密关联的字符串标识符。
@@ -331,7 +367,7 @@ steps:
#### 示例:使用状态检查功能
-`my backup step` 仅在作业的上一步失败时运行。 For more information, see "[Expressions](/actions/learn-github-actions/expressions#job-status-check-functions)."
+`my backup step` 仅在作业的上一步失败时运行。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions#status-check-functions)”。
```yaml
steps:
@@ -874,7 +910,7 @@ services:
### `jobs..services..image`
-要用作运行操作的服务容器的 Docker 镜像。 值可以是 Docker Hub 映像名称或注册表名称。
+要用作运行操作的服务容器的 Docker 图像。 值可以是 Docker Hub 映像名称或注册表名称。
### `jobs..services..credentials`
@@ -948,7 +984,7 @@ volumes:
{% data reusables.actions.uses-keyword-example %}
-For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
+更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。
### `jobs..with`
diff --git a/translations/zh-CN/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/overview-of-github-advanced-security-deployment.md b/translations/zh-CN/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/overview-of-github-advanced-security-deployment.md
index 1ead0fa6d2..3f27e05d5f 100644
--- a/translations/zh-CN/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/overview-of-github-advanced-security-deployment.md
+++ b/translations/zh-CN/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/overview-of-github-advanced-security-deployment.md
@@ -1,7 +1,7 @@
---
title: GitHub Advanced Security 部署概述
intro: '通过查看和理解这些最佳实践、部署示例以及我们经过企业测试的分阶段方法,帮助您的公司成功准备采用 {% data variables.product.prodname_GH_advanced_security %} (GHAS)。'
-product: '{% data variables.product.prodname_GH_advanced_security %} is a set of security features designed to make enterprise code more secure. It is available for {% data variables.product.prodname_ghe_server %} 3.0 or higher, {% data variables.product.prodname_ghe_cloud %}, and open source repositories. 要了解有关 {% data variables.product.prodname_GH_advanced_security %} 中包含的功能的更多信息,请参阅“[关于GitHub Advanced Security](/get-started/learning-about-github/about-github-advanced-security)”。'
+product: '{% data variables.product.prodname_GH_advanced_security %} 是一组安全功能,旨在使企业代码更安全。 它可用于 {% data variables.product.prodname_ghe_server %} 3.0 或更高版本、 {% data variables.product.prodname_ghe_cloud %} 和开源存储库。 要了解有关 {% data variables.product.prodname_GH_advanced_security %} 中包含的功能的更多信息,请参阅“[关于GitHub Advanced Security](/get-started/learning-about-github/about-github-advanced-security)”。'
redirect_from:
- /admin/advanced-security/overview-of-github-advanced-security-deployment
miniTocMaxHeadingLevel: 3
@@ -29,11 +29,11 @@ topics:
## 推荐用于 GHAS 部署的分阶段方法
-我们创建了一种分阶段的 GHAS 部署方法,该方法根据行业和 GitHub 最佳实践开发。 You can utilize this approach for your rollout, either in partnership with {% data variables.product.prodname_professional_services %} or independently.
+我们创建了一种分阶段的 GHAS 部署方法,该方法根据行业和 GitHub 最佳实践开发。 您可以利用此方法与 {% data variables.product.prodname_professional_services %} 合作或独立部署。
-虽然建议采用分阶段方法,但可以根据公司的需求进行调整。 We also suggest creating and adhering to a timeline for your rollout and implementation. 当您开始规划时,我们可以一起确定最适合您公司的理想方法和时间表。
+虽然建议采用分阶段方法,但可以根据公司的需求进行调整。 我们还建议创建并遵守部署和实施的时间表。 当您开始规划时,我们可以一起确定最适合您公司的理想方法和时间表。
-
+
根据我们帮助客户成功部署 {% data variables.product.prodname_GH_advanced_security %} 的经验,我们预计大多数客户都希望遵循这些阶段。 根据贵公司的需要,您可能需要修改此方法并更改或删除某些阶段或步骤。
@@ -198,7 +198,7 @@ topics:
- “[升级 {% data variables.product.prodname_ghe_server %}](/enterprise-server@2.22/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)”
- “[升级要求](/enterprise-server@2.20/admin/enterprise-management/upgrade-requirements)”
-如果您使用的是第三方 CI/CD 系统,并且想要使用 {% data variables.product.prodname_code_scanning %},请确保已下载 {% data variables.product.prodname_codeql_cli %}。 For more information, see "[About CodeQL code scanning in your CI system](/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system)."
+如果您使用的是第三方 CI/CD 系统,并且想要使用 {% data variables.product.prodname_code_scanning %},请确保已下载 {% data variables.product.prodname_codeql_cli %}。 更多信息请参阅“[关于 CI 系统中的 CodeQL 代码扫描](/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/about-codeql-code-scanning-in-your-ci-system)”。
如果您与 {% data variables.product.prodname_professional_services %} 合作部署 GHAS ,请准备好在启动会议中详细讨论这些项目。
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md
index 4da69a7c90..6f1210f301 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/about-github-connect.md
@@ -30,7 +30,8 @@ Feature | Description | More information |
------- | ----------- | ---------------- |{% ifversion ghes %}
Automatic user license sync | Manage license usage across your {% data variables.product.prodname_enterprise %} deployments by automatically syncing user licenses from {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %}. | "[Enabling automatic user license sync for your enterprise](/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise)"{% endif %}{% ifversion ghes or ghae-issue-4864 %}
{% data variables.product.prodname_dependabot %} | Allow users to find and fix vulnerabilities in code dependencies. | "[Enabling {% data variables.product.prodname_dependabot %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)"{% endif %}
-{% data variables.product.prodname_dotcom_the_website %} actions | Allow users to use actions from {% data variables.product.prodname_dotcom_the_website %} in workflow files. | "[Enabling automatic access to {% data variables.product.prodname_dotcom_the_website %} actions using {% data variables.product.prodname_github_connect %}](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)"
+{% data variables.product.prodname_dotcom_the_website %} actions | Allow users to use actions from {% data variables.product.prodname_dotcom_the_website %} in workflow files. | "[Enabling automatic access to {% data variables.product.prodname_dotcom_the_website %} actions using {% data variables.product.prodname_github_connect %}](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)"{% if server-statistics %}
+{% data variables.product.prodname_server_statistics %} | Analyze your own aggregate data from GitHub Enterprise Server, and help us improve GitHub products. | "[Enabling {% data variables.product.prodname_server_statistics %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise)"{% endif %}
Unified search | Allow users to include repositories on {% data variables.product.prodname_dotcom_the_website %} in their search results when searching from {% data variables.product.product_location %}. | "[Enabling {% data variables.product.prodname_unified_search %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise)"
Unified contributions | Allow users to include anonymized contribution counts for their work on {% data variables.product.product_location %} in their contribution graphs on {% data variables.product.prodname_dotcom_the_website %}. | "[Enabling {% data variables.product.prodname_unified_contributions %} for your enterprise](/admin/configuration/configuring-github-connect/enabling-unified-contributions-for-your-enterprise)"
@@ -66,7 +67,8 @@ Feature | Data | Which way does the data flow? | Where is the data used? |
Automatic user license sync | Each {% data variables.product.product_name %} user's user ID and email addresses | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} |{% endif %}{% ifversion ghes or ghae-issue-4864 %}
{% data variables.product.prodname_dependabot_alerts %} | Vulnerability alerts | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} |{% endif %}{% if dependabot-updates-github-connect %}
{% data variables.product.prodname_dependabot_updates %} | Dependencies and the metadata for each dependency's repository
If a dependency is stored in a private repository on {% data variables.product.prodname_dotcom_the_website %}, data will only be transmitted if {% data variables.product.prodname_dependabot %} is configured and authorized to access that repository. | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} {% endif %}
-{% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %}
+{% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %}{% if server-statistics %}
+{% data variables.product.prodname_server_statistics %} | Aggregate {% data variables.product.prodname_ghe_server %} usage metrics For the list of aggregate metrics collected, see "[{% data variables.product.prodname_server_statistics %} data collected](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics#server-statistics-data-collected)." | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %}{% endif %}
Unified search | Search terms, search results | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}
From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} |
Unified contributions | Contribution counts | From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.prodname_dotcom_the_website %} |
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md
index 1fded4006e..54e5985fe5 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise.md
@@ -21,7 +21,7 @@ shortTitle: Automatic user license sync
{% data reusables.enterprise-licensing.about-license-sync %} For more information, see "[About {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/about-github-connect#data-transmission-for-github-connect)."
-If you enable automatic user license sync for your enterprise, {% data variables.product.prodname_github_connect %} will automatically synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} weekly.
+If you enable automatic user license sync for your enterprise, {% data variables.product.prodname_github_connect %} will automatically synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} weekly.{% ifversion ghes > 3.4 %} You can also synchronize your license data at any time outside of the automatic weekly sync, by manually triggering a license sync job. For more information, see "[Triggering a license sync job](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud#triggering-a-license-sync-job)."{% endif %}
If you use multiple {% data variables.product.prodname_ghe_server %} instances, you can enable automatic license sync between each of your instances and the same organization or enterprise account on {% data variables.product.prodname_ghe_cloud %}.
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
index b53ae48210..f2561e091c 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise.md
@@ -43,7 +43,7 @@ You can also choose to manually sync vulnerability data at any time. For more in
{% note %}
-**Note:** When you enable enable {% data variables.product.prodname_dependabot_alerts %}, no code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
+**Note:** When you enable {% data variables.product.prodname_dependabot_alerts %}, no code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
{% endnote %}
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md
new file mode 100644
index 0000000000..ae0897f0d5
--- /dev/null
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise.md
@@ -0,0 +1,31 @@
+---
+title: Enabling Server Statistics for your enterprise
+intro: 'You can analyze your own aggregate data from {% data variables.product.prodname_ghe_server %} and help us improve {% data variables.product.company_short %} products by enabling {% data variables.product.prodname_server_statistics %}.'
+versions:
+ feature: server-statistics
+redirect_from:
+ - /early-access/github/analyze-how-your-team-works-with-server-statistics/about-server-statistics/enabling-server-statistics
+topics:
+ - Enterprise
+shortTitle: Server Statistics
+---
+
+{% data reusables.server-statistics.release-phase %}
+
+## 关于 {% data variables.product.prodname_server_statistics %}
+
+{% data variables.product.prodname_server_statistics %} collects aggregate usage data from {% data variables.product.product_location %}, which you can use to better anticipate the needs of your organization, understand how your team works, and show the value you get from {% data variables.product.prodname_ghe_server %}.
+
+{% data variables.product.prodname_server_statistics %} only collects certain aggregate metrics on repositories, issues, pull requests, and other features.{% data variables.product.prodname_dotcom %} content, such as code, issues, comments, or pull request content, is not collected. 更多信息请参阅“[关于 {% data variables.product.prodname_server_statistics %}](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics)”。
+
+By enabling {% data variables.product.prodname_server_statistics %}, you are also helping to improve {% data variables.product.company_short %}. The aggregated data you will provide helps us understand how our customers are using {% data variables.product.prodname_dotcom %}, and make better and more informed product decisions, ultimately benefiting you.
+
+## 启用 {% data variables.product.prodname_server_statistics %}
+
+Before you can enable {% data variables.product.prodname_server_statistics %}, you must first connect your {% data variables.product.prodname_ghe_server %} instance to {% data variables.product.prodname_dotcom_the_website %} through {% data variables.product.prodname_github_connect %}. 更多信息请参阅“[将 {% data variables.product.prodname_ghe_server %} 连接到 {% data variables.product.prodname_ghe_cloud %}](/enterprise-server@3.1/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/connecting-github-enterprise-server-to-github-enterprise-cloud)”。
+
+You can disable {% data variables.product.prodname_server_statistics %} from {% data variables.product.prodname_ghe_server %} at any time.
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.github-connect-tab %}
+4. Under "Share server statistics with GitHub.com", select the dropdown menu and click **Enabled** or **Disabled**. 
diff --git a/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md b/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md
index aeea8a4ae5..65744e21de 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-github-connect/index.md
@@ -21,6 +21,7 @@ children:
- /managing-github-connect
- /enabling-automatic-user-license-sync-for-your-enterprise
- /enabling-dependabot-for-your-enterprise
+ - /enabling-server-statistics-for-your-enterprise
- /enabling-unified-search-for-your-enterprise
- /enabling-unified-contributions-for-your-enterprise
shortTitle: GitHub Connect
diff --git a/translations/zh-CN/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md b/translations/zh-CN/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md
index 0a71f4bd61..0388f81141 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-network-settings/enabling-subdomain-isolation.md
@@ -24,23 +24,25 @@ shortTitle: 启用子域隔离
启用子域隔离后,{% data variables.product.prodname_ghe_server %} 会以子域替代多个路径。 启用子域隔离后,尝试访问某些用户提供内容的以前路径(如 `http(s)://HOSTNAME/raw/`)可能会返回 `404` 错误。
-| 未使用子域隔离的路径 | 使用子域隔离的路径 |
-| -------------------------------------- | ----------------------------------------------------------- |
-| `http(s)://HOSTNAME/assets/` | `http(s)://assets.HOSTNAME/` |
-| `http(s)://HOSTNAME/avatars/` | `http(s)://avatars.HOSTNAME/` |
-| `http(s)://HOSTNAME/codeload/` | `http(s)://codeload.HOSTNAME/` |
-| `http(s)://HOSTNAME/gist/` | `http(s)://gist.HOSTNAME/` |
-| `http(s)://HOSTNAME/media/` | `http(s)://media.HOSTNAME/` |
-| `http(s)://HOSTNAME/pages/` | `http(s)://pages.HOSTNAME/` |
-| `http(s)://HOSTNAME/raw/` | `http(s)://raw.HOSTNAME/` |
-| `http(s)://HOSTNAME/render/` | `http(s)://render.HOSTNAME/` |
-| `http(s)://HOSTNAME/reply/` | `http(s)://reply.HOSTNAME/` |
-| `http(s)://HOSTNAME/uploads/` | `http(s)://uploads.HOSTNAME/` |{% ifversion ghes %}
+| 未使用子域隔离的路径 | 使用子域隔离的路径 |
+| -------------------------------------- | -------------------------------------------------------------- |
+| `http(s)://HOSTNAME/assets/` | `http(s)://assets.HOSTNAME/` |
+| `http(s)://HOSTNAME/avatars/` | `http(s)://avatars.HOSTNAME/` |
+| `http(s)://HOSTNAME/codeload/` | `http(s)://codeload.HOSTNAME/` |
+| `http(s)://HOSTNAME/gist/` | `http(s)://gist.HOSTNAME/` |
+| `http(s)://HOSTNAME/media/` | `http(s)://media.HOSTNAME/` |
+| `http(s)://HOSTNAME/pages/` | `http(s)://pages.HOSTNAME/` |
+| `http(s)://HOSTNAME/raw/` | `http(s)://raw.HOSTNAME/` |
+| `http(s)://HOSTNAME/render/` | `http(s)://render.HOSTNAME/` |
+| `http(s)://HOSTNAME/reply/` | `http(s)://reply.HOSTNAME/` |
+| `http(s)://HOSTNAME/uploads/` | `http(s)://uploads.HOSTNAME/` |{% ifversion ghes %}
| `https://HOSTNAME/_registry/docker/` | `http(s)://docker.HOSTNAME/`{% endif %}{% ifversion ghes %}
-| `https://HOSTNAME/_registry/npm/` | `https://npm.HOSTNAME/` |
-| `https://HOSTNAME/_registry/rubygems/` | `https://rubygems.HOSTNAME/` |
-| `https://HOSTNAME/_registry/maven/` | `https://maven.HOSTNAME/` |
-| `https://HOSTNAME/_registry/nuget/` | `https://nuget.HOSTNAME/`{% endif %}
+| `https://HOSTNAME/_registry/npm/` | `https://npm.HOSTNAME/` |
+| `https://HOSTNAME/_registry/rubygems/` | `https://rubygems.HOSTNAME/` |
+| `https://HOSTNAME/_registry/maven/` | `https://maven.HOSTNAME/` |
+| `https://HOSTNAME/_registry/nuget/` | `https://nuget.HOSTNAME/`{% endif %}{% ifversion ghes > 3.4 %}
+| 不支持 | `https://containers.HOSTNAME/`
+{% endif %}
## 基本要求
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md
index dda614d0f4..bbd29e52aa 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/command-line-utilities.md
@@ -209,7 +209,7 @@ ghe-logs-tail
### ghe-maintenance
-This utility allows you to control the state of the installation's maintenance mode. It's designed to be used primarily by the {% data variables.enterprise.management_console %} behind-the-scenes, but it can be used directly.
+This utility allows you to control the state of the installation's maintenance mode. It's designed to be used primarily by the {% data variables.enterprise.management_console %} behind-the-scenes, but it can be used directly. For more information, see "[Enabling and scheduling maintenance mode](/admin/guides/installation/enabling-and-scheduling-maintenance-mode)."
```shell
ghe-maintenance -h
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md
index afe9132dfc..c8f852bc51 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance.md
@@ -129,6 +129,10 @@ $ ghe-restore -c 169.154.1.1
> Visit https://169.154.1.1/setup/settings to review appliance configuration.
```
+{% if ip-exception-list %}
+Optionally, to validate the restore, configure an IP exception list to allow access to a specified list of IP addresses. For more information, see "[Validating changes in maintenance mode using the IP exception list](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode#validating-changes-in-maintenance-mode-using-the-ip-exception-list)."
+{% endif %}
+
{% note %}
**Note:** The network settings are excluded from the backup snapshot. You must manually configure the network on the target {% data variables.product.prodname_ghe_server %} appliance as required for your environment.
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md
index 8f9f359c87..a9f03fb889 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications.md
@@ -25,12 +25,7 @@ Enterprise owners can configure email for notifications.
## Configuring SMTP for your enterprise
{% ifversion ghes %}
-{% data reusables.enterprise_site_admin_settings.access-settings %}
-{% data reusables.enterprise_site_admin_settings.management-console %}
-2. At the top of the page, click **Settings**.
-
-3. In the left sidebar, click **Email**.
-
+{% data reusables.enterprise_site_admin_settings.email-settings %}
4. Select **Enable email**. This will enable both outbound and inbound email, however for inbound email to work you will also need to configure your DNS settings as described below in "[Configuring DNS and firewall
settings to allow incoming emails](#configuring-dns-and-firewall-settings-to-allow-incoming-emails)."

diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md
new file mode 100644
index 0000000000..e386dc8cfa
--- /dev/null
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing.md
@@ -0,0 +1,76 @@
+---
+title: Configuring web commit signing
+shortTitle: Configure web commit signing
+intro: 'You can enable auto-signing of commits made in the web interface of {% data variables.product.product_name %}.'
+versions:
+ ghes: '>=3.5'
+type: how_to
+topics:
+ - Access management
+ - Enterprise
+ - Fundamentals
+ - Identity
+ - Security
+permissions: 'Site administrators can configure web commit signing for {% data variables.product.product_location %}.'
+---
+
+## About web commit signing
+
+If you enable web commit signing, {% data variables.product.product_name %} will automatically use GPG to sign commits users make on the web interface of {% data variables.product.product_location %}. Commits signed by {% data variables.product.product_name %} will have a verified status. 更多信息请参阅“[关于提交签名验证](/authentication/managing-commit-signature-verification/about-commit-signature-verification)”。
+
+You can enable web commit signing, rotate the private key used for web commit signing, and disable web commit signing.
+
+## Enabling web commit signing
+
+{% data reusables.enterprise_site_admin_settings.create-pgp-key-web-commit-signing %}
+ - If you have a no-reply email address defined in the {% data variables.enterprise.management_console %}, use that email address. If not, use any email address, such as `web-flow@my-company.com`. 电子邮件地址不需要有效。
+{% data reusables.enterprise_site_admin_settings.pgp-key-no-passphrase %}
+{% data reusables.enterprise_site_admin_settings.pgp-key-env-variable %}
+{% data reusables.enterprise_site_admin_settings.update-commit-signing-service %}
+1. 启用 Web 提交签名。
+
+ ```bash{:copy}
+ ghe-config app.github.web-commit-signing-enabled true
+ ```
+1. 应用配置,然后等待配置运行完成。
+
+ ```bash{:copy}
+ ghe-config-apply
+ ```
+1. 通过内置身份验证或外部身份验证在 {% data variables.product.product_location %} 上创建新用户。 更多信息请参阅“[关于企业的身份验证](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise)”。
+ - 用户的用户名必须是 `web-flow`。
+ - 用户的电子邮件地址必须与您用于 PGP 密钥的地址相同。
+{% data reusables.enterprise_site_admin_settings.add-key-to-web-flow-user %}
+{% data reusables.enterprise_site_admin_settings.email-settings %}
+1. 在“No-reply email address(无需回复电子邮件地址)”下,键入用于 PGP 密钥的同一电子邮件地址。
+
+ {% note %}
+
+ **注意:** 仅当您为 {% data variables.product.product_location %} 启用了电子邮件时,才会显示“No-reply email address(无需回复电子邮件地址)”字段。 更多信息请参阅“[配置电子邮件通知](/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications#configuring-smtp-for-your-enterprise)”。
+
+ {% endnote %}
+{% data reusables.enterprise_management_console.save-settings %}
+
+## 轮换用于 Web 提交签名的私钥
+
+{% data reusables.enterprise_site_admin_settings.create-pgp-key-web-commit-signing %}
+ - Use the no-reply email address defined in the {% data variables.enterprise.management_console %}, which should be the same as the email address of the `web-flow` user.
+{% data reusables.enterprise_site_admin_settings.pgp-key-no-passphrase %}
+{% data reusables.enterprise_site_admin_settings.pgp-key-env-variable %}
+{% data reusables.enterprise_site_admin_settings.update-commit-signing-service %}
+{% data reusables.enterprise_site_admin_settings.add-key-to-web-flow-user %}
+
+## Disabling web commit signing
+
+You can disable web commit signing for {% data variables.product.product_location %}.
+
+1. In the administrative shell, run the following command.
+
+ ```bash{:copy}
+ ghe-config app.github.web-commit-signing-enabled false
+ ```
+1. 应用配置。
+
+ ```bash{:copy}
+ ghe-config-apply
+ ```
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md
index d43f6ea620..bb2e6f0472 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode.md
@@ -33,12 +33,20 @@ shortTitle: 配置维护模式
我们建议您至少将维护窗口排定在 30 分钟后,以便用户提前作好准备。 排定维护窗口后,所有用户在访问站点时都会看到横幅。
+
+

在实例进入维护模式后,所有正常 HTTP 和 Git 访问都会遭到拒绝。 Git 提取、克隆和推送操作也会被拒绝,并显示一条错误消息,指示站点暂时不可用。 在高可用性配置中,Git 复制将暂停。 GitHub Actions 作业不会执行。 在浏览器中访问该站点会显示维护页面。

+{% if ip-exception-list %}
+
+您可以通过配置 IP 例外列表来执行维护操作的初始验证,以仅允许从提供的 IP 地址和范围访问 {% data variables.product.product_location %}。 尝试从 IP 例外列表中未指定的 IP 地址访问 {% data variables.product.product_location %} 将收到与实例处于维护模式时发送的响应一致的响应。
+
+{% endif %}
+
## 立即启用维护模式或排定在未来的某个时间进行维护
{% data reusables.enterprise_site_admin_settings.access-settings %}
@@ -50,6 +58,23 @@ shortTitle: 配置维护模式
4. 选择 **Enable maintenance mode**。 
{% data reusables.enterprise_management_console.save-settings %}
+{% if ip-exception-list %}
+
+## 在维护模式下使用 IP 例外列表验证更改
+
+IP 例外列表提供对 {% data variables.product.product_location %} 的受控和受限访问,这非常适合在维护操作后对服务器运行状况进行初始验证。 启用后,{% data variables.product.product_location %} 将退出维护模式,并且仅对配置的 IP 地址可用。 将更新维护模式复选框以反映状态更改。
+
+如果重新启用维护模式,IP 例外列表将被禁用,{% data variables.product.product_location %} 将恢复到维护模式。 如果只是禁用 IP 例外列表,{% data variables.product.product_location %} 将恢复正常操作。
+
+{% data reusables.enterprise_site_admin_settings.access-settings %}
+{% data reusables.enterprise_site_admin_settings.management-console %}
+1. 在 {% data variables.enterprise.management_console %} 顶部,单击 **Maintenance(维护)**,然后确认已启用维护模式。 
+1. 选择 **Enable IP exception list(启用 IP 例外列表)**。 
+1. 在文本框中,键入应允许访问 {% data variables.product.product_location %} 的空格分隔 IP 地址或 CIDR 块有效列表。 
+1. 单击 **Save(保存)**。 
+
+{% endif %}
+
## 通过 {% data variables.product.prodname_enterprise_api %} 排定维护模式
您可以通过 {% data variables.product.prodname_enterprise_api %} 排定在其他时间或日期进行维护。 更多信息请参阅“[管理控制台](/enterprise/{{ currentVersion }}/user/rest/reference/enterprise-admin#enable-or-disable-maintenance-mode)”。
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md
index 7fbc5351ec..97e044bd08 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/index.md
@@ -36,6 +36,7 @@ children:
- /configuring-github-pages-for-your-enterprise
- /configuring-the-referrer-policy-for-your-enterprise
- /configuring-custom-footers
+ - /configuring-web-commit-signing
shortTitle: 配置企业
---
diff --git a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md
index 24879eba77..5eda01256a 100644
--- a/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md
+++ b/translations/zh-CN/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md
@@ -193,7 +193,7 @@ You can see the number of active committers that are currently using seats for {
Under "Current active committer count", you can see the number of active committers for repositories with {% data variables.product.prodname_GH_advanced_security %} enabled. This is the number of licensed seats that are currently being used.
-Under "Maximum committers across across entire instance", you can see the number of active committers across all the repositories in your enterprise. This is the number of seats that would be used if you enabled {% data variables.product.prodname_GH_advanced_security %} for every repository in your enterprise.
+Under "Maximum committers across entire instance", you can see the number of active committers across all the repositories in your enterprise. This is the number of seats that would be used if you enabled {% data variables.product.prodname_GH_advanced_security %} for every repository in your enterprise.
Under "Calculate Additional Advanced Committers", you can calculate how many more additional seats will be used if you enable {% data variables.product.prodname_GH_advanced_security %} for specific organizations and repositories. Under "Organizations and Repositories", enter or paste a list of organizations and repositories, with one organization or repository per line.
diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md
index 61b681ed8b..0de266deb6 100644
--- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md
+++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md
@@ -16,6 +16,12 @@ shortTitle: Increase CPU or memory
---
{% data reusables.enterprise_installation.warning-on-upgrading-physical-resources %}
+{% note %}
+
+**Note:** Before increasing CPU or memory resources, put your instance in maintenance mode.{% if ip-exception-list %} You can validate changes by configuring an IP exception list to allow access from specified IP addresses. {% endif %} For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)."
+
+{% endnote %}
+
## Adding CPU or memory resources for AWS
{% note %}
diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md
index 45ccd11f6a..d7b480eaa3 100644
--- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md
+++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md
@@ -24,7 +24,7 @@ shortTitle: 增加存储容量
{% note %}
-**注**:调整任何存储卷之前,请将实例置于维护模式。 更多信息请参阅“[启用和排定维护模式](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。
+**注意:** 在调整任何存储卷的大小之前,请将您的实例置于维护模式。{% if ip-exception-list %} 您可以通过配置 IP 例外列表以允许从指定的 IP 地址进行访问来验证更改。 {% endif %} 更多信息请参阅“[启用和计划维护模式](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)”。
{% endnote %}
diff --git a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
index ebd05d280c..ef89af9278 100644
--- a/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
+++ b/translations/zh-CN/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
@@ -174,6 +174,9 @@ shortTitle: 升级 GHES
Target root partition: /dev/xvda2
Proceed with installation? [y/N]
```
+{% if ip-exception-list %}
+1. (可选)若要验证升级,请将 IP 例外列表配置为允许访问指定的 IP 地址列表。 更多信息请参阅“[使用 IP 例外列表验证维护模式下的更改](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode#validating-changes-in-maintenance-mode-using-the-ip-exception-list)”。
+{% endif %}
7. 对于单个设备升级,请禁用维护模式,以便用户能够使用 {% data variables.product.product_location %}。
{% note %}
diff --git a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-amazon-s3-storage.md b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-amazon-s3-storage.md
index 309655b87e..6e7fbdf1ec 100644
--- a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-amazon-s3-storage.md
+++ b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-amazon-s3-storage.md
@@ -1,6 +1,6 @@
---
title: Enabling GitHub Actions with Amazon S3 storage
-intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use Amazon S3 storage to store artifacts generated by workflow runs.'
+intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use Amazon S3 storage to store data generated by workflow runs.'
permissions: 'Site administrators can enable {% data variables.product.prodname_actions %} and configure enterprise settings.'
versions:
ghes: '*'
@@ -20,7 +20,7 @@ shortTitle: Amazon S3 storage
Before enabling {% data variables.product.prodname_actions %}, make sure you have completed the following steps:
-* Create your Amazon S3 bucket for storing artifacts generated by workflow runs. {% indented_data_reference reusables.actions.enterprise-s3-permission spaces=2 %}
+* Create your Amazon S3 bucket for storing data generated by workflow runs. {% indented_data_reference reusables.actions.enterprise-s3-permission spaces=2 %}
{% data reusables.actions.enterprise-common-prereqs %}
diff --git a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-azure-blob-storage.md b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-azure-blob-storage.md
index cb73b7f4fa..d8ed1b6f77 100644
--- a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-azure-blob-storage.md
+++ b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-azure-blob-storage.md
@@ -1,6 +1,6 @@
---
title: Enabling GitHub Actions with Azure Blob storage
-intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use Azure Blob storage to store artifacts generated by workflow runs.'
+intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use Azure Blob storage to store data generated by workflow runs.'
permissions: 'Site administrators can enable {% data variables.product.prodname_actions %} and configure enterprise settings.'
versions:
ghes: '*'
@@ -18,7 +18,7 @@ shortTitle: Azure Blob storage
Before enabling {% data variables.product.prodname_actions %}, make sure you have completed the following steps:
-* Create your Azure storage account for storing workflow artifacts. {% data variables.product.prodname_actions %} stores its data as block blobs, and two storage account types are supported:
+* Create your Azure storage account for storing workflow data. {% data variables.product.prodname_actions %} stores its data as block blobs, and two storage account types are supported:
* A **general-purpose** storage account (also known as `general-purpose v1` or `general-purpose v2`) using the **standard** performance tier.
{% warning %}
diff --git a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-minio-gateway-for-nas-storage.md b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-minio-gateway-for-nas-storage.md
index 514ab779d4..11ef40333e 100644
--- a/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-minio-gateway-for-nas-storage.md
+++ b/translations/zh-CN/content/admin/github-actions/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-minio-gateway-for-nas-storage.md
@@ -1,6 +1,6 @@
---
title: Enabling GitHub Actions with MinIO Gateway for NAS storage
-intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use MinIO Gateway for NAS storage to store artifacts generated by workflow runs.'
+intro: 'You can enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %} and use MinIO Gateway for NAS storage to store data generated by workflow runs.'
permissions: 'Site administrators can enable {% data variables.product.prodname_actions %} and configure enterprise settings.'
versions:
ghes: '*'
@@ -15,18 +15,14 @@ redirect_from:
shortTitle: MinIO Gateway for NAS storage
---
-{% warning %}
-
-**Warning**: MinIO has announced removal of MinIO Gateways. Starting June 1st, 2022, support and bug fixes for the current MinIO NAS Gateway implementation will only be available for paid customers via their LTS support contract. If you want to continue using MinIO Gateways with {% data variables.product.prodname_actions %}, we recommend moving to MinIO LTS support. For more information, see [Scheduled removal of MinIO Gateway for GCS, Azure, HDFS](https://github.com/minio/minio/issues/14331) in the minio/minio repository.
-
-{% endwarning %}
+{% data reusables.actions.minio-gateways-removal %}
## Prerequisites
Before enabling {% data variables.product.prodname_actions %}, make sure you have completed the following steps:
* To avoid resource contention on the appliance, we recommend that MinIO be hosted separately from {% data variables.product.product_location %}.
-* Create your bucket for storing workflow artifacts. To set up your bucket and access key, see the [MinIO documentation](https://docs.min.io/docs/minio-gateway-for-nas.html). {% indented_data_reference reusables.actions.enterprise-s3-permission spaces=2 %}
+* Create your bucket for storing workflow data. To set up your bucket and access key, see the [MinIO documentation](https://docs.min.io/docs/minio-gateway-for-nas.html). {% indented_data_reference reusables.actions.enterprise-s3-permission spaces=2 %}
{% data reusables.actions.enterprise-common-prereqs %}
diff --git a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
index b0313604d2..19a28786f4 100644
--- a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
+++ b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/about-github-actions-for-enterprises.md
@@ -39,7 +39,7 @@ You can create your own unique automations, or you can use and adapt workflows f
{% ifversion ghec %}You can enjoy the convenience of {% data variables.product.company_short %}-hosted runners, which are maintained and upgraded by {% data variables.product.company_short %}, or you{% else %}You{% endif %} can control your own private CI/CD infrastructure by using self-hosted runners. Self-hosted runners allow you to determine the exact environment and resources that complete your builds, testing, and deployments, without exposing your software development cycle to the internet. For more information, see {% ifversion ghec %}"[About {% data variables.product.company_short %}-hosted runners](/actions/using-github-hosted-runners/about-github-hosted-runners)" and{% endif %} "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners)."
-{% data variables.product.prodname_actions %} provides greater control over deployments. For example, you can use environments to require approval for a job to proceed, restrict which branches can trigger a workflow, or limit access to secrets.{% ifversion ghec or ghae-issue-4856 %} If your workflows need to access resources from a cloud provider that supports OpenID Connect (OIDC), you can configure your workflows to authenticate directly to the cloud provider. OIDC provides security benefits such as eliminating the need to store credentials as long-lived secrets. For more information, see "[About security hardening with OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."{% endif %}
+{% data variables.product.prodname_actions %} provides greater control over deployments. For example, you can use environments to require approval for a job to proceed, restrict which branches can trigger a workflow, or limit access to secrets.{% ifversion ghec or ghae-issue-4856 or ghes > 3.4 %} If your workflows need to access resources from a cloud provider that supports OpenID Connect (OIDC), you can configure your workflows to authenticate directly to the cloud provider. OIDC provides security benefits such as eliminating the need to store credentials as long-lived secrets. For more information, see "[About security hardening with OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."{% endif %}
{% data variables.product.prodname_actions %} also includes tools to govern your enterprise's software development cycle and meet compliance obligations. For more information, see "[Enforcing policies for {% data variables.product.prodname_actions %} in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise)."
diff --git a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
index 9321667ae6..73c5b2b8bc 100644
--- a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
+++ b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server.md
@@ -25,7 +25,7 @@ This article explains how site administrators can configure {% data variables.pr
{% 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. You'll also need to decide which storage provider you'll use for the blob storage required to store artifacts generated by workflow runs. Then, you'll enable {% data variables.product.prodname_actions %} for your enterprise, manage access permissions, and add self-hosted runners to run workflows.
+{% 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. You'll also need to decide which storage provider you'll use for the blob storage required to store artifacts{% if actions-caching %} and caches{% endif %} generated by workflow runs. Then, you'll enable {% data variables.product.prodname_actions %} for your enterprise, manage access permissions, and add self-hosted runners to run workflows.
{% data reusables.actions.introducing-enterprise %}
@@ -104,7 +104,7 @@ Optionally, you can limit resource consumption on {% data variables.product.prod
To enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, you must have access to external blob storage.
-{% data variables.product.prodname_actions %} uses blob storage to store artifacts generated by workflow runs, such as workflow logs and user-uploaded build artifacts. The amount of storage required depends on your usage of {% data variables.product.prodname_actions %}. Only a single external storage configuration is supported, and you can't use multiple storage providers at the same time.
+{% data variables.product.prodname_actions %} uses blob storage to store data generated by workflow runs, such as workflow logs{% if actions-caching %}, caches,{% endif %} and user-uploaded build artifacts. The amount of storage required depends on your usage of {% data variables.product.prodname_actions %}. Only a single external storage configuration is supported, and you can't use multiple storage providers at the same time.
{% data variables.product.prodname_actions %} supports these storage providers:
@@ -118,6 +118,8 @@ To enable {% data variables.product.prodname_actions %} on {% data variables.pro
{% endnote %}
+{% data reusables.actions.minio-gateways-removal %}
+
Before you enable {% data variables.product.prodname_actions %}, you can test your storage configuration from the administrative shell with the `ghe-actions-precheck` utility. For more information, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-actions-check)" and "[Accessing the administrative shell (SSH)](/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh)."
## Networking considerations
diff --git a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md
index 511d399159..dabe75ca77 100644
--- a/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md
+++ b/translations/zh-CN/content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md
@@ -110,22 +110,20 @@ Finally, you should consider security hardening for self-hosted runners. For mor
### Storage
-{% data reusables.actions.about-artifacts %} For more information, see "[Storing workflow data as artifacts](/actions/advanced-guides/storing-workflow-data-as-artifacts)."
+{% data reusables.actions.about-artifacts %} For more information, see "[Storing workflow data as artifacts](/actions/advanced-guides/storing-workflow-data-as-artifacts)."
-
+{% if actions-caching %}{% data variables.product.prodname_actions %} also has a caching system that you can use to cache dependencies to speed up workflow runs. For more information, see "[Caching dependencies to speed up workflows](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)."{% endif %}
{% ifversion ghes %}
-You must configure external blob storage for these artifacts. Decide which supported storage provider your enterprise will use. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.product_name %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#external-storage-requirements)."
+You must configure external blob storage for workflow artifacts{% if actions-caching %}, caches,{% endif %} and other workflow logs. Decide which supported storage provider your enterprise will use. For more information, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.product_name %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server#external-storage-requirements)."
{% endif %}
{% ifversion ghec or ghes %}
-{% data reusables.actions.artifact-log-retention-statement %}
+You can use policy settings for {% data variables.product.prodname_actions %} to customize the storage of workflow artifacts{% if actions-caching %}, caches,{% endif %} and log retention. For more information, see "[Enforcing policies for {% data variables.product.prodname_actions %} in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise)."
{% endif %}
-If you want to retain logs and artifacts longer than the upper limit you can configure in {% data variables.product.product_name %}, you'll have to plan how to export and store the data.
-
{% ifversion ghec %}
Some storage is included in your subscription, but additional storage will affect your bill. You should plan for this cost. For more information, see "[About billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
{% endif %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md
index d398d8ec13..f4819b9441 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md
@@ -1,7 +1,7 @@
---
-title: About authentication for your enterprise
+title: 关于企业的身份验证
shortTitle: 关于身份验证
-intro: 'You {% ifversion ghae %}must configure SAML single sign-on (SSO) so people can{% else %}can choose how people{% endif %} authenticate to access {% ifversion ghec %}your enterprise''s resources on {% data variables.product.product_name %}{% elsif ghes %}{% data variables.product.product_location %}{% elsif ghae %}your enterprise on {% data variables.product.product_name %}{% endif %}.'
+intro: '您必须 {% ifversion ghae %}配置 SAML 单点登录 (SSO),以便用户可以{% else %}可以选择人员如何{% endif %} 进行身份验证,以便访问{% ifversion ghec %} {% data variables.product.product_name %} 上的企业资源{% elsif ghes %}{% data variables.product.product_location %}{% elsif ghae %}{% data variables.product.product_name %}上的企业{% endif %}。'
versions:
ghec: '*'
ghes: '*'
@@ -15,73 +15,73 @@ topics:
- SSO
---
-## About authentication for your enterprise
+## 关于企业的身份验证
{% ifversion ghec %}
-Enterprise owners on {% data variables.product.product_name %} can control the requirements for authentication and access to the enterprise's resources. You can choose to allow members create and manage user accounts, or your enterprise can create and manage accounts for members. If you allow members to manage their own accounts, you can also configure SAML authentication to both increase security and centralize identity and access for the web applications that your team uses. If you choose to manage your members' user accounts, you must configure SAML authentication.
+{% data variables.product.product_name %} 上的企业所有者可以控制身份验证和访问企业资源的要求。 您可以选择允许成员创建和管理用户帐户,或者您的企业可以为成员创建和管理帐户。 如果您允许成员管理自己的帐户,则还可以配置 SAML 身份验证,以提高安全性,并集中团队使用的 Web 应用程序的身份和访问权限。 如果选择管理成员的用户帐户,则必须配置 SAML 身份验证。
-## Authentication methods for {% data variables.product.product_name %}
+## {% data variables.product.product_name %} 的身份验证方法
-The following options are available for account management and authentication on {% data variables.product.product_name %}.
+以下选项可用于 {% data variables.product.product_name %} 上的帐户管理和身份验证。
-- [Authentication through {% data variables.product.product_location %}](#authentication-through-githubcom)
-- [Authentication through {% data variables.product.product_location %} with additional SAML access restriction](#authentication-through-githubcom-with-additional-saml-access-restriction)
-- [Authentication with {% data variables.product.prodname_emus %} and SAML SSO](#authentication-with-enterprise-managed-users-and-saml-sso)
+- [通过 {% data variables.product.product_location %} 进行身份验证](#authentication-through-githubcom)
+- [通过具有附加 SAML 访问限制的 {% data variables.product.product_location %} 进行身份验证](#authentication-through-githubcom-with-additional-saml-access-restriction)
+- [使用 {% data variables.product.prodname_emus %} 和 SAML SSO 进行身份验证](#authentication-with-enterprise-managed-users-and-saml-sso)
-### Authentication through {% data variables.product.product_location %}
+### 通过 {% data variables.product.product_location %} 进行身份验证
-By default, each member must create a personal account on {% data variables.product.product_location %}. You grant access to your enterprise, and the member can access your enterprise's resources after signing into the account on {% data variables.product.product_location %}. The member manages the account, and can contribute to other enterprises, organizations, and repositories on {% data variables.product.product_location %}.
+默认情况下,每个成员都必须在 {% data variables.product.product_location %} 上创建个人帐户。 您授予对企业的访问权限,该成员可以在登录 {% data variables.product.product_location %} 上的帐户后访问您企业的资源。 该成员管理该帐户,并且可以为 {% data variables.product.product_location %} 上的其他企业、组织和存储库做出贡献。
-### Authentication through {% data variables.product.product_location %} with additional SAML access restriction
+### 通过具有附加 SAML 访问限制的 {% data variables.product.product_location %} 进行身份验证
-If you configure additional SAML access restriction, each member must create and manage a personal account on {% data variables.product.product_location %}. You grant access to your enterprise, and the member can access your enterprise's resources after both signing into the account on {% data variables.product.product_location %} and successfully authenticating with your SAML identity provider (IdP). The member can contribute to other enterprises, organizations, and repositories on {% data variables.product.product_location %} using their personal account. For more information about requiring SAML authentication for all access your enterprise's resources, see "[About SAML for enterprise IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam)."
+如果配置了其他 SAML 访问限制,则每个成员都必须在 {% data variables.product.product_location %} 上创建和管理个人帐户。 您授予对企业的访问权限,在 {% data variables.product.product_location %} 登录账户并使用 SAML 身份提供程序 (IdP) 成功进行身份验证后,成员可以访问您企业的资源。 成员可以使用其个人帐户向在 {% data variables.product.product_location %} 上的其他企业、组织和存储库做出贡献。 有关要求对所有访问企业资源进行 SAML 身份验证的更多信息,请参阅“[关于企业 IAM 的 SAML](/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam)”。
-If you use a standalone organization with {% data variables.product.product_name %}, or if you don't want to use SAML authentication for every organization in your enterprise, you can configure SAML for an individual organization. 更多信息请参阅“[关于使用 SAML 单点登录管理身份和访问](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)”。
+如果您对 {% data variables.product.product_name %} 使用独立组织,或者您不想对企业中的每个组织使用 SAML 身份验证,则可以为单个组织配置 SAML。 更多信息请参阅“[关于使用 SAML 单点登录管理身份和访问](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)”。
-### Authentication with {% data variables.product.prodname_emus %} and SAML SSO
+### 使用 {% data variables.product.prodname_emus %} 和 SAML SSO 进行身份验证
-If you need more control of the accounts for your enterprise members on {% data variables.product.product_location %}, you can use {% data variables.product.prodname_emus %}. With {% data variables.product.prodname_emus %}, you provision and manage accounts for your enterprise members on {% data variables.product.product_location %} using your IdP. Each member signs into an account that you create, and your enterprise manages the account. Contributions to the rest of {% data variables.product.prodname_dotcom_the_website %} are restricted. 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users)”。
+如果您需要增强控制您在 {% data variables.product.product_location %} 上的企业成员的帐户,则可以使用 {% data variables.product.prodname_emus %}。 借助 {% data variables.product.prodname_emus %},您可以使用 IdP 在 {% data variables.product.product_location %} 上为您的企业成员配置和管理帐户。 每个成员登录到您创建的帐户,您的企业将管理该帐户。 参与 {% data variables.product.prodname_dotcom_the_website %} 的其余部分受到限制。 更多信息请参阅“[关于 {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users)”。
{% elsif ghes %}
-Site administrators can decide how people authenticate to access a {% data variables.product.product_name %} instance. You can use {% data variables.product.product_name %}'s built-in authentication, or, if you want to centralize identity and access management for the web applications that your team uses, you can configure an external authentication method.
+站点管理员可以决定人员如何进行身份验证以访问 {% data variables.product.product_name %} 实例。 您可以使用 {% data variables.product.product_name %} 的内置身份验证,或者,如果要集中管理团队使用的 Web 应用程序的身份和访问,则可以配置外部身份验证方法。
-## Authentication methods for {% data variables.product.product_name %}
+## {% data variables.product.product_name %} 的身份验证方法
-The following authentication methods are available for {% data variables.product.product_name %}.
+以下身份验证方法可用于 {% data variables.product.product_name %}。
-- [Built-in authentication](#built-in-authentication)
-- [External authentication](#external-authentication)
+- [内置身份验证](#built-in-authentication)
+- [外部身份验证](#external-authentication)
-### Built-in authentication
+### 内置身份验证
-{% data reusables.enterprise_user_management.built-in-authentication-new-accounts %} To access your instance, people authenticate with the credentials for the account. 更多信息请参阅“[配置内置身份验证](/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication)”。
+{% data reusables.enterprise_user_management.built-in-authentication-new-accounts %} 要访问您的实例,用户需要使用帐户的凭证进行身份验证。 更多信息请参阅“[配置内置身份验证](/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication)”。
-### External authentication
+### 外部身份验证
-If you use an external directory or identity provider (IdP) to centralize access to multiple web applications, you may be able to configure external authentication for {% data variables.product.product_location %}. 更多信息请参阅以下文章。
+如果使用外部目录或身份提供程序 (IdP) 集中访问多个 Web 应用程序,则可以为 {% data variables.product.product_location %} 配置外部身份验证。 更多信息请参阅以下文章。
-- "[Using CAS for enterprise IAM](/admin/identity-and-access-management/using-cas-for-enterprise-iam)"
-- "[Using LDAP for enterprise IAM](/admin/identity-and-access-management/using-ldap-for-enterprise-iam)"
-- "[Using SAML for enterprise IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam)"
+- “[将 CAS 用于企业 IAM](/admin/identity-and-access-management/using-cas-for-enterprise-iam)”
+- “[将 LDAP 用于企业 IAM](/admin/identity-and-access-management/using-ldap-for-enterprise-iam)”
+- “[将 SAML 用于企业 IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam)”
-If you choose to use external authentication, you can also configure fallback authentication for people who don't have an account on your external authentication provider. For example, you may want to grant access to a contractor or machine user. For more information, see "[Allowing built-in authentication for users outside your provider](/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider)."
+如果选择使用外部身份验证,还可以为在外部身份验证提供程序上没有帐户的人员配置回退身份验证。 例如,您可能希望向承包商或计算机用户授予访问权限。 更多信息请参阅“[允许对提供程序覆盖范围以外的用户进行内置身份验证](/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider)”。
{% elsif ghae %}
-{% data variables.product.product_name %} uses SAML SSO for authentication. Enterprise owners must configure SAML SSO with a SAML identity provider (IdP) during initialization. For more information, see "[About SAML for enterprise IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam)."
+{% data variables.product.product_name %} 使用 SAML SSO 进行身份验证。 企业所有者必须在初始化期间使用 SAML 身份提供程序 (IdP) 配置 SAML SSO。 更多信息请参阅“[关于企业 IAM 的 SAML](/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam)”。
{% endif %}
-## About access control
+## 关于访问控制
-{% ifversion ghec or ghae %}Members of your enterprise{% elsif ghes %}People with access to {% data variables.product.product_location %}{% endif %} can manage access to {% ifversion ghec %}your enterprise's resources{% elsif ghae %}your enterprise{% elsif ghes %}resources on your instance{% endif %} by using organization membership, teams, and roles. 更多信息请参阅以下文章。
+{% ifversion ghec or ghae %}企业成员{% elsif ghes %}有权访问 {% data variables.product.product_location %} 的人员{% endif %}可以使用组织成员身份、团队和角色来管理对实例上的 {% ifversion ghec %}企业资源{% elsif ghae %}企业{% elsif ghes %}资源{% endif %} 的访问权限。 更多信息请参阅以下文章。
{%- ifversion ghec %}
- “[邀请用户加入您的组织](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)”
{%- elsif ghes or ghae %}
-- "[Adding people to your organization](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)"
+- “[向组织添加人员](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)”
{%- endif %}
- "[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)"
- "[关于团队](/organizations/organizing-members-into-teams/about-teams)"
@@ -93,5 +93,5 @@ If you choose to use external authentication, you can also configure fallback au
- "[{% data variables.product.company_short %} 帐户的类型](/get-started/learning-about-github/types-of-github-accounts)"
- “[关于企业帐户](/admin/overview/about-enterprise-accounts)”
{%- ifversion ghec %}
-- "[Can I create accounts for people in my organization?](/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization)"
+- “[是否可以为组织中的人员创建帐户?](/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization)”
{% endif %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider.md
index d69073b7f5..dcba8765de 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider.md
@@ -1,6 +1,6 @@
---
-title: Allowing built-in authentication for users outside your provider
-intro: 'You can configure fallback authentication to allow built-in authentication for people who don''t have an account on your CAS, LDAP, or SAML authentication provider.'
+title: 允许对提供程序覆盖范围以外的用户进行内置身份验证
+intro: 您可以配置回退身份验证,以允许对在 CAS、LDAP 或 SAML 身份验证提供程序上没有帐户的人员进行内置身份验证。
redirect_from:
- /enterprise/admin/user-management/allowing-built-in-authentication-for-users-outside-your-identity-provider
- /enterprise/admin/authentication/allowing-built-in-authentication-for-users-outside-your-identity-provider
@@ -15,16 +15,16 @@ topics:
- Authentication
- Enterprise
- Identity
-shortTitle: Fallback authentication
+shortTitle: 回退身份验证
---
-## About built-in authentication for users outside your provider
+## 关于对提供程序覆盖范围以外的用户进行内置身份验证
-By default, when you enable external authentication for {% data variables.product.product_name %}, built-in authentication is disabled for your instance. For more information, see "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#external-authentication)."
+默认情况下,当您为 {% data variables.product.product_name %} 启用外部身份验证时,将为您的实例禁用内置身份验证。 更多信息请参阅“[关于企业的身份验证](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#external-authentication)”。
-If you're unable to add specific accounts to your external authentication provider, such as accounts for contractors or machine users, you can configure fallback authentication. Fallback authentication allows built-in authentication for outside users and to access a fallback account if your authentication provider is unavailable.
+如果无法将特定帐户添加到外部身份验证提供程序(如承包商或计算机用户的帐户),则可以配置回退身份验证。 回退身份验证允许外部用户进行内置身份验证,并在身份验证提供程序不可用时访问回退帐户。
-If you configure built-in authentication and a person successfully authenticates with SAML or CAS, the person will no longer have the option to authenticate with a username and password. 如果用户使用 LDAP 成功地完成身份验证,凭据将不再被视为内部凭据。
+如果配置了内置身份验证,并且某人成功使用 SAML 或 CAS 进行身份验证,则该人员将不再有权选择使用用户名和密码进行身份验证。 如果用户使用 LDAP 成功地完成身份验证,凭据将不再被视为内部凭据。
{% warning %}
@@ -32,7 +32,7 @@ If you configure built-in authentication and a person successfully authenticates
{% endwarning %}
-## Configuring built-in authentication for users outside your provider
+## 为您的提供程序覆盖范围外的用户配置内置身份验证
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
@@ -44,7 +44,7 @@ If you configure built-in authentication and a person successfully authenticates
{% data reusables.enterprise_user_management.two_factor_auth_header %}
{% data reusables.enterprise_user_management.2fa_is_available %}
-## Inviting users outside your provider to authenticate to your instance
+## 邀请您的提供程序覆盖范围外的用户在您的实例上进行身份验证
在用户接受邀请后,他们可以使用用户名和密码登录,无需通过 IdP。
@@ -55,6 +55,6 @@ If you configure built-in authentication and a person successfully authenticates
## 延伸阅读
-- "[Using CAS for enterprise IAM](/admin/identity-and-access-management/using-cas-for-enterprise-iam)"
-- "[Using LDAP for enterprise IAM](/admin/identity-and-access-management/using-ldap-for-enterprise-iam)"
-- "[Using SAML for enterprise IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam)"
+- “[将 CAS 用于企业 IAM](/admin/identity-and-access-management/using-cas-for-enterprise-iam)”
+- “[将 LDAP 用于企业 IAM](/admin/identity-and-access-management/using-ldap-for-enterprise-iam)”
+- “[将 SAML 用于企业 IAM](/admin/identity-and-access-management/using-saml-for-enterprise-iam)”
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/changing-authentication-methods.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/changing-authentication-methods.md
index 911267a5c0..c6b2386926 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/changing-authentication-methods.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/changing-authentication-methods.md
@@ -40,4 +40,4 @@ shortTitle: 更改身份验证方法
* **双重身份验证**:{% data reusables.enterprise_user_management.external_auth_disables_2fa %}
-* **Fallback authentication for users with no account on your external authentication provider:** You can invite users to authenticate to {% data variables.product.product_location %} without adding them to your identity provider. For more information, see "[Allowing built-in authentication for users outside your provider](/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider)."
+* **外部身份验证提供程序上没有帐户的用户的回退身份验证:** 您可以邀请用户向 {% data variables.product.product_location %} 进行身份验证,而无需将其添加到身份提供程序。 更多信息请参阅“[允许对提供程序覆盖范围以外的用户进行内置身份验证](/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider)”。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md
index 84546ff79d..1bd0d7c9c0 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication.md
@@ -1,7 +1,7 @@
---
title: Username considerations for external authentication
shortTitle: Username considerations
-intro: '{% ifversion ghes or ghec %}When you use {% ifversion ghes %}CAS, LDAP, or SAML for authentication{% elsif ghec %}{% data variables.product.prodname_emus %}{% endif %}, {% endif %}{% data variables.product.product_name %} follows certain rules to determine the username for each user account {% ifversion ghec or ghae %}in your enterprise{% elsif ghes %}on your instance{% endif %}.'
+intro: "{% ifversion ghes or ghec %}When you use {% ifversion ghes %}CAS, LDAP, or SAML for authentication{% elsif ghec %}{% data variables.product.prodname_emus %}{% endif %}, {% endif %}{% data variables.product.product_name %} follows certain rules to determine the username for each user account {% ifversion ghec or ghae %}in your enterprise{% elsif ghes %}on your instance{% endif %}."
miniTocMaxHeadingLevel: 3
versions:
ghec: '*'
@@ -16,6 +16,14 @@ topics:
- SSO
---
+{% ifversion ghec %}
+{% note %}
+
+**Note:** This article only applies to {% data variables.product.prodname_emus %}. If you use {% data variables.product.prodname_ghe_cloud %} without {% data variables.product.prodname_emus %}, usernames are created by users, not {% data variables.product.prodname_dotcom %}.
+
+{% endnote %}
+{% endif %}
+
## About usernames with external authentication
{% ifversion ghes %}
@@ -26,9 +34,9 @@ When you use external authentication, {% data variables.product.product_location
{% elsif ghec %}
-If you use an enterprise with {% data variables.product.prodname_emus %}, members of your enterprise authenticate to access {% data variables.product.prodname_dotcom %} through your SAML identity provider (IdP). For more information, see "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#authentication-methods-for-github-enterprise-server)."
+If you use an enterprise with {% data variables.product.prodname_emus %}, members of your enterprise authenticate to access {% data variables.product.prodname_dotcom %} through your SAML identity provider (IdP). For more information, see "[About {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users)" and "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#authentication-methods-for-github-enterprise-server)."
-{% data variables.product.product_name %} automatically creates a username for each person when the person signs in through your IdP for the first time.
+{% data variables.product.product_name %} automatically creates a username for each person when their user account is provisioned via SCIM, by normalizing an identifier provided by your IdP. If multiple identifiers are normalized into the same username, a username conflict occurs, and only the first user account is created. You can resolve username conflicts by making a change in your IdP so that the normalized usernames will be unique.
{% elsif ghae %}
@@ -36,46 +44,114 @@ If you use an enterprise with {% data variables.product.prodname_emus %}, member
{% endif %}
+{% ifversion ghec %}
+## About usernames for {% data variables.product.prodname_managed_users %}
+
+When your {% data variables.product.prodname_emu_enterprise %} is created, you will choose a short code that will be used as the suffix for your enterprise members' usernames. {% data reusables.enterprise-accounts.emu-shortcode %} The setup user who configures SAML SSO has a username in the format of **@SHORT-CODE_admin**.
+
+When you provision a new user from your identity provider, the new {% data variables.product.prodname_managed_user %} will have a {% data variables.product.prodname_dotcom %} username in the format of **@IDP-USERNAME_SHORT-CODE**. The IDP-USERNAME component is formed by normalizing the SCIM `userName` attribute value sent from the IdP.
+
+| Identity provider | {% data variables.product.prodname_dotcom %} username |
+|-----------------------------------|----------------------|
+| Azure Active Directory (Azure AD) | _IDP-USERNAME_ is formed by normalizing the characters preceding the `@` character in the UPN (User Principal Name), which does not include the `#EXT#` for guest accounts. |
+| Okta | _IDP-USERNAME_ is the normalized username attribute provided by the IdP. |
+
+These rules may result in your IdP providing the same _IDP-USERNAME_ for multiple users. For example, for Azure AD, the following UPNs will result in the same username:
+
+- `bob@contoso.com`
+- `bob@fabrikam.com`
+- `bob#EXT#fabrikamcom@contoso.com`
+
+This will cause a username conflict, and only the first user will be provisioned. For more information, see "[Resolving username conflicts](#resolving-username-conflicts)."
+{% endif %}
+
+Usernames{% ifversion ghec %}, including underscore and short code,{% endif %} must not exceed 39 characters.
+
## About username normalization
Usernames for user accounts on {% ifversion ghes or ghae %}{% data variables.product.product_name %}{% elsif ghec %}{% data variables.product.prodname_dotcom_the_website %}{% endif %} can only contain alphanumeric characters and dashes (`-`).
-{% ifversion ghec or ghes %}When you configure {% ifversion ghes %}CAS, LDAP, or {% endif %}SAML authentication, {% endif %}{% data variables.product.product_name %} uses an identifier from the user account on your {% ifversion ghes %}external authentication provider{% elsif ghec or ghae %}IdP{% endif %} to determine the username for the corresponding user account on {% ifversion ghes or ghae %}{% data variables.product.product_name %}{% elsif ghec %}{% data variables.product.prodname_dotcom_the_website %}{% endif %}. If the identifier for the account on your provider includes unsupported characters, {% data variables.product.product_name %} will normalize the username per the following rules.
+{% ifversion ghec %}
+When you configure SAML authentication, {% data variables.product.product_name %} uses the SCIM `userName` attribute value sent from the IdP to determine the username for the corresponding user account on {% data variables.product.prodname_dotcom_the_website %}. If this value includes unsupported characters, {% data variables.product.product_name %} will normalize the username per the following rules.
+{% elsif ghes %}
+When you configure CAS, LDAP, or SAML authentication, {% data variables.product.product_name %} uses an identifier from the user account on your external authentication provider to determine the username for the corresponding user account on {% data variables.product.product_name %}. If the identifier includes unsupported characters, {% data variables.product.product_name %} will normalize the username per the following rules.
+{% elsif ghae %}
+When you configure SAML authentication, {% data variables.product.product_name %} uses an identifier from the user account on your IdP to determine the username for the corresponding user account on {% data variables.product.product_name %}. If the identifier includes unsupported characters, {% data variables.product.product_name %} will normalize the username per the following rules.
+{% endif %}
-1. {% data variables.product.product_name %} will normalize any non-alphanumeric character in your account's username into a dash. For example, a username of `mona.the.octocat` will be normalized to `mona-the-octocat`. 请注意,标准化的用户名也不能以短划线开头或结尾。 它们还不能包含两个连续的短划线。
+1. {% data variables.product.product_name %} will normalize any non-alphanumeric character in your account's username into a dash. For example, a username of `mona.the.octocat` will be normalized to `mona-the-octocat`. Note that normalized usernames also can't start or end with a dash. They also can't contain two consecutive dashes.
-1. 创建自电子邮件地址的用户名使用前置 `@` 字符的标准化字符创建。
+1. Usernames created from email addresses are created from the normalized characters that precede the `@` character.
-1. If multiple accounts are normalized into the same {% data variables.product.product_name %} username, only the first user account is created. 使用相同用户名的后续用户无法登录。
+1. If multiple accounts are normalized into the same {% data variables.product.product_name %} username, only the first user account is created. Subsequent users with the same username won't be able to sign in. {% ifversion ghec %}For more information, see "[Resolving username conflicts](#resolving-username-conflicts)."{% endif %}
### Examples of username normalization
-| Identifier on provider | Normalized username for {% data variables.product.product_location %} | 结果 |
-|:----------------------- |:--------------------------------------------------------------------- |:----------------------------- |
-| The.Octocat | `the-octocat` | 此用户名已成功创建。 |
-| !The.Octocat | `-the-octocat` | 此用户名无法创建,因其以短划线开头。 |
-| The.Octocat! | `the-octocat-` | 此用户名无法创建,因其以短划线结尾。 |
-| The!!Octocat | `the--octocat` | 此用户名无法创建,因其包含两个连续的短划线。 |
-| The!Octocat | `the-octocat` | 此用户名无法创建。 虽然标准化的用户名有效,但它已经存在。 |
-| The.Octocat@example.com | `the-octocat` | 此用户名无法创建。 虽然标准化的用户名有效,但它已经存在。 |
+| Identifier on provider | Normalized username on {% data variables.product.prodname_dotcom %} | Result |
+| :- | :- | :- |
+| The.Octocat | `the-octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is created successfully. |
+| !The.Octocat | `-the-octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created, because it starts with a dash. |
+| The.Octocat! | `the-octocat-{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created, because it ends with a dash. |
+| The!!Octocat | `the--octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created, because it contains two consecutive dashes. |
+| The!Octocat | `the-octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created. Although the normalized username is valid, it already exists. |
+| `The.Octocat@example.com` | `the-octocat{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created. Although the normalized username is valid, it already exists. |
+| `mona.lisa.the.octocat.from.github.united.states@example.com` | `mona-lisa-the-octocat-from-github-united-states{% ifversion ghec %}_SHORT-CODE{% endif %}` | This username is not created, because it exceeds the 39-character limit. |
+{% ifversion not ghec %}
### About username normalization with SAML
-{% ifversion ghec or ghes %}If you {% ifversion ghec %}use an enterprise with {% data variables.product.prodname_emus %}, you must use SAML authentication. {% else %}configure SAML authentication for {% data variables.product.product_location %}, {% endif %}{% endif %}{% data variables.product.product_name %} determines each person's username by one of the following assertions in the SAML response, ordered by priority.
+{% ifversion ghes %}If you configure SAML authentication for {% data variables.product.product_location %}, {% endif %}{% data variables.product.product_name %} determines each person's username by one of the following assertions in the SAML response, ordered by descending priority.
1. The custom `username` attribute, if defined and present
-1. `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name` 断言(如果存在)
-1. `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress` 断言(如果存在)
-1. `NameID` 元素
+1. An `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name` assertion, if present
+1. An `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress` assertion, if present
+1. The `NameID` element
{% data variables.product.product_name %} requires the `NameID` element even if other attributes are present. For more information, see "[SAML configuration reference](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#saml-attributes)."
-{% data variables.product.product_name %} creates a mapping between the `NameID` from the IdP and the username {% ifversion ghec or ghae %}in{% elsif ghes %}on{% endif %} {% data variables.product.product_location %}, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
+{% data variables.product.product_name %} creates a mapping between the `NameID` from the IdP and the username {% ifversion ghae %}in{% else %}on{% endif %} {% data variables.product.product_location %}, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
{% ifversion ghes %}
{% note %}
-**Note**: If the `NameID` for a user does change on the IdP, the person will see an error message when {% ifversion ghec %}authenticating through your IdP to access your resources on{% else %}signing into{% endif} {% data variables.product.product_location %}. To restore the person's access, you'll need to update the user account's `NameID` mapping. For more information, see "[Updating a user's SAML `NameID`](/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid)."
+**Note**: If the `NameID` for a user does change on the IdP, the person will see an error message when signing into {% data variables.product.product_location %}. To restore the person's access, you'll need to update the user account's `NameID` mapping. For more information, see "[Updating a user's SAML `NameID`](/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid)."
{% endnote %}
{% endif %}
+{% endif %}
+
+{% ifversion ghec %}
+## Resolving username conflicts
+
+When a new user is being provisioned, if the user's normalized username conflicts with an existing user in the enterprise, the provisioning attempt will fail with a `409` error.
+
+To resolve this problem, you must make a change in your IdP so that the normalized usernames will be unique. If you cannot change the identifier that's being normalized, you can change the attribute mapping for the `userName` attribute. If you change the attribute mapping, usernames of existing {% data variables.product.prodname_managed_users %} will be updated, but nothing else about the accounts will change, including activity history.
+
+{% note %}
+
+**Note:** {% data variables.contact.github_support %} cannot provide assistance with customizing attribute mappings or configuring custom expressions. You can contact your IdP with any questions.
+
+{% endnote %}
+
+### Resolving username conflicts with Azure AD
+
+To resolve username conflicts in Azure AD, either modify the User Principal Name value for the conflicting user or modify the attribute mapping for the `userName` attribute. If you modify the attribute mapping, you can choose an existing attribute or use an expression to ensure that all provisioned users have a unique normalized alias.
+
+1. In Azure AD, open the {% data variables.product.prodname_emu_idp_application %} application.
+1. In the left sidebar, click **Provisioning**.
+1. Click **Edit Provisioning**.
+1. Expand **Mappings**, then click **Provision Azure Active Directory Users**.
+1. Click the {% data variables.product.prodname_dotcom %} `userName` attribute mapping.
+1. Change the attribute mapping.
+ - To map an existing attribute in Azure AD to the `userName` attribute in {% data variables.product.prodname_dotcom %}, click your desired attribute field. Then, save and wait for a provisioning cycle to occur within about 40 minutes.
+ - To use an expression instead of an existing attribute, change the Mapping type to "Expression", then add a custom expression that will make this value unique for all users. For example, you could use `[FIRST NAME]-[LAST NAME]-[EMPLOYEE ID]`. For more information, see [Reference for writing expressions for attribute mappings in Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/app-provisioning/functions-for-customizing-application-data) in Microsoft Docs.
+
+### Resolving username conflicts with Okta
+
+To resolve username conflicts in Okta, update the attribute mapping settings for the {% data variables.product.prodname_emu_idp_application %} application.
+
+1. In Okta, open the {% data variables.product.prodname_emu_idp_application %} application.
+1. Click **Sign On**.
+1. In the "Settings" section, click **Edit**.
+1. Update the "Application username format."
+{% endif %}
\ No newline at end of file
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication.md b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication.md
index 059d5c1fc0..6b21ccd2fe 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/configuring-built-in-authentication.md
@@ -1,6 +1,6 @@
---
title: 配置内置身份验证
-intro: 'When you use the default authentication method, all authentication details are stored on {% data variables.product.product_location %}.'
+intro: '当您使用默认身份验证方法时,所有身份验证详细信息都将存储在 {% data variables.product.product_location %} 中。'
permissions: 'Site administrators can configure authentication for a {% data variables.product.product_name %} instance.'
redirect_from:
- /enterprise/admin/user-management/using-built-in-authentication
@@ -16,14 +16,14 @@ topics:
- Authentication
- Enterprise
- Identity
-shortTitle: Configure built-in authentication
+shortTitle: 配置内置身份验证
---
-## About built-in authentication
+## 关于内置身份验证
-By default, {% data variables.product.product_name %} uses built-in authentication. Each person creates a user account on {% data variables.product.product_location %} from an invitation or by signing up, and then authenticates with the credentials for the account to access your instance. Your {% data variables.product.product_name %} instance stores the authentication information for the account.
+默认情况下, {% data variables.product.product_name %} 使用内置身份验证。 每个人在 {% data variables.product.product_location %} 上通过邀请或注册创建一个用户帐户,然后使用该帐户的凭据进行身份验证以访问您的实例。 您的 {% data variables.product.product_name %} 实例将存储帐户的身份验证信息。
-You can prevent unauthenticated people from creating new user accounts on your instance. For more information, see "[Disabling unauthenticated sign-ups](/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups)."
+您可以阻止未经身份验证的人员在您的实例上创建新的用户帐户。 更多信息请参阅“[禁用未经身份验证的注册](/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups)”。
{% data reusables.enterprise_user_management.alternatively-enable-external-authentication %}
@@ -48,7 +48,7 @@ You can prevent unauthenticated people from creating new user accounts on your i
-After you configure built-in authentication and create your administrative account, you can invite people to create accounts and use your instance. For more information, see "[Inviting people to use your instance](/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance)."
+配置内置身份验证并创建管理帐户后,您可以邀请他人创建帐户并使用您的实例。 更多信息请参阅“[邀请人们使用您的实例](/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance)”。
## 延伸阅读
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups.md b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups.md
index 254288e3db..52ef948e0b 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups.md
@@ -7,7 +7,7 @@ redirect_from:
- /admin/authentication/disabling-unauthenticated-sign-ups
- /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/disabling-unauthenticated-sign-ups
- /admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/disabling-unauthenticated-sign-ups
-intro: 'If you''re using built-in authentication for {% data variables.product.product_location %}, you can block unauthenticated people from creating new user accounts on your instance.'
+intro: '如果您对 {% data variables.product.product_location %} 使用内置身份验证,则可以阻止未经身份验证的人员在您的实例上创建新的用户帐户。'
permissions: 'Site administrators can disable unauthenticated sign-ups on a {% data variables.product.product_name %} instance.'
versions:
ghes: '*'
@@ -17,12 +17,12 @@ topics:
- Authentication
- Enterprise
- Identity
-shortTitle: Block unauthenticated sign-up
+shortTitle: 阻止未经身份验证的注册
---
-## About unauthenticated sign-ups
+## 关于未经身份验证的注册
-{% data reusables.enterprise_user_management.built-in-authentication-new-accounts %} {% data reusables.enterprise_user_management.unauthenticated-sign-ups %} You can disable unauthenticated sign-ups and require an invitation to create a new user account on your instance.
+{% data reusables.enterprise_user_management.built-in-authentication-new-accounts %} {% data reusables.enterprise_user_management.unauthenticated-sign-ups %} 您可以禁用未经身份验证的注册,并需要邀请才能在您的实例上创建新的用户帐户。
{% data reusables.enterprise_user_management.alternatively-enable-external-authentication %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/index.md b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/index.md
index f8dabada74..800e147ee6 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/index.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/index.md
@@ -1,7 +1,7 @@
---
title: 使用内置身份验证
-shortTitle: Built-in authentication
-intro: 'If you don''t use a centralized, external system for your users'' identity, you can use built-in authentication to allow {% data variables.product.prodname_ghe_server %} to manage accounts and perform local authentication.'
+shortTitle: 内置身份验证
+intro: '如果不对用户身份使用集中式外部系统,则可以使用内置身份验证来允许 {% data variables.product.prodname_ghe_server %} 管理帐户和执行本地身份验证。'
versions:
ghes: '*'
topics:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance.md b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance.md
index 2fa8e49b56..8260ce96c7 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-built-in-authentication/inviting-people-to-use-your-instance.md
@@ -1,6 +1,6 @@
---
-title: Inviting people to use your instance
-intro: 'When you use built-in authentication for {% data variables.product.product_name %}, you can invite people by email address to create a user account on your instance.'
+title: 邀请他人使用您的实例
+intro: '当您对 {% data variables.product.product_name %} 使用内置身份验证时,您可以按电子邮件地址邀请人员在您的实例上创建用户帐户。'
versions:
ghes: '*'
permissions: 'Enterprise owners can invite people to create a user account on a {% data variables.product.product_name %} instance.'
@@ -10,21 +10,21 @@ topics:
- Authentication
- Enterprise
- Identity
-shortTitle: Invite people
+shortTitle: 邀请他人
---
-## About invitations for new users
+## 关于新用户的邀请
{% data reusables.enterprise_user_management.built-in-authentication-new-accounts %} {% data reusables.enterprise_user_management.unauthenticated-sign-ups %}
-You can disable unauthenticated sign-ups and require an invitation to create a new user account on your instance. For more information, see "[Disabling unauthenticated sign-ups](/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups)."
+您可以禁用未经身份验证的注册,并需要邀请才能在您的实例上创建新的用户帐户。 更多信息请参阅“[禁用未经身份验证的注册](/admin/identity-and-access-management/using-built-in-authentication/disabling-unauthenticated-sign-ups)”。
{% data reusables.enterprise_user_management.alternatively-enable-external-authentication %}
-## Inviting people to create a user account
+## 邀请他人创建用户帐户
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.invite-user-sidebar-tab %}
{% data reusables.enterprise_site_admin_settings.invite-user-reset-link %}
-If you've configured email for notifications on {% data variables.product.product_location %}, your instance will send the invitation to the provided email address. 更多信息请参阅“[配置电子邮件通知](/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications)”。
+如果您已在 {% data variables.product.product_location %} 上为通知配置了电子邮件,则您的实例会将邀请发送到提供的电子邮件地址。 更多信息请参阅“[配置电子邮件通知](/admin/configuration/configuring-your-enterprise/configuring-email-for-notifications)”。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/index.md b/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/index.md
index d69a4b62dc..f5e24e4836 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/index.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/index.md
@@ -1,7 +1,7 @@
---
-title: Using CAS for enterprise IAM
-shortTitle: CAS for enterprise IAM
-intro: 'You can centrally manage accounts and access to {% data variables.product.product_location %} by integrating with your existing CAS identity provider (IdP).'
+title: 将 CAS 用于企业 IAM
+shortTitle: 企业 IAM 的 CAS
+intro: '您可以通过与现有的 CAS 身份提供程序 (IdP) 集成来集中管理帐户和对 {% data variables.product.product_location %} 的访问。'
versions:
ghes: '*'
children:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/using-cas.md b/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/using-cas.md
index 8bd4b09080..6fe36967c9 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/using-cas.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-cas-for-enterprise-iam/using-cas.md
@@ -8,7 +8,7 @@ redirect_from:
- /admin/authentication/using-cas
- /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-cas
- /admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-cas
-intro: 'If you use Central Authentication Service (CAS) to centralize access to multiple web applications, you can integrate {% data variables.product.product_name %} by configuring CAS authentication for your instance.'
+intro: '如果您使用中央身份验证服务 (CAS) 集中访问多个 Web 应用程序,则可以通过为实例配置 CAS 身份验证来集成 {% data variables.product.product_name %}。'
versions:
ghes: '*'
type: how_to
@@ -20,19 +20,19 @@ topics:
- SSO
---
-## About CAS authentication for {% data variables.product.product_name %}
+## 关于 {% data variables.product.product_name %} 的 CAS 身份验证
-CAS is a single sign-on (SSO) protocol that centralizes authentication to multiple web applications. For more information, see "[Central Authentication Service](https://en.wikipedia.org/wiki/Central_Authentication_Service)" on Wikipedia.
+CAS 是一种单点登录 (SSO) 协议,可将身份验证集中到多个 Web 应用程序。 更多信息请参阅维基百科上的“[中央身份验证服务](https://en.wikipedia.org/wiki/Central_Authentication_Service)”。
-After you configure CAS, people who use {% data variables.product.product_location %} must use a personal access token to authenticate API or Git requests over HTTP(S). CAS credentials cannot be used to authenticate these requests. 更多信息请参阅“[创建个人访问令牌](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)”。
+配置 CAS 后,使用 {% data variables.product.product_location %} 的人员必须使用个人访问令牌对通过 HTTP 的 API 或 Git 请求进行身份验证。 CAS 凭据不能用于对这些请求进行身份验证。 更多信息请参阅“[创建个人访问令牌](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)”。
-If you configure CAS, people with accounts on your identity provider (IdP) do not consume a user license until the person signs into {% data variables.product.product_location %}.
+如果您配置 CAS,则在您的身份提供程序 (IdP) 上拥有帐户的用户在登录到 {% data variables.product.product_location %} 之前不会使用用户许可证。
{% data reusables.enterprise_user_management.built-in-authentication %}
## 使用 CAS 时的用户名考量因素
-{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
+{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} 更多信息请参阅“[外部身份验证的用户名注意事项](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)”。
## CAS 属性
@@ -49,8 +49,8 @@ If you configure CAS, people with accounts on your identity provider (IdP) do no
{% data reusables.enterprise_management_console.authentication %}
3. 选择 **CAS**。
- 
+ 
4. {% data reusables.enterprise_user_management.built-in-authentication-option %}
- 
+ 
5. 在 **Server URL** 字段中,输入您的 CAS 服务器的完整 URL。 如果您的 CAS 服务器使用无法由 {% data variables.product.prodname_ghe_server %} 验证的证书,您可以使用 `ghe-ssl-ca-certificate-install` 命令将其作为可信证书安装。 更多信息请参阅“[命令行实用程序](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-ssl-ca-certificate-install)”。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users.md b/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users.md
index fc23d056e4..c4c01a9af9 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users.md
@@ -56,6 +56,7 @@ To use {% data variables.product.prodname_emus %}, you need a separate type of e
* Other {% data variables.product.prodname_dotcom %} users cannot see, mention, or invite a {% data variables.product.prodname_managed_user %} to collaborate.
* {% data variables.product.prodname_managed_users_caps %} can only own private repositories and {% data variables.product.prodname_managed_users %} can only invite other enterprise members to collaborate on their owned repositories.
* Only private and internal repositories can be created in organizations owned by an {% data variables.product.prodname_emu_enterprise %}, depending on organization and enterprise repository visibility settings.
+* {% data variables.product.prodname_managed_users_caps %} are limited in their use of {% data variables.product.prodname_pages %}. For more information, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#limitations-for-enterprise-managed-users)."
## About enterprises with managed users
@@ -90,17 +91,8 @@ The setup user's username is your enterprise's shortcode suffixed with `_admin`.
## Usernames and profile information
-When your {% data variables.product.prodname_emu_enterprise %} is created, you will choose a short code that will be used as the suffix for your enterprise member's usernames. {% data reusables.enterprise-accounts.emu-shortcode %} The setup user who configures SAML SSO has a username in the format of **@SHORT-CODE_admin**.
+{% data variables.product.product_name %} automatically creates a username for each person by normalizing an identifier provided by your IdP. For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
-When you provision a new user from your identity provider, the new {% data variables.product.prodname_managed_user %} will have a {% data variables.product.prodname_dotcom %} username in the format of **@IDP-USERNAME_SHORT-CODE**.
-
-| Identity provider | {% data variables.product.prodname_dotcom %} username |
-|-----------------------------------|----------------------|
-| Azure Active Directory (Azure AD) | - _IDP-USERNAME_ is formed by normalizing the characters preceding the `@` character in the UPN (User Principal Name).
- Guest accounts will have `#EXT` removed from the UPN.
|
-| Okta | - _IDP-USERNAME_ is the normalized username attribute provided by the IdP.
|
-
-It's possible for a conflict to occur when provisioning users if the unique parts of the username provided by your IdP are removed when it is normalized. If you are unable to provision a user due to a username conflict, you should modify the username provided by your IdP.
-
-The username of the new account provisioned on {% data variables.product.prodname_dotcom %}, including underscore and short code, must not exceed 39 characters.
+A conflict may occur when provisioning users if the unique parts of the identifier provided by your IdP are removed during normalization. If you're unable to provision a user due to a username conflict, you should modify the username provided by your IdP. For more information, see "[Resolving username conflicts](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication#resolving-username-conflicts)."
The profile name and email address of a {% data variables.product.prodname_managed_user %} is also provided by the IdP. {% data variables.product.prodname_managed_users_caps %} cannot change their profile name or email address on {% data variables.product.prodname_dotcom %}.
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/index.md b/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/index.md
index 86f5e6ae8e..2cedc40fa8 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/index.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/index.md
@@ -1,6 +1,6 @@
---
-title: Using Enterprise Managed Users and SAML for IAM
-shortTitle: Enterprise Managed Users
+title: 使用适用于 IAM 的企业托管用户和 SAML
+shortTitle: 企业托管用户
product: '{% data reusables.gated-features.emus %}'
intro: 您可以使用身份提供程序管理身份和访问权限,并预配只能参与您的企业的帐户。
redirect_from:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/index.md b/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/index.md
index 83a3cf2430..6d07597103 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/index.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/index.md
@@ -1,7 +1,7 @@
---
-title: Using LDAP for enterprise IAM
-shortTitle: LDAP for enterprise IAM
-intro: You can centrally manage accounts and access to {% data variables.product.product_location %} by integrating with your existing LDAP directory.
+title: 将 LDAP 用于企业 IAM
+shortTitle: 企业 IAM 的 LDAP
+intro: '您可以通过与现有 LDAP 目录集成来集中管理帐户和对 {% data variables.product.product_location %} 的访问。'
versions:
ghes: '*'
children:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md b/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md
index f6007b2e3d..7eac3ac4c0 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md
@@ -11,7 +11,7 @@ redirect_from:
- /admin/authentication/using-ldap
- /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-ldap
- /admin/identity-and-access-management/authenticating-users-for-your-github-enterprise-server-instance/using-ldap
-intro: 'If you use Lightweight Directory Access Protocol (LDAP) to centralize access across applications, you can integrate {% data variables.product.product_name %} by configuring LDAP authentication for your instance.'
+intro: '如果您使用轻量级目录访问协议 (LDAP) 来集中访问应用程序,则可以通过为实例配置 LDAP 身份验证来集成 {% data variables.product.product_name %}。'
versions:
ghes: '*'
type: how_to
@@ -22,11 +22,11 @@ topics:
- Identity
---
-## About LDAP authentication for {% data variables.product.product_name %}
+## 关于 {% data variables.product.product_name %} 的 LDAP 身份验证
-LDAP is a popular application protocol for access and maintenance of directory information services, and is one of the most common protocols for integration of third-party software with large company user directories. For more information, see "[Lightweight Directory Access Protocol](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol)" on Wikipedia.
+LDAP 是用于访问和维护目录信息服务的常用应用程序协议,是将第三方软件与大型公司用户目录集成的最常见协议之一。 更多信息请参阅维基百科上的“[轻量级目录访问协议](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol)”。
-If you use an LDAP directory for centralized authentication, you can configure LDAP authentication for the people who use {% data variables.product.product_location %}.
+如果使用 LDAP 目录进行集中式身份验证,则可以为使用 {% data variables.product.product_location %} 的人员配置 LDAP 身份验证。
{% data reusables.enterprise_user_management.built-in-authentication %}
@@ -43,7 +43,7 @@ If you use an LDAP directory for centralized authentication, you can configure L
## 使用 LDAP 时的用户名考量因素
-{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
+{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} 更多信息请参阅“[外部身份验证的用户名注意事项](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)”。
## 在 {% data variables.product.product_location %} 上配置 LDAP
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md
index a7eeceb500..c419d4dd1d 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md
@@ -28,19 +28,19 @@ redirect_from:
{% ifversion ghec %}
-{% data reusables.saml.dotcom-saml-explanation %} {% data reusables.saml.about-saml-enterprise-accounts %} 更多信息请参阅“[为企业配置 SAML 单点登录](/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise)”。
+{% data reusables.saml.dotcom-saml-explanation %} {% data reusables.saml.about-saml-enterprise-accounts %} For more information, see "[Configuring SAML single sign-on for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise)."
If your enterprise members manage their own personal accounts on {% data variables.product.product_location %}, you can configure SAML authentication as an additional access restriction for your enterprise or organization. Alternatively, you can provision and manage the accounts of your enterprise members on {% data variables.product.product_location %} by using an enterprise account with {% data variables.product.prodname_emus %} enabled. For more information, see "[About authentication for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#authentication-methods-for-github-enterprise-cloud)."
-{% data reusables.enterprise-accounts.about-recovery-codes %} 更多信息请参阅“[管理企业的恢复代码](/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise)”。
+{% data reusables.enterprise-accounts.about-recovery-codes %} For more information, see "[Managing recovery codes for your enterprise](/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise)."
-启用 SAML SSO 后,根据使用的 IDP,您可能能够启用额外的身份和访问管理功能。
+After you enable SAML SSO, depending on the IdP you use, you may be able to enable additional identity and access management features.
-如果使用 Azure AD 作为 IDP,您可以使用团队同步来管理每个组织中的团队成员身份。 {% data reusables.identity-and-permissions.about-team-sync %} 更多信息请参阅“[管理企业帐户中组织的团队同步](/admin/authentication/managing-identity-and-access-for-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise)”。
+If you use Azure AD as your IDP, you can use team synchronization to manage team membership within each organization. {% data reusables.identity-and-permissions.about-team-sync %} For more information, see "[Managing team synchronization for organizations in your enterprise account](/admin/authentication/managing-identity-and-access-for-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise)."
-{% data reusables.saml.switching-from-org-to-enterprise %} 更多信息请参阅“[将 SAML 配置从组织切换到企业帐户](/github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)”。
+{% data reusables.saml.switching-from-org-to-enterprise %} For more information, see "[Switching your SAML configuration from an organization to an enterprise account](/github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)."
-## 关于 {% data variables.product.prodname_emus %}
+## About {% data variables.product.prodname_emus %}
{% data reusables.enterprise-accounts.emu-short-summary %}
@@ -50,13 +50,13 @@ If your enterprise members manage their own personal accounts on {% data variabl
{% endnote %}
-为 SAML 单点登录和用户预配配置 {% data variables.product.prodname_emus %} 涉及遵循与不使用 {% data variables.product.prodname_managed_users %} 的企业不同的流程。 如果您的企业使用 {% data variables.product.prodname_emus %},请参阅“[为企业管理的用户配置 SAML 单点登录](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-saml-single-sign-on-for-enterprise-managed-users)”。
+Configuring {% data variables.product.prodname_emus %} for SAML single-sign on and user provisioning involves following a different process than you would for an enterprise that isn't using {% data variables.product.prodname_managed_users %}. If your enterprise uses {% data variables.product.prodname_emus %}, see "[Configuring SAML single sign-on for Enterprise Managed Users](/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-saml-single-sign-on-for-enterprise-managed-users)."
{% elsif ghes %}
-SAML SSO 允许人们通过外部系统验证和访问 {% data variables.product.product_location %} 以进行身份管理。
+SAML SSO allows people to authenticate and access {% data variables.product.product_location %} through an external system for identity management.
-SAML 是一种基于 XML 的身份验证和授权标准。 为 {% data variables.product.product_location %} 配置 SAML 时,用于身份验证的外部系统称为身份提供程序 (IdP)。 您的实例充当 SAML 服务提供商 (SP)。 For more information about the SAML standard, see [Security Assertion Markup Language](https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language) on Wikipedia.
+SAML is an XML-based standard for authentication and authorization. When you configure SAML for {% data variables.product.product_location %}, the external system for authentication is called an identity provider (IdP). Your instance acts as a SAML service provider (SP). For more information about the SAML standard, see [Security Assertion Markup Language](https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language) on Wikipedia.
For more information about the configuration of SAML SSO on {% data variables.product.product_name %}, see "[Configuring SAML single sign-on for your enterprise](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise)."
@@ -70,28 +70,28 @@ For more information about the configuration of SAML SSO on {% data variables.pr
{% data reusables.saml.ae-uses-saml-sso %} {% data reusables.saml.ae-enable-saml-sso-during-bootstrapping %}
-在身份提供程序 (IdP) 上为 {% data variables.product.product_name %} 配置应用程序后,可以通过将应用程序分配到 IdP 上的用户和组来预配其访问 {% data variables.product.product_location %} 的权限。 有关用于 {% data variables.product.product_name %} 的 SAML SSO 的详细信息,请参阅“[为企业配置 SAML 单点登录](/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise)”。
+After you configure the application for {% data variables.product.product_name %} on your identity provider (IdP), you can provision access to {% data variables.product.product_location %} by assigning the application to users and groups on your IdP. For more information about SAML SSO for {% data variables.product.product_name %}, see "[Configuring SAML single sign-on for your enterprise](/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise)."
-{% data reusables.scim.after-you-configure-saml %} 更多信息请参阅“[配置企业的用户预配](/admin/authentication/configuring-user-provisioning-for-your-enterprise)”。
+{% data reusables.scim.after-you-configure-saml %} For more information, see "[Configuring user provisioning for your enterprise](/admin/authentication/configuring-user-provisioning-for-your-enterprise)."
-要了解如何合适特定 IdP 为 {% data variables.product.product_location %} 配置身份验证和用户预配,请参阅“[使用身份提供程序配置身份验证和预配](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider)”。
+To learn how to configure both authentication and user provisioning for {% data variables.product.product_location %} with your specific IdP, see "[Configuring authentication and provisioning with your identity provider](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider)."
{% endif %}
-## 支持的 IdP
+## Supported IdPs
{% ifversion ghec %}
-我们测试并正式支持以下 IdP。 对于 SAML SSO,我们向执行 SAML 2.0 标准的所有身份提供程序提供有限的支持。 更多信息请参阅 OASIS 网站上的 [SAML Wiki](https://wiki.oasis-open.org/security)。
+We test and officially support the following IdPs. For SAML SSO, we offer limited support for all identity providers that implement the SAML 2.0 standard. For more information, see the [SAML Wiki](https://wiki.oasis-open.org/security) on the OASIS website.
-| IdP | SAML | 团队同步 |
-| -------------------------------------------- |:--------------------------------------------------------------:|:-------------------------------------------------------------:|
-| Active Directory Federation Services (AD FS) | {% octicon "check-circle-fill" aria-label= "The check icon" %} | |
-| Azure Active Directory (Azure AD) | {% octicon "check-circle-fill" aria-label="The check icon" %} | {% octicon "check-circle-fill" aria-label="The check icon" %}
-| Okta | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
-| OneLogin | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
-| PingOne | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
-| Shibboleth | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
+IdP | SAML | Team synchronization |
+--- | :--: | :-------: |
+Active Directory Federation Services (AD FS) | {% octicon "check-circle-fill" aria-label= "The check icon" %} | |
+Azure Active Directory (Azure AD) | {% octicon "check-circle-fill" aria-label="The check icon" %} | {% octicon "check-circle-fill" aria-label="The check icon" %} |
+Okta | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
+OneLogin | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
+PingOne | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
+Shibboleth | {% octicon "check-circle-fill" aria-label="The check icon" %} | |
{% elsif ghes %}
@@ -99,7 +99,7 @@ For more information about the configuration of SAML SSO on {% data variables.pr
{% ifversion ghes > 3.3 %}
-如果您的 IdP 支持加密断言,您可以在 {% data variables.product.product_name %} 上配置加密断言,以提高身份验证过程中的安全性。
+If your IdP supports encrypted assertions, you can configure encrypted assertions on {% data variables.product.product_name %} for increased security during the authentication process.
{% endif %}
@@ -107,7 +107,7 @@ For more information about the configuration of SAML SSO on {% data variables.pr
{% elsif ghae %}
-正式支持以下 IdP 与 {% data variables.product.prodname_ghe_managed %} 集成。
+The following IdPs are officially supported for integration with {% data variables.product.prodname_ghe_managed %}.
{% data reusables.saml.okta-ae-sso-beta %}
@@ -117,14 +117,14 @@ For more information about the configuration of SAML SSO on {% data variables.pr
{% ifversion ghae %}
-## 将 {% data variables.product.prodname_ghe_managed %} 团队映射到 Okta 组
+## Mapping {% data variables.product.prodname_ghe_managed %} teams to Okta groups
-如果您使用 Okta 作为您的 IdP,则可以将 Okta 组映射到 {% data variables.product.product_name %} 上的团队。 更多信息请参阅“[将 Okta 组映射到团队](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/mapping-okta-groups-to-teams)”。
+If you use Okta as your IdP, you can map your Okta groups to teams on {% data variables.product.product_name %}. For more information, see "[Mapping Okta groups to teams](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/mapping-okta-groups-to-teams)."
{% endif %}
-## 延伸阅读
+## Further reading
-- OASIS 网站上的 [SAML Wiki](https://wiki.oasis-open.org/security)
-- IETF 网站上的[跨域身份管理系统:协议 (RFC 7644)](https://tools.ietf.org/html/rfc7644){% ifversion ghae %}
-- “[限制到企业的网络流量](/admin/configuration/restricting-network-traffic-to-your-enterprise)”{% endif %}
+- [SAML Wiki](https://wiki.oasis-open.org/security) on the OASIS website
+- [System for Cross-domain Identity Management: Protocol (RFC 7644)](https://tools.ietf.org/html/rfc7644) on the IETF website{% ifversion ghae %}
+- [Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise){% endif %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
index d503a8efac..7dc5e337f1 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
@@ -1,6 +1,6 @@
---
title: 使用 Azure AD 为企业配置身份验证和预配
-shortTitle: Configure with Azure AD
+shortTitle: 使用 Azure AD 进行配置
intro: '您可以使用 Azure Active Directory (Azure AD) 中的租户作为身份提供程序 (IDP) 来集中管理 {% data variables.product.product_location %} 的身份验证和用户预配。'
permissions: 'Enterprise owners can configure authentication and provisioning for an enterprise on {% data variables.product.product_name %}.'
versions:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-okta.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-okta.md
index 7d1ac70394..15bdf0b6f3 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-okta.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-authentication-and-provisioning-for-your-enterprise-using-okta.md
@@ -1,6 +1,6 @@
---
title: 使用 Okta 为企业配置身份验证和预配
-shortTitle: Configure with Okta
+shortTitle: 使用 Okta 进行配置
intro: '您可以使用 Okta 作为身份提供程序 (IdP) 来集中管理 {% data variables.product.prodname_ghe_managed %} 的身份验证和用户预配。'
permissions: 'Enterprise owners can configure authentication and provisioning for {% data variables.product.prodname_ghe_managed %}.'
versions:
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise-using-okta.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise-using-okta.md
index 750e961c11..b8b2136189 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise-using-okta.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise-using-okta.md
@@ -14,7 +14,7 @@ topics:
- Authentication
- Enterprise
type: how_to
-shortTitle: Configure SAML SSO with Okta
+shortTitle: 使用 Okta 配置 SAML SSO
---
{% data reusables.enterprise-accounts.emu-saml-note %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
index 4f70db5868..b8afbf3028 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
-title: 为企业配置 SAML 单点登录
-shortTitle: 配置 SAML SSO
+title: Configuring SAML single sign-on for your enterprise
+shortTitle: Configure SAML SSO
intro: 'You can control and secure access to {% ifversion ghec %}resources like repositories, issues, and pull requests within your enterprise''s organizations{% elsif ghes %}{% data variables.product.product_location %}{% elsif ghae %}your enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %} by {% ifversion ghec %}enforcing{% elsif ghes or ghae %}configuring{% endif %} SAML single sign-on (SSO) through your identity provider (IdP).'
permissions: '{% ifversion ghes %}Site administrators{% elsif ghec or ghae %}Enterprise owners{% endif %} can configure SAML SSO for {% ifversion ghec or ghae %}an enterprise on {% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.product_name %} instance{% endif %}.'
versions:
@@ -25,15 +25,15 @@ redirect_from:
{% data reusables.enterprise-accounts.emu-saml-note %}
-## 关于 SAML SSO
+## About SAML SSO
{% ifversion ghec %}
-{% data reusables.saml.dotcom-saml-explanation %}更多信息请参阅“[关于使用 SAML 单点登录管理身份和访问](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)”。
+{% data reusables.saml.dotcom-saml-explanation %} For more information, see "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)."
{% data reusables.saml.about-saml-enterprise-accounts %}
-{% data reusables.saml.about-saml-access-enterprise-account %} 更多信息请参阅“[查看和管理用户对企业帐户的 SAML 访问](/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise)”。
+{% 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.saml-disabled-linked-identities-removed %}
@@ -41,9 +41,9 @@ redirect_from:
{% elsif ghes or ghae %}
-SAML SSO 允许您从 SAML IDP 集中控制和安全访问 {% data variables.product.product_location %}。 当未经身份验证的用户在浏览器中访问 {% data variables.product.product_location %} 时,{% data variables.product.product_name %} 会将用户重定向到您的 SAML IDP 进行身份验证。 在用户使用 IdP 上的帐户成功进行身份验证后,IdP 会将用户重定向回 {% data variables.product.product_location %}。 {% data variables.product.product_name %} 将验证 IdP 的响应,然后授予用户访问权限。
+SAML SSO allows you to centrally control and secure access to {% data variables.product.product_location %} from your SAML IdP. When an unauthenticated user visits {% data variables.product.product_location %} in a browser, {% data variables.product.product_name %} will redirect the user to your SAML IdP to authenticate. After the user successfully authenticates with an account on the IdP, the IdP redirects the user back to {% data variables.product.product_location %}. {% data variables.product.product_name %} validates the response from your IdP, then grants access to the user.
-当用户在 IdP 上成功进行身份验证后,用户对 {% data variables.product.product_location %} 的 SAML 会话将在浏览器中激活 24 小时。 24 小时后,用户必须再次使用您的 IdP 进行身份验证。
+After a user successfully authenticates on your IdP, the user's SAML session for {% data variables.product.product_location %} is active in the browser for 24 hours. After 24 hours, the user must authenticate again with your IdP.
{% data reusables.saml.saml-ghes-account-revocation %}
@@ -51,164 +51,176 @@ SAML SSO 允许您从 SAML IDP 集中控制和安全访问 {% data variables.pro
{% data reusables.saml.assert-the-administrator-attribute %}
-{% data reusables.scim.after-you-configure-saml %} 更多信息请参阅“[配置企业的用户预配](/admin/authentication/configuring-user-provisioning-for-your-enterprise)”。
+{% data reusables.scim.after-you-configure-saml %} For more information, see "[Configuring user provisioning for your enterprise](/admin/authentication/configuring-user-provisioning-for-your-enterprise)."
{% endif %}
{% endif %}
-## 支持的身份提供程序
+## Supported identity providers
{% data reusables.saml.saml-supported-idps %}
{% ifversion ghec %}
-## 使用 SAML 时的用户名考量因素
+## Username considerations with SAML
{% ifversion ghec %}If you use {% data variables.product.prodname_emus %}, {% endif %}{% data reusables.enterprise_user_management.consider-usernames-for-external-authentication %} For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
-## 为企业帐户中的组织实施 SAML 单点登录
+## Enforcing SAML single-sign on for organizations in your enterprise account
{% note %}
-**注意:**
+**Notes:**
-- 为您的企业实施 SAML SSO 时,企业配置将覆盖任何现有的组织级 SAML 配置。 {% data reusables.saml.switching-from-org-to-enterprise %} 更多信息请参阅“[将 SAML 配置从组织切换到企业帐户](/github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)”。
-- 为组织强制实施 SAML SSO 时,{% data variables.product.company_short %} 会删除组织中尚未使用 SAML IdP 成功进行身份验证的任何成员。 当您的企业需要 SAML SSO 时,{% data variables.product.company_short %} 不会删除尚未使用 SAML IdP 成功进行身份验证的企业成员。 下次成员访问企业资源时,该成员必须使用您的 SAML IdP 进行身份验证。
+- When you enforce SAML SSO for your enterprise, the enterprise configuration will override any existing organization-level SAML configurations. {% data reusables.saml.switching-from-org-to-enterprise %} For more information, see "[Switching your SAML configuration from an organization to an enterprise account](/github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)."
+- When you enforce SAML SSO for an organization, {% data variables.product.company_short %} removes any members of the organization that have not authenticated successfully with your SAML IdP. When you require SAML SSO for your enterprise, {% data variables.product.company_short %} does not remove members of the enterprise that have not authenticated successfully with your SAML IdP. The next time a member accesses the enterprise's resources, the member must authenticate with your SAML IdP.
{% endnote %}
-有关如何使用 Okta 启用 SAML 的更多详细信息,请参阅“[使用 Okta 为企业帐户配置 SAML 单点登录](/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise-using-okta)”。
+For more detailed information about how to enable SAML using Okta, see "[Configuring SAML single sign-on for your enterprise account using Okta](/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise-using-okta)."
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.security-tab %}
4. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. 在“SAML single sign-on”(SAML 单点登录)下,选择 **Require SAML authentication(需要 SAML 身份验证)**。 
-6. 在 **Sign on URL(登录 URL)**字段中,为单点登录请求输入您的 IdP 的 HTTPS 端点。 此值可在 IdP 配置中找到。 
-7. (可选)在 **Issuer(签发者)**字段中,输入 SAML 签发者 URL 以验证已发送消息的真实性。 
-8. 在 **Public Certificate(公共证书)**下,粘贴证书以验证 SAML 响应。 
-9. 要验证来自 SAML 签发者的请求的完整性,请单击 {% octicon "pencil" aria-label="The edit icon" %}。 然后,在“Signature Method(签名方法)”和“Digest Method(摘要方法)”下拉菜单中,选择 SAML 签发者使用的哈希算法。 
-10. 在为企业启用 SAML SSO 之前,单击 **Test SAML configuration(测试 SMAL 配置)** ,以确保已输入的信息正确。 
-11. 单击 **Save(保存)**。
+5. Under "SAML single sign-on", select **Require SAML authentication**.
+ 
+6. In the **Sign on URL** field, type the HTTPS endpoint of your IdP for single sign-on requests. This value is available in your IdP configuration.
+
+7. Optionally, in the **Issuer** field, type your SAML issuer URL to verify the authenticity of sent messages.
+
+8. Under **Public Certificate**, paste a certificate to verify SAML responses.
+
+9. To verify the integrity of the requests from your SAML issuer, click {% octicon "pencil" aria-label="The edit icon" %}. Then in the "Signature Method" and "Digest Method" drop-downs, choose the hashing algorithm used by your SAML issuer.
+
+10. Before enabling SAML SSO for your enterprise, click **Test SAML configuration** to ensure that the information you've entered is correct. 
+11. Click **Save**.
{% data reusables.enterprise-accounts.download-recovery-codes %}
{% elsif ghes %}
-## 配置 SAML SSO
+## Configuring SAML SSO
-您可以为 {% data variables.product.product_location %} 启用或禁用 SAML 身份验证,也可以编辑现有配置。 You can view and edit authentication settings for {% data variables.product.product_name %} in the management console. 更多信息请参阅“[访问管理控制台](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)”。
+You can enable or disable SAML authentication for {% data variables.product.product_location %}, or you can edit an existing configuration. You can view and edit authentication settings for {% data variables.product.product_name %} in the management console. For more information, see "[Accessing the management console](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)."
{% note %}
-**注**:{% data reusables.enterprise.test-in-staging %}
+**Note**: {% data reusables.enterprise.test-in-staging %}
{% endnote %}
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
{% data reusables.enterprise_management_console.authentication %}
-1. 选择 **SAML**。
-
- 
+1. Select **SAML**.
+
+ 
1. {% data reusables.enterprise_user_management.built-in-authentication-option %}
- 
-1. 或者,要启用非请求响应 SSO,请选择 **IdP initiated SSO**。 默认情况下,{% data variables.product.prodname_ghe_server %} 将向 IdP 发回 `AuthnRequest`,回复非请求身份提供程序 (IdP) 发起的请求。
+ 
+1. Optionally, to enable unsolicited response SSO, select **IdP initiated SSO**. By default, {% data variables.product.prodname_ghe_server %} will reply to an unsolicited Identity Provider (IdP) initiated request with an `AuthnRequest` back to the IdP.
- 
+ 
{% tip %}
- **注意**:我们建议保留此值处于**未选择**状态。 您**只**应在罕见的情况下启用此功能,即您的 SAML 实现不支持服务提供程序发起的 SSO,并且 {% data variables.contact.enterprise_support %} 建议执行此操作。
+ **Note**: We recommend keeping this value **unselected**. You should enable this feature **only** in the rare instance that your SAML implementation does not support service provider initiated SSO, and when advised by {% data variables.contact.enterprise_support %}.
{% endtip %}
-1. 如果您**不**希望 SAML 提供程序为 {% data variables.product.product_location %} 上的用户确定管理员权限,请选择 **Disable administrator demotion/promotion(禁用管理员降级/升级)**。
+1. Select **Disable administrator demotion/promotion** if you **do not** want your SAML provider to determine administrator rights for users on {% data variables.product.product_location %}.
- 
+ 
{%- ifversion ghes > 3.3 %}
-1. (可选)要允许 {% data variables.product.product_location %} 从 SAML IdP 接收加密断言,请选择 **Require encrypted assertions(需要加密断言)**。 您必须确保您的 IdP 支持加密断言,并且管理控制台中的加密和密钥传输方法与 IdP 上配置的值匹配。 您还必须向您的 IdP 提供 {% data variables.product.product_location %} 的公共证书。 更多信息请参阅“[启用加密断言](/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions)”。
+1. Optionally, to allow {% data variables.product.product_location %} to receive encrypted assertions from your SAML IdP, select **Require encrypted assertions**. You must ensure that your IdP supports encrypted assertions and that the encryption and key transport methods in the management console match the values configured on your IdP. You must also provide {% data variables.product.product_location %}'s public certificate to your IdP. For more information, see "[Enabling encrypted assertions](/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions)."
- 
+ 
{%- endif %}
-1. 在 **Single sign-on URL(单点登录 URL)** 字段中,为单点登录请求输入您的 IdP 上的 HTTP 或 HTTPS 端点。 此值由您的 IdP 配置提供。 如果主机只能在您的内部网络中使用,您需要先[将 {% data variables.product.product_location %} 配置为使用内部域名服务器](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-dns-nameservers/)。
+1. In the **Single sign-on URL** field, type the HTTP or HTTPS endpoint on your IdP for single sign-on requests. This value is provided by your IdP configuration. If the host is only available from your internal network, you may need to [configure {% data variables.product.product_location %} to use internal nameservers](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-dns-nameservers/).
- 
-1. (可选)在 **Issuer(签发者)** 字段中,输入您的 SAML 签发者的姓名。 这将验证发送到 {% data variables.product.product_location %} 的消息的真实性。
+ 
+1. Optionally, in the **Issuer** field, type your SAML issuer's name. This verifies the authenticity of messages sent to {% data variables.product.product_location %}.
- 
-1. 在 **Signature Method(签名方法)** 和 **Digest Method(摘要方法)** 下拉菜单中,选择您的 SAML 颁发者用于验证 {% data variables.product.product_location %} 请求完整性的哈希算法。 使用 **Name Identifier Format(名称标识符格式)**下拉菜单指定格式。
+ 
+1. In the **Signature Method** and **Digest Method** drop-down menus, choose the hashing algorithm used by your SAML issuer to verify the integrity of the requests from {% data variables.product.product_location %}. Specify the format with the **Name Identifier Format** drop-down menu.
- 
-1. 在 **Verification certificate(验证证书)**下,单击 **Choose File(选择文件)**并选择用于验证 IdP 的 SAML 响应的证书。
+ 
+1. Under **Verification certificate**, click **Choose File** and choose a certificate to validate SAML responses from the IdP.
- 
-1. 如果需要,请修改 SAML 属性名称以匹配您的 IdP,或者接受默认名称。
+ 
+1. Modify the SAML attribute names to match your IdP if needed, or accept the default names.
- 
+ 
{% elsif ghae %}
-## 启用 SAML SSO
+## Enabling SAML SSO
{% data reusables.saml.ae-enable-saml-sso-during-bootstrapping %}
-以下 IdP 提供有关为 {% data variables.product.product_name %} 配置 SAML SSO 的文档。 如果您的 IdP 未列出,请与您的 IdP 联系,以请求 {% data variables.product.product_name %}。
+The following IdPs provide documentation about configuring SAML SSO for {% data variables.product.product_name %}. If your IdP isn't listed, please contact your IdP to request support for {% data variables.product.product_name %}.
- | IdP | 更多信息 |
- |:-------- |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+ | IdP | More information |
+ | :- | :- |
| Azure AD | "[Configuring authentication and provisioning for your enterprise using Azure AD](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad)" |
- | Okta | "[Configuring authentication and provisioning for your enterprise using Okta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta)" |
+| Okta | "[Configuring authentication and provisioning for your enterprise using Okta](/admin/authentication/configuring-authentication-and-provisioning-with-your-identity-provider/configuring-authentication-and-provisioning-for-your-enterprise-using-okta)" |
-During initialization for {% data variables.product.product_name %}, you must configure {% data variables.product.product_name %} as a SAML service provider (SP) on your IdP. 您必须在 IdP 上输入多个唯一值以将 {% data variables.product.product_name %} 配置为有效的 SP。 For more information, see "[SAML configuration reference](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#saml-metadata)."
+During initialization for {% data variables.product.product_name %}, you must configure {% data variables.product.product_name %} as a SAML service provider (SP) on your IdP. You must enter several unique values on your IdP to configure {% data variables.product.product_name %} as a valid SP. For more information, see "[SAML configuration reference](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#saml-metadata)."
-## 编辑 SAML SSO 配置
+## Editing the SAML SSO configuration
-如果 IdP 的详细信息发生更改,则需要编辑 {% data variables.product.product_location %} 的 SAML SSO 配置。 例如,如果 IdP 的证书过期,您可以编辑公共证书的值。
+If the details for your IdP change, you'll need to edit the SAML SSO configuration for {% data variables.product.product_location %}. For example, if the certificate for your IdP expires, you can edit the value for the public certificate.
{% ifversion ghae %}
{% note %}
-**注**:{% data reusables.saml.contact-support-if-your-idp-is-unavailable %}
+**Note**: {% data reusables.saml.contact-support-if-your-idp-is-unavailable %}
-{% endnote %}
+{% endnote %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.security-tab %}
-1. 在“SAML single sign-on(SAML 单点登录)”下,键入 IdP 的新详细信息。 
-1. (可选)单击 {% octicon "pencil" aria-label="The edit icon" %} 以配置新的签名或摘要方法。 
+1. Under "SAML single sign-on", type the new details for your IdP.
+ 
+1. Optionally, click {% octicon "pencil" aria-label="The edit icon" %} to configure a new signature or digest method.
+ 
- - 使用下拉菜单并选择新的签名或摘要方法。 
-1. 为确保输入的信息正确,请单击 **Test SAML configuration(测试 SAML 配置)**。 
-1. 单击 **Save(保存)**。 
-1. (可选)要自动预配和取消预配 {% data variables.product.product_location %} 的用户帐户,请使用 SCIM 重新配置用户预配。 更多信息请参阅“[配置企业的用户预配](/admin/authentication/configuring-user-provisioning-for-your-enterprise)”。
+ - Use the drop-down menus and choose the new signature or digest method.
+ 
+1. To ensure that the information you've entered is correct, click **Test SAML configuration**.
+ 
+1. Click **Save**.
+ 
+1. Optionally, to automatically provision and deprovision user accounts for {% data variables.product.product_location %}, reconfigure user provisioning with SCIM. For more information, see "[Configuring user provisioning for your enterprise](/admin/authentication/configuring-user-provisioning-for-your-enterprise)."
{% endif %}
{% ifversion ghae %}
-## 禁用 SAML SSO
+## Disabling SAML SSO
{% warning %}
-**警告**:如果您对 {% data variables.product.product_location %} 禁用 SAML SSO,则没有现有 SAML SSO 会话的用户无法登录 {% data variables.product.product_location %}。 {% data variables.product.product_location %} 上的 SAML SSO 会话在 24 小时后结束。
+**Warning**: If you disable SAML SSO for {% data variables.product.product_location %}, users without existing SAML SSO sessions cannot sign into {% data variables.product.product_location %}. SAML SSO sessions on {% data variables.product.product_location %} end after 24 hours.
{% endwarning %}
{% note %}
-**注**:{% data reusables.saml.contact-support-if-your-idp-is-unavailable %}
+**Note**: {% data reusables.saml.contact-support-if-your-idp-is-unavailable %}
{% endnote %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.security-tab %}
-1. 在“SAML single sign-on”(SAML 单点登录)下,取消选择 **Enable SAML authentication(启用 SAML 身份验证)**。 
-1. 要禁用 SAML SSO 并要求使用在初始化期间创建的内置用户帐户登录,请单击“**Save(保存)**”。 
+1. Under "SAML single sign-on", unselect **Enable SAML authentication**.
+ 
+1. To disable SAML SSO and require signing in with the built-in user account you created during initialization, click **Save**.
+ 
{% endif %}
@@ -216,7 +228,7 @@ During initialization for {% data variables.product.product_name %}, you must co
{% ifversion ghec or ghes %}
-## 延伸阅读
+## Further reading
{%- ifversion ghec %}
- "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization)"
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions.md
index c0ee81a285..8c1ac059fc 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/enabling-encrypted-assertions.md
@@ -1,7 +1,7 @@
---
title: 启用加密断言
-shortTitle: Enable encrypted assertions
-intro: 'You can improve {% data variables.product.product_location %}''s security with SAML single sign-on (SSO) by encrypting the messages that your SAML identity provider (IdP) sends.'
+shortTitle: 启用加密断言
+intro: '您可以通过加密 SAML 身份提供程序 (IdP) 发送的消息,使用 SAML 单点登录 (SSO) 提高 {% data variables.product.product_location %} 的安全性。'
permissions: 'Site administrators can configure encrypted assertions for a {% data variables.product.product_name %} instance.'
versions:
ghes: '> 3.3'
@@ -15,17 +15,17 @@ topics:
- SSO
---
-## About encrypted assertions
+## 关于加密断言
-If your IdP support encryption of assertions, you can configure encrypted assertions on {% data variables.product.product_name %} for increased security during the authentication process.
+如果您的 IdP 支持断言加密,则可以在 {% data variables.product.product_name %} 上配置加密断言,以提高身份验证过程中的安全性。
## 基本要求
-To enable encrypted assertions for authentication to {% data variables.product.product_name %}, you must configure SAML authentication, and your IdP must support encrypted assertions.
+要启用加密断言以向 {% data variables.product.product_name %} 验证,您必须配置 SAML 身份验证,并且您的 IdP 必须支持加密断言。
## 启用加密断言
-To enable encrypted assertions, you must provide {% data variables.product.product_location %}'s public certificate to your IdP, and configure encryption settings that match your IdP.
+要启用加密断言,您必须向 IdP 提供 {% data variables.product.product_location %} 的公共证书,并配置与您的 IdP 匹配的加密设置。
{% note %}
@@ -33,7 +33,7 @@ To enable encrypted assertions, you must provide {% data variables.product.produ
{% endnote %}
-1. (可选)启用 SAML 调试。 SAML 调试会在 {% data variables.product.product_name %} 的身份验证日志中记录详细条目,并可以帮助您排查失败的身份验证尝试。 For more information, see "[Troubleshooting SAML authentication](/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication#configuring-saml-debugging)."
+1. (可选)启用 SAML 调试。 SAML 调试会在 {% data variables.product.product_name %} 的身份验证日志中记录详细条目,并可以帮助您排查失败的身份验证尝试。 更多信息请参阅“[SAML 身份验证疑难解答](/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication#configuring-saml-debugging)”。
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
{% data reusables.enterprise_management_console.authentication %}
@@ -57,4 +57,4 @@ To enable encrypted assertions, you must provide {% data variables.product.produ
1. 单击 **Save settings(保存设置)**。
{% data reusables.enterprise_site_admin_settings.wait-for-configuration-run %}
-如果启用了 SAML 调试以使用加密断言测试身份验证,请在完成测试后禁用 SAML 调试。 For more information, see "[Troubleshooting SAML authentication](/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication#configuring-saml-debugging)."
+如果启用了 SAML 调试以使用加密断言测试身份验证,请在完成测试后禁用 SAML 调试。 更多信息请参阅“[SAML 身份验证疑难解答](/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication#configuring-saml-debugging)”。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md
index 8e3e00cadd..06e4d5d528 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/mapping-okta-groups-to-teams.md
@@ -1,6 +1,6 @@
---
title: 将 Okta 组映射到团队
-shortTitle: Map Okta groups to teams
+shortTitle: 将 Okta 组映射到团队
intro: '您可以将 Okta 组映射到 {% data variables.product.prodname_ghe_managed %} 上的团队,以自动添加和删除团队成员。'
permissions: 'Enterprise owners can configure authentication and provisioning for {% data variables.product.prodname_ghe_managed %}.'
versions:
@@ -98,4 +98,4 @@ topics:
{% data reusables.saml.external-identity-audit-events %}
-For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)."
+更多信息请参阅“[查看组织的审核日志](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization)”。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md
index 495b3b79ac..ce0e5d44a5 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md
@@ -1,7 +1,7 @@
---
-title: SAML configuration reference
-shortTitle: SAML reference
-intro: 'You can see SAML metadata for {% ifversion ghec %}your organization or enterprise on {% data variables.product.product_name %}{% elsif ghes %}{% data variables.product.product_location %}{% elsif ghae %}your enterprise on {% data variables.product.product_name %}{% endif %}, and you can learn more about available SAML attributes and response requirements.'
+title: SAML 配置参考
+shortTitle: SAML 参考
+intro: '您可以查看{% ifversion ghec %}{% data variables.product.product_name %} 上的组织或企业{% elsif ghes %}{% data variables.product.product_location %}{% elsif ghae %}{% data variables.product.product_name %}上的企业{% endif %}的 SAML 元数据,还可以了解有关可用 SAML 属性和响应要求的更多信息。'
versions:
ghec: '*'
ghes: '*'
@@ -15,74 +15,74 @@ topics:
- SSO
---
-## About SAML configuration
+## 关于 SAML 配置
-To use SAML single sign-on (SSO) for authentication to {% data variables.product.product_name %}, you must configure both your external SAML identity provider (IdP) and {% ifversion ghes %}{% data variables.product.product_location %}{% elsif ghec %}your enterprise or organization on {% data variables.product.product_location %}{% elsif ghae %}your enterprise on {% data variables.product.product_name %}{% endif %}. In a SAML configuration, {% data variables.product.product_name %} functions as a SAML service provider (SP).
+要使用 SAML 单点登录 (SSO) 向 {% data variables.product.product_name %} 验证,您必须配置外部 SAML 身份提供程序 (IdP) 和 {% ifversion ghes %}{% data variables.product.product_location %}{% elsif ghec %} {% data variables.product.product_location %} 上的企业或组织{% elsif ghae %}{% data variables.product.product_name %} 上的企业{% endif %}。 在 SAML 配置中,{% data variables.product.product_name %} 充当 SAML 服务提供程序 (SP)。
-You must enter unique values from your SAML IdP when configuring SAML SSO for {% data variables.product.product_name %}, and you must also enter unique values from {% data variables.product.product_name %} on your IdP. For more information about the configuration of SAML SSO for {% data variables.product.product_name %}, see "[Configuring SAML single sign-on for your enterprise](/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise){% ifversion ghes or ghae %}{% elsif ghec %}" or "[Enabling and testing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization){% endif %}."
+为 {% data variables.product.product_name %} 配置 SAML SSO 时,您必须输入 SAML IdP 中的唯一值,并且还必须输入 IdP 上 {% data variables.product.product_name %} 的唯一值。 有关 {% data variables.product.product_name %} 的 SAML SSO 配置的详细信息,请参阅“[为企业配置 SAML 单点登录](/admin/identity-and-access-management/managing-iam-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise){% ifversion ghes or ghae %}{% elsif ghec %}”或“[为组织启用和测试 SAML 单点登录](/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization){% endif %}”。
## SAML 元数据
{% ifversion ghec %}
-The SP metadata for {% data variables.product.product_name %} is available for either organizations or enterprises with SAML SSO. {% data variables.product.product_name %} uses the `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` binding.
+{% data variables.product.product_name %} 的 SP 元数据可用于具有 SAML SSO 的组织或企业。 {% data variables.product.product_name %} 使用 `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` 绑定。
### 组织
-You can configure SAML SSO for an individual organization in your enterprise. You can also configure SAML SSO for an organization if you use an individual organization on {% data variables.product.product_name %} and do not use an enterprise account. For more information, see "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization)."
+您可以为企业中的单个组织配置 SAML SSO。 如果您在 {% data variables.product.product_name %} 上使用单个组织并且不使用企业帐户,则还可以为组织配置 SAML SSO。 更多信息请参阅“[管理组织的 SAML 单点登录](/organizations/managing-saml-single-sign-on-for-your-organization)”。
-The SP metadata for an organization on {% data variables.product.product_location %} is available at `https://github.com/orgs/ORGANIZATION/saml/metadata`, where **ORGANIZATION** is the name of your organization on {% data variables.product.product_location %}.
+{% data variables.product.product_location %} 上组织的 SP 元数据位于 `https://github.com/orgs/ORGANIZATION/saml/metadata`,其中 **ORGANIZATION** 是组织在 {% data variables.product.product_location %} 上的名称。
-| 值 | 其他名称 | 描述 | 示例 |
-|:-------------------- |:------------------------------------ |:---------------------------------------------------------------------------------------- |:--------------------------------------------------- |
-| SP 实体 ID | SP URL, audience restriction | The top-level URL for your organization on {% data variables.product.product_location %} | `https://github.com/orgs/ORGANIZATION` |
-| SP 断言使用者服务 (ACS) URL | Reply, recipient, or destination URL | IdP 发送 SAML 响应的 URL | `https://github.com/orgs/ORGANIZATION/saml/consume` |
-| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://github.com/orgs/ORGANIZATION/saml/sso` |
+| 值 | 其他名称 | 描述 | 示例 |
+|:-------------------- |:------------- |:-------------------------------------------------------- |:--------------------------------------------------- |
+| SP 实体 ID | SP URL,受众限制 | {% data variables.product.product_location %} 上组织的顶级 URL | `https://github.com/orgs/ORGANIZATION` |
+| SP 断言使用者服务 (ACS) URL | 答复、收件人或目标 URL | IdP 发送 SAML 响应的 URL | `https://github.com/orgs/ORGANIZATION/saml/consume` |
+| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://github.com/orgs/ORGANIZATION/saml/sso` |
-### Enterprises
+### 企业
-The SP metadata for an enterprise on {% data variables.product.product_location %} is available at `https://github.com/enterprises/ENTERPRISE/saml/metadata`, where **ENTERPRISE** is the name of your enterprise on {% data variables.product.product_location %}.
+{% data variables.product.product_location %} 上企业的 SP 元数据位于 `https://github.com/enterprises/ENTERPRISE/saml/metadata`,其中 **ENTERPRISE** 是企业在 {% data variables.product.product_location %} 上的名称。
-| 值 | 其他名称 | 描述 | 示例 |
-|:-------------------- |:------------------------------------ |:-------------------------------------------------------------------------------------- |:-------------------------------------------------------- |
-| SP 实体 ID | SP URL, audience restriction | The top-level URL for your enterprise on {% data variables.product.product_location %} | `https://github.com/enterprises/ENTERPRISE` |
-| SP 断言使用者服务 (ACS) URL | Reply, recipient, or destination URL | IdP 发送 SAML 响应的 URL | `https://github.com/enterprises/ENTERPRISE/saml/consume` |
-| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://github.com/enterprises/ENTERPRISE/saml/sso` |
+| 值 | 其他名称 | 描述 | 示例 |
+|:-------------------- |:------------- |:-------------------------------------------------------- |:-------------------------------------------------------- |
+| SP 实体 ID | SP URL,受众限制 | {% data variables.product.product_location %} 上企业的顶级 URL | `https://github.com/enterprises/ENTERPRISE` |
+| SP 断言使用者服务 (ACS) URL | 答复、收件人或目标 URL | IdP 发送 SAML 响应的 URL | `https://github.com/enterprises/ENTERPRISE/saml/consume` |
+| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://github.com/enterprises/ENTERPRISE/saml/sso` |
{% elsif ghes %}
-The SP metadata for {% data variables.product.product_location %} is available at `http(s)://HOSTNAME/saml/metadata`, where **HOSTNAME** is the hostname for your instance. {% data variables.product.product_name %} uses the `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` binding.
+{% data variables.product.product_location %} 的 SP 元数据在 `http(s)://HOSTNAME/saml/metadata` 上可用,其中 **HOSTNAME** 是您的实例的主机名。 {% data variables.product.product_name %} 使用 `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` 绑定。
-| 值 | 其他名称 | 描述 | 示例 |
-|:-------------------- |:------------------------------------ |:---------------------------------------------------------------- |:--------------------------------- |
-| SP 实体 ID | SP URL, audience restriction | Your top-level URL for {% data variables.product.product_name %} | `http(s)://HOSTNAME` |
-| SP 断言使用者服务 (ACS) URL | Reply, recipient, or destination URL | IdP 发送 SAML 响应的 URL | `http(s)://HOSTNAME/saml/consume` |
-| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `http(s)://HOSTNAME/sso` |
+| 值 | 其他名称 | 描述 | 示例 |
+|:-------------------- |:------------- |:------------------------------------------------- |:--------------------------------- |
+| SP 实体 ID | SP URL,受众限制 | {% data variables.product.product_name %} 的顶级 URL | `http(s)://HOSTNAME` |
+| SP 断言使用者服务 (ACS) URL | 答复、收件人或目标 URL | IdP 发送 SAML 响应的 URL | `http(s)://HOSTNAME/saml/consume` |
+| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `http(s)://HOSTNAME/sso` |
{% elsif ghae %}
-The SP metadata for your enterprise on {% data variables.product.product_name %} is available at `https://HOSTNAME/saml/metadata`, where **HOSTNAME** is the hostname for your enterprise on {% data variables.product.product_name %}. {% data variables.product.product_name %} uses the `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` binding.
+{% data variables.product.product_name %} 上企业的 SP 元数据在 `https://HOSTNAME/saml/metadata` 上可用,其中 **HOSTNAME** 是企业在 {% data variables.product.product_name %} 上的主机名。 {% data variables.product.product_name %} 使用 `urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST` 绑定。
-| 值 | 其他名称 | 描述 | 示例 |
-|:-------------------- |:------------------------------------ |:---------------------------------------------------------------- |:------------------------------- |
-| SP 实体 ID | SP URL, audience restriction | Your top-level URL for {% data variables.product.product_name %} | `https://HOSTNAME` |
-| SP 断言使用者服务 (ACS) URL | Reply, recipient, or destination URL | IdP 发送 SAML 响应的 URL | `https://HOSTNAME/saml/consume` |
-| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://HOSTNAME/sso` |
+| 值 | 其他名称 | 描述 | 示例 |
+|:-------------------- |:------------- |:------------------------------------------------- |:------------------------------- |
+| SP 实体 ID | SP URL,受众限制 | {% data variables.product.product_name %} 的顶级 URL | `https://HOSTNAME` |
+| SP 断言使用者服务 (ACS) URL | 答复、收件人或目标 URL | IdP 发送 SAML 响应的 URL | `https://HOSTNAME/saml/consume` |
+| SP 单点登录 (SSO) URL | | IdP 开始 SSO 的 URL | `https://HOSTNAME/sso` |
{% endif %}
## SAML 属性
-The following SAML attributes are available for {% data variables.product.product_name %}.{% ifversion ghes %} You can change the attribute names in the management console, with the exception of the `administrator` attribute. For more information, see "[Accessing the management console](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)."{% endif %}
+以下 SAML 属性可用于 {% data variables.product.product_name %}。{% ifversion ghes %} 您可以在管理控制台中更改属性名称,但 `administrator` 属性除外。 更多信息请参阅“[访问管理控制台](/admin/configuration/configuring-your-enterprise/accessing-the-management-console)”。{% endif %}
-| 名称 | Required? | 描述 |
-|:--------------------- |:--------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `NameID` | 是 | 持久用户标识符。 可以使用任意持久名称标识符格式。 {% ifversion ghec %}If you use an enterprise with {% data variables.product.prodname_emus %}, {% endif %}{% data variables.product.product_name %} will normalize the `NameID` element to use as a username unless one of the alternative assertions is provided. For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)." |
-| `SessionNotOnOrAfter` | 否 | The date that {% data variables.product.product_name %} invalidates the associated session. After invalidation, the person must authenticate once again to access {% ifversion ghec or ghae %}your enterprise's resources{% elsif ghes %}{% data variables.product.product_location %}{% endif %}. For more information, see "[Session duration and timeout](#session-duration-and-timeout)." |
+| 名称 | 必填? | 描述 |
+|:--------------------- |:--- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `NameID` | 是 | 持久用户标识符。 可以使用任意持久名称标识符格式。 {% ifversion ghec %}如果将企业与 {% data variables.product.prodname_emus %} 一起使用, {% endif %}{% data variables.product.product_name %} 将规范化 `NameID` 元素以用作用户名,除非提供了替代断言之一。 更多信息请参阅“[外部身份验证的用户名注意事项](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)”。 |
+| `SessionNotOnOrAfter` | 否 | {% data variables.product.product_name %} 使关联的会话失效的日期。 失效后,此人必须再次进行身份验证才能访问 {% ifversion ghec or ghae %}企业的资源{% elsif ghes %}{% data variables.product.product_location %}{% endif %}。 更多信息请参阅“[会话持续时间和超时](#session-duration-and-timeout)”。 |
{%- ifversion ghes or ghae %}
-| `administrator` | No | When the value is `true`, {% data variables.product.product_name %} will automatically promote the user to be a {% ifversion ghes %}site administrator{% elsif ghae %}enterprise owner{% endif %}. Any other value or a non-existent value will demote the account and remove administrative access. | | `username` | No | The username for {% data variables.product.product_location %}. |
+| `administrator` | 无|当值为 `true` 时,{% data variables.product.product_name %} 会自动将用户提升为 {% ifversion ghes %}站点管理员{% elsif ghae %}企业所有者{% endif %}。 任何其他值或不存在的值都将降级帐户并删除管理访问权限。 | | `username` | 无 | {% data variables.product.product_location %} 的用户名。 |
{%- endif %}
-| `full_name` | No | {% ifversion ghec %}If you configure SAML SSO for an enterprise and you use {% data variables.product.prodname_emus %}, the{% else %}The{% endif %} full name of the user to display on the user's profile page. | | `emails` | No | The email addresses for the user.{% ifversion ghes or ghae %} You can specify more than one address.{% endif %}{% ifversion ghec or ghes %} If you sync license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_github_connect %} uses `emails` to identify unique users across products. For more information, see "[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} | | `public_keys` | No | {% ifversion ghec %}If you configure SAML SSO for an enterprise and you use {% data variables.product.prodname_emus %}, the{% else %}The{% endif %} public SSH keys for the user. You can specify more than one key. | | `gpg_keys` | No | {% ifversion ghec %}If you configure SAML SSO for an enterprise and you use {% data variables.product.prodname_emus %}, the{% else %}The{% endif %} GPG keys for the user. You can specify more than one key. |
+| `full_name` |无| {% ifversion ghec %}如果为企业配置 SAML SSO 并使用 {% data variables.product.prodname_emus %},则{% else %}{% endif %} 用户的全名显示在用户的个人资料页上。 | | `emails` | 无| 用户的电子邮件地址。{% ifversion ghes or ghae %} 您可以指定多个地址。{% endif %}{% ifversion ghec or ghes %} 如果在 {% data variables.product.prodname_ghe_server %} 和 {% data variables.product.prodname_ghe_cloud %} 之间同步许可证使用情况,{% data variables.product.prodname_github_connect %} 将使用 `emails` 跨产品识别唯一用户。 更多信息请参阅“[在 {% data variables.product.prodname_ghe_server %} 和 {% data variables.product.prodname_ghe_cloud %} 之间同步许可证使用情况](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)”。{% endif %} | | `public_keys` |无| {% ifversion ghec %}如果为企业配置 SAML SSO 并使用 {% data variables.product.prodname_emus %},则为{% else %}{% endif %} 用户的公有 SSH 密钥。 您可以指定多个键。 | | `gpg_keys` |无| {% ifversion ghec %}如果为企业配置 SAML SSO 并使用 {% data variables.product.prodname_emus %},则{% else %}{% endif %}为用户的 GPG 密钥。 您可以指定多个键。 |
要为属性指定多个值,请使用多个 `` 元素。
@@ -93,20 +93,20 @@ The following SAML attributes are available for {% data variables.product.produc
```
-## SAML response requirements
+## SAML 响应要求
-{% data variables.product.product_name %} requires that the response message from your IdP fulfill the following requirements.
+{% data variables.product.product_name %} 要求来自 IdP 的响应消息满足以下要求。
-- Your IdP must provide the `` element on the root response document and match the ACS URL only when the root response document is signed. If your IdP signs the assertion, {% data variables.product.product_name %} will ignore the assertion.
-- Your IdP must always provide the `` element as part of the `` element. The value must match your `EntityId` for {% data variables.product.product_name %}.{% ifversion ghes or ghae %} This value is the URL where you access {% data variables.product.product_location %}, such as {% ifversion ghes %}`http(s)://HOSTNAME`{% elsif ghae %}`https://SUBDOMAIN.githubenterprise.com`, `https://SUBDOMAIN.github.us`, or `https://SUBDOMAIN.ghe.com`{% endif %}.{% endif %}
+- 您的 IdP 必须在根响应文档上提供 `` 元素,并且只有在对根响应文档进行签名时才与 ACS URL 匹配。 如果您的 IdP 对断言进行签名,{% data variables.product.product_name %} 将忽略该断言。
+- 您的 IdP 必须始终提供 `` 元素作为 `` 元素的一部分。 该值必须与 {% data variables.product.product_name %} 的 `EntityId` 匹配。{% ifversion ghes or ghae %} 此值是您访问 {% data variables.product.product_location %} 的 URL,例如 {% ifversion ghes %}`http(s)://HOSTNAME`{% elsif ghae %}`https://SUBDOMAIN.githubenterprise.com`、`https://SUBDOMAIN.github.us` 或 `https://SUBDOMAIN.ghe.com`{% endif %}。{% endif %}
{%- ifversion ghec %}
- - If you configure SAML for an organization, this value is `https://github.com/orgs/ORGANIZATION`.
- - If you configure SAML for an enterprise, this URL is `https://github.com/enterprises/ENTERPRISE`.
+ - 如果为组织配置 SAML,则此值为 `https://github.com/orgs/ORGANIZATION`。
+ - 如果为企业配置 SAML,则此 URL 为 `https://github.com/enterprises/ENTERPRISE`。
{%- endif %}
-- Your IdP must protect each assertion in the response with a digital signature. You can accomplish this by signing each individual `` element or by signing the `` element.
-- Your IdP must provide a `` element as part of the `` element. You may use any persistent name identifier format.
-- Your IdP must include the `Recipient` attribute, which must be set to the ACS URL. The following example demonstrates the attribute.
+- 您的 IdP 必须使用数字签名保护响应中的每个断言。 可以通过对每个单独的 `` 元素进行签名或对 `` 元素进行签名来实现此目的。
+- 您的 IdP 必须提供 `` 元素作为 `` 元素的一部分。 您可以使用任何永久名称标识符格式。
+- 您的 IdP 必须包含 `Recipient` 属性,该属性必须设置为 ACS URL。 下面的示例演示了该属性。
```xml
@@ -126,17 +126,17 @@ The following SAML attributes are available for {% data variables.product.produc
```
-## Session duration and timeout
+## 会话持续时间和超时
-To prevent a person from authenticating with your IdP and staying authorized indefinitely, {% data variables.product.product_name %} periodically invalidates the session for each user account with access to {% ifversion ghec or ghae %}your enterprise's resources{% elsif ghes %}{% data variables.product.product_location %}{% endif %}. After invalidation, the person must authenticate with your IdP once again. By default, if your IdP does not assert a value for the `SessionNotOnOrAfter` attribute, {% data variables.product.product_name %} invalidates a session {% ifversion ghec %}24 hours{% elsif ghes or ghae %}one week{% endif %} after successful authentication with your IdP.
+为防止别人使用您的 IdP 进行身份验证并无限期地保持授权状态,{% data variables.product.product_name %} 会定期使有权访问{% ifversion ghec or ghae %}企业资源{% elsif ghes %}{% data variables.product.product_location %}{% endif %}的每个用户帐户的会话失效。 失效后,此人必须再次向您的 IdP 进行身份验证。 默认情况下,如果您的 IdP 未断言 `SessionNotOnOrAfter` 属性的值,则 {% data variables.product.product_name %} 在使用 IdP 成功进行身份验证后 {% ifversion ghec %}24 小时{% elsif ghes or ghae %}一周{% endif %}内使会话失效。
-To customize the session duration, you may be able to define the value of the `SessionNotOnOrAfter` attribute on your IdP. If you define a value less than 24 hours, {% data variables.product.product_name %} may prompt people to authenticate every time {% data variables.product.product_name %} initiates a redirect.
+要自定义会话持续时间,您可以在 IdP 上定义 `SessionNotOnOrAfter` 属性的值。 如果定义的值小于 24 小时,则每次 {% data variables.product.product_name %} 启动重定向时,{% data variables.product.product_name %} 都会提示用户进行身份验证。
{% note %}
**注意**:
-- For Azure AD, the configurable lifetime policy for SAML tokens does not control session timeout for {% data variables.product.product_name %}.
-- Okta does not currently send the `SessionNotOnOrAfter` attribute during SAML authentication with {% data variables.product.product_name %}. For more information, contact Okta.
+- 对于 Azure AD,SAML 令牌的可配置生存期策略不控制 {% data variables.product.product_name %} 的会话超时。
+- Okta 当前不会在向 {% data variables.product.product_name %} 进行 SAML 身份验证期间发送 `SessionNotOnOrAfter` 属性。 更多信息请联系 Okta。
{% endnote %}
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account.md
index f9f559a0f3..7337f210a9 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account.md
@@ -9,7 +9,7 @@ topics:
- Enterprise
- Organizations
type: how_to
-shortTitle: From organization to enterprise
+shortTitle: 从组织到企业
redirect_from:
- /github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account
- /admin/authentication/managing-identity-and-access-for-your-enterprise/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
index 235929a921..bb31eb2893 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/troubleshooting-saml-authentication.md
@@ -1,7 +1,7 @@
---
title: SAML 身份验证
-shortTitle: Troubleshoot SAML SSO
-intro: 'If you use SAML single sign-on (SSO) and people are unable to authenticate to access {% data variables.product.product_location %}, you can troubleshoot the problem.'
+shortTitle: SAML SSO 故障排除
+intro: '如果使用 SAML 单点登录 (SSO),并且用户无法通过身份验证来访问 {% data variables.product.product_location %},则可以对问题进行故障排除。'
versions:
ghes: '*'
type: how_to
@@ -15,11 +15,11 @@ topics:
- Troubleshooting
---
-## About problems with SAML authentication
+## 关于 SAML 身份验证的问题
-{% data variables.product.product_name %} logs error messages for failed SAML authentication in the authentication log at _/var/log/github/auth.log_. You can review responses in this log file, and you can also configure more verbose logging.
+{% data variables.product.product_name %} 在 _/var/log/github/auth.log_ 的身份验证日志中为失败的 SAML 身份验证记录错误消息。 您可以在此日志文件中查看响应,还可以配置更详细的日志记录。
-For more information about SAML response requirements, see "[SAML configuration reference](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#saml-response-requirements)."
+关于 SAML 响应要求的更多信息,请参阅“[SAML 配置参考](/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference#saml-response-requirements)”。
## 配置 SAML 调试
@@ -59,13 +59,13 @@ $ base64 --decode ENCODED OUTPUT
## Error: "Another user already owns the account"(错误:“其他用户已拥有该帐户”)
-When a user signs into {% data variables.product.product_location %} for the first time with SAML authentication, {% data variables.product.product_name %} creates a user account on the instance and maps the SAML `NameID` to the account.
+当用户首次使用 SAML 身份验证登录到 {% data variables.product.product_location %} 时, {% data variables.product.product_name %} 会在实例上创建一个用户帐户,并将 SAML `NameID` 映射到该帐户。
当用户再次登录时,{% data variables.product.prodname_ghe_server %} 会比较帐户的 `NameID` 映射与 IdP 的响应。 如果 IdP 响应中的 `NameID` 不再与 {% data variables.product.product_name %} 对用户预期的 `NameID` 匹配, 登录将失败。 用户将看到以下消息。
> 另一个用户已经拥有该帐户。 请让您的管理员检查身份验证日志。
-该消息通常表示此人的用户名或电子邮件地址已在 IdP 上更改。 确保 {% data variables.product.prodname_ghe_server %} 上用户帐户的 `NameID` 映射与 IdP 上的用户 `NameID` 相匹配。 For more information, see "[Updating a user's SAML `NameID`](/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid)."
+该消息通常表示此人的用户名或电子邮件地址已在 IdP 上更改。 确保 {% data variables.product.prodname_ghe_server %} 上用户帐户的 `NameID` 映射与 IdP 上的用户 `NameID` 相匹配。 更多信息请参阅“[更新用户的 SAML `NameID`](/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid)”。
## Error: Recipient in SAML response was blank or not valid(错误:SAML 响应中的收件人为空或无效)
@@ -99,4 +99,4 @@ SAML Response is not signed or has been modified.
Audience is invalid. Audience is invalid. Audience attribute does not match your_instance_url
```
-Ensure that you set the value for `Audience` on your IdP to the `EntityId` for {% data variables.product.product_location %}, which is the full URL to your instance. 例如,`https://ghe.corp.example.com`。
+确保将 IdP 上 `Audience` 的值设置为 {% data variables.product.product_location %} 的 `EntityId`,这是实例的完整 URL。 例如,`https://ghe.corp.example.com`。
diff --git a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
index 63b4391a76..1a4274bb46 100644
--- a/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
+++ b/translations/zh-CN/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/updating-a-users-saml-nameid.md
@@ -1,7 +1,7 @@
---
-title: Updating a user's SAML NameID
-shortTitle: Update SAML NameID
-intro: 'When an account''s `NameID` changes on your identity provider (IdP) and the person can no longer {% ifversion ghes or ghae %}sign into {% data variables.product.product_location %}{% elsif ghec %}authenticate to access your enterprise''s resources{% endif %}, you must {% ifversion ghec %}either contact {% data variables.product.company_short %} Support or revoke the person''s linked identity{% elsif ghes %}update the `NameID` mapping on {% data variables.product.product_location %}{% elsif ghae %}contact {% data variables.product.company_short %} Support{% endif %}.'
+title: 更新用户的 SAML NameID
+shortTitle: 更新 SAML NameID
+intro: '当帐户的“NameID”在身份提供程序 (IdP) 上发生更改并且该人员无法再 {% ifversion ghes or ghae %}登录 {% data variables.product.product_location %}{% elsif ghec %}进行身份验证以访问您的企业资源{% endif %}时,您必须 {% ifversion ghec %}联系 {% data variables.product.company_short %} 支持或撤消该人员的链接身份{% elsif ghes %}更新 {% data variables.product.product_location %} 上的“NameID”{% elsif ghae %}联系 {% data variables.product.company_short %} 支持{% endif %}。'
versions:
ghes: '*'
type: how_to
@@ -13,13 +13,13 @@ topics:
- SSO
---
-## About updates to users' SAML `NameID`
+## 关于对用户的 SAML `NameID` 的更新
-In some situations, you may need to update values associated with a person's account on your SAML IdP. If that identifier is also the `NameID` that you use for authentication on {% data variables.product.product_name %}, you must update the `NameID` mapping on your instance so the person can continue to authenticate successfully. For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)."
+在某些情况下,您可能需要更新与 SAML IdP 上的人员帐户关联的值。 如果该标识符也是您在 {% data variables.product.product_name %} 上用于身份验证的 `NameID`,则必须更新实例上的 `NameID` 映射,以便该人员可以继续成功进行身份验证。 更多信息请参阅“[外部身份验证的用户名注意事项](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)”。
## 更新用户的 SAML `NameID`
-Enterprise owners can update a user's SAML `NameID` on a {% data variables.product.product_name %} instance.
+企业所有者可以在 {% data variables.product.product_name %} 实例上更新用户的 SAML `NameID`。
{% data reusables.enterprise_site_admin_settings.access-settings %}
2. 选择 **SAML**。 
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md
new file mode 100644
index 0000000000..cb64618b5f
--- /dev/null
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics.md
@@ -0,0 +1,102 @@
+---
+title: About Server Statistics
+intro: 'You can use {% data variables.product.prodname_server_statistics %} to analyze your own aggregate data from {% data variables.product.prodname_ghe_server %}, and help us improve {% data variables.product.company_short %} products.'
+versions:
+ feature: server-statistics
+permissions: 'Enterprise owners can enable {% data variables.product.prodname_server_statistics %}.'
+redirect_from:
+ - /early-access/github/analyze-how-your-team-works-with-server-statistics/about-server-statistics
+topics:
+ - Enterprise
+---
+
+{% data reusables.server-statistics.release-phase %}
+
+## About the benefits of {% data variables.product.prodname_server_statistics %}
+
+{% data variables.product.prodname_server_statistics %} can help you anticipate the needs of your organization, understand how your team works, and show the value you get from {% data variables.product.prodname_ghe_server %}.
+
+Once enabled, {% data variables.product.prodname_server_statistics %} collects aggregate data on how much certain features are used on your instance over time. Unlike other [Admin Stats API](/rest/reference/enterprise-admin#admin-stats) endpoints, which only return data for the last day, {% data variables.product.prodname_server_statistics %} provides historical data of all {% data variables.product.prodname_server_statistics %} metrics collected since the day you enabled the feature. 更多信息请参阅“[为企业启用 {% data variables.product.prodname_server_statistics %}](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise)”。
+
+When you enable {% data variables.product.prodname_server_statistics %}, you're helping to build a better {% data variables.product.prodname_dotcom %}. The aggregated data you'll provide gives us insights into how {% data variables.product.prodname_dotcom %} adds value to our customers. This information allows {% data variables.product.company_short %} to make better and more informed product decisions, ultimately benefiting you.
+
+## About data security
+
+We respect your data. We will never transmit data from {% data variables.product.product_location %} unless you have first given us permission to do so.
+
+We collect no personal data. We also don't collect any {% data variables.product.company_short %} content, such as code, issues, comments, or pull request content.
+
+Only owners of the connected enterprise account or organization on {% data variables.product.prodname_ghe_cloud %} can access the data.
+
+Only certain aggregate metrics are collected on repositories, issues, pull requests, and other features. To see the list of aggregate metrics collected, see "[{% data variables.product.prodname_server_statistics %} data collected](#server-statistics-data-collected)."
+
+Any updates to the collected metrics will happen in future feature releases of {% data variables.product.prodname_ghe_server %} and will be described in the [{% data variables.product.prodname_ghe_server %} release notes](/admin/release-notes). In addition, we will update this article with all metric updates.
+
+For a better understanding of how we store and secure {% data variables.product.prodname_server_statistics %} data, see "[GitHub Security](https://github.com/security)."
+
+### About data retention and deletion
+
+{% data variables.product.company_short %} collects {% data variables.product.prodname_server_statistics %} data for as long as your {% data variables.product.prodname_ghe_server %} license is active and the {% data variables.product.prodname_server_statistics %} feature is enabled.
+
+If you would like to delete your data, you may do so by contacting GitHub Support, your {% data variables.product.prodname_dotcom %} account representative, or your Customer Success Manager. Generally, we delete data in the timeframe specified in our privacy statement. For more information, see [{% data variables.product.company_short %}'s privacy statement](/free-pro-team@latest/site-policy/privacy-policies/github-privacy-statement#data-retention-and-deletion-of-data) in the {% data variables.product.prodname_dotcom_the_website %} documentation.
+
+### About data portability
+
+As an organization owner or enterprise owner on {% data variables.product.prodname_ghe_cloud %}, you can access {% data variables.product.prodname_server_statistics %} data by exporting the data in a CSV or JSON file or through the {% data variables.product.prodname_server_statistics %} REST API. For more information, see "[Requesting {% data variables.product.prodname_server_statistics %} using the REST API](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api)" or "[Exporting {% data variables.product.prodname_server_statistics %}](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics)."
+
+## About disabling data collection
+
+You can disable the {% data variables.product.prodname_server_statistics %} feature at any time. 更多信息请参阅“[为企业启用 {% data variables.product.prodname_server_statistics %}](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise)”。
+
+## {% data variables.product.prodname_server_statistics %} data collected
+
+After you enable {% data variables.product.prodname_server_statistics %}, metrics are collected through a daily job that runs on {% data variables.product.product_location %}. The aggregate metrics are stored on your organization or enterprise account on {% data variables.product.prodname_ghe_cloud %} and are not stored on {% data variables.product.product_location %}.
+
+The following aggregate metrics will be collected and transmitted on a daily basis and represent the total counts for the day:
+ - `active_hooks`
+ - `admin_users`
+ - `closed_issues`
+ - `closed_milestones`
+ - `collection_date`
+ - `disabled_orgs`
+ - `dormancy_threshold`
+ - `fork_repos`
+ - `ghes_version`
+ - `github_connect_features_enabled`
+ - `inactive_hooks`
+ - `mergeable_pulls`
+ - `merged_pulls`
+ - `open_issues`
+ - `open_milestones`
+ - `org_repos`
+ - `private_gists`
+ - `public_gists`
+ - `root_repos`
+ - `schema_version`
+ - `server_id`
+ - `suspended_users`
+ - `total_commit_comments`
+ - `total_dormant_users`
+ - `total_gist_comments`
+ - `total_gists`
+ - `total_hooks`
+ - `total_issues`
+ - `total_issue_comments`
+ - `total_milestones`
+ - `total_repos`
+ - `total_orgs`
+ - `total_pages`
+ - `total_pull_request_comments`
+ - `total_pulls`
+ - `total_pushes`
+ - `total_team_members`
+ - `total_teams`
+ - `total_users`
+ - `total_wikis`
+ - `unmergeable_pulls`
+
+## {% data variables.product.prodname_server_statistics %} payload example
+
+To see an example of the response payload for the {% data variables.product.prodname_server_statistics %} API, see "[Requesting {% data variables.product.prodname_server_statistics %} using the REST API](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api)."
+
+To see a list of the data collected, see "[{% data variables.product.prodname_server_statistics %} data collected](#server-statistics-data-collected)."
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md
new file mode 100644
index 0000000000..65f2b5a0fb
--- /dev/null
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/exporting-server-statistics.md
@@ -0,0 +1,43 @@
+---
+title: Exporting Server Statistics
+shortTitle: Export Server Statistics
+intro: 'You can use your own tools to analyze your {% data variables.product.prodname_ghe_server %} usage over time by downloading your {% data variables.product.prodname_server_statistics %} metrics in a CSV or JSON file.'
+versions:
+ feature: server-statistics
+redirect_from:
+ - /early-access/github/analyze-how-your-team-works-with-server-statistics/exploring-server-statistics
+---
+
+{% data reusables.server-statistics.release-phase %}
+
+You can download up to the last 365 days of {% data variables.product.prodname_server_statistics %} data in a CSV or JSON file. This data, which includes aggregate metrics on repositories, issues, and pull requests, can help you anticipate the needs of your organization, understand how your team works, and show the value you get from {% data variables.product.prodname_ghe_server %}.
+
+Before you can download this data, you must enable {% data variables.product.prodname_server_statistics %}. 更多信息请参阅“[为企业启用 {% data variables.product.prodname_server_statistics %}](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise)”。
+
+To preview the metrics available to download, see "[About {% data variables.product.prodname_server_statistics %}](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics)."
+
+To download these metrics, you must be an enterprise owner or organization owner on {% data variables.product.prodname_ghe_cloud %}.
+ - If {% data variables.product.product_location %} is connected to an enterprise account on {% data variables.product.prodname_ghe_cloud %}, see "[Downloading metrics from your enterprise account](#downloading-metrics-from-your-enterprise-account)."
+ - If {% data variables.product.product_location %} is connected to an organization on {% data variables.product.prodname_ghe_cloud %}, see "[Downloading metrics from your organization](#downloading-metrics-from-your-organization)."
+
+要了解有关 {% data variables.product.prodname_github_connect %} 的更多信息,请参阅“[关于 {% data variables.product.prodname_github_connect %}](/admin/configuration/configuring-github-connect/about-github-connect)”。
+
+## Downloading metrics from your enterprise account
+
+1. 在 {% data variables.product.prodname_ghe_cloud %} 的右上角,单击您的个人资料照片,然后单击 **Your enterprises(您的企业)**。 
+
+2. Next to your desired enterprise account, click **Settings**. 
+
+3. On the left, click **GitHub Connect**. 
+
+{% data reusables.server-statistics.csv-download %}
+
+## Downloading metrics from your organization
+
+1. In the top-right corner of {% data variables.product.prodname_ghe_cloud %}, click your profile photo, then click **Your organizations**. 
+
+2. In the list of organizations, next to the organization that's connected to {% data variables.product.product_location %}, click **Settings**. 
+
+3. On the left, click **GitHub Connect**. 
+
+{% data reusables.server-statistics.csv-download %}
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md
new file mode 100644
index 0000000000..507a57ae5f
--- /dev/null
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/index.md
@@ -0,0 +1,12 @@
+---
+title: Analyzing how your team works with Server Statistics
+shortTitle: Server Statistics
+intro: 'To analyze how your team works, understand the value you get from {% data variables.product.prodname_ghe_server %}, and help us improve our products, you can use {% data variables.product.prodname_server_statistics %} to review your usage data for {% data variables.product.prodname_ghe_server %} and share this aggregate data with {% data variables.product.company_short %}.'
+versions:
+ feature: server-statistics
+children:
+ - /about-server-statistics
+ - /exporting-server-statistics
+ - /requesting-server-statistics-using-the-rest-api
+---
+
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md
new file mode 100644
index 0000000000..c4da09bc94
--- /dev/null
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api.md
@@ -0,0 +1,17 @@
+---
+title: Requesting Server Statistics using the REST API
+shortTitle: Server Statistics and REST API
+intro: 'You can use your own tools to analyze your {% data variables.product.prodname_ghe_server %} usage over time by requesting the {% data variables.product.prodname_server_statistics %} metrics collected using the REST API.'
+versions:
+ feature: server-statistics
+redirect_from:
+ - /early-access/github/analyze-how-your-team-works-with-server-statistics/requesting-server-statistics-using-the-rest-api
+---
+
+{% data reusables.server-statistics.release-phase %}
+
+You can request up to 365 days of metrics in a single {% data variables.product.prodname_server_statistics %} REST API request. This data, which includes aggregate metrics on repositories, issues, and pull requests, can help you anticipate the needs of your organization, understand how your team works, and show the value you get from {% data variables.product.prodname_ghe_server %}. For a list of the metrics collected, see "[{% data variables.product.prodname_server_statistics %} data collected](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics#server-statistics-data-collected)."
+
+Before you can use the {% data variables.product.prodname_server_statistics %} REST API, you must enable {% data variables.product.prodname_server_statistics %}. 更多信息请参阅“[为企业启用 {% data variables.product.prodname_server_statistics %}](/admin/configuration/configuring-github-connect/enabling-server-statistics-for-your-enterprise)”。
+
+For more information about using the REST API to request server statistics, see "[Get {% data variables.product.prodname_ghe_server %} statistics](/enterprise-cloud@latest/rest/enterprise-admin/admin-stats#get-github-enterprise-server-statistics)" in the {% data variables.product.prodname_ghe_cloud %} REST API documentation.
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/index.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/index.md
index 3760d226df..1cdd9e6522 100644
--- a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/index.md
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/index.md
@@ -12,6 +12,7 @@ topics:
children:
- /reviewing-audit-logs-for-your-enterprise
- /exploring-user-activity
+ - /analyzing-how-your-team-works-with-server-statistics
shortTitle: 监控活动
---
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise.md
index b5bb1d3431..fa1782ea72 100644
--- a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise.md
@@ -1,7 +1,7 @@
---
-title: Accessing the audit log for your enterprise
-intro: You can view aggregated actions from all of the organizations owned by an enterprise account in the enterprise's audit log.
-shortTitle: Access audit logs
+title: 访问企业的审核日志
+intro: 您可以在企业的审核日志中查看企业帐户拥有的所有组织的聚合操作。
+shortTitle: 访问审核日志
permissions: 'Enterprise owners {% ifversion ghes %}and site administrators {% endif %}can access the audit log.'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
diff --git a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
index cab8073c92..844392d5b5 100644
--- a/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
@@ -1181,7 +1181,7 @@ Action | Description
| `restrict_notification_delivery.disable` | Email notification restrictions for an organization or enterprise were disabled. For more information, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/restricting-email-notifications-for-your-organization)" and "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise)."
{%- endif %}
-{%- ifversion ghec or ghes > 3.4 or ghae-issue-6271 %}
+{%- if custom-repository-roles %}
### `role` category actions
| Action | Description
diff --git a/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md b/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md
index 2803334c13..635ac8a067 100644
--- a/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md
+++ b/translations/zh-CN/content/admin/overview/creating-an-enterprise-account.md
@@ -1,6 +1,6 @@
---
-title: 创建企业帐户
-intro: '如果您当前在单个组织中使用 {% data variables.product.prodname_ghe_cloud %} ,则可以创建企业帐户来集中管理多个组织。'
+title: Creating an enterprise account
+intro: "If you're currently using {% data variables.product.prodname_ghe_cloud %} with a single organization, you can create an enterprise account to centrally manage multiple organizations."
versions:
ghec: '*'
type: how_to
@@ -9,40 +9,45 @@ topics:
- Enterprise
- Fundamentals
permissions: Organization owners can create an enterprise account.
-shortTitle: 创建企业帐户
+shortTitle: Create enterprise account
---
-## 关于企业帐户创建
+## About enterprise account creation
-{% data variables.product.prodname_ghe_cloud %} 包括创建企业帐户的选项,该选项支持多个组织之间的协作,并为管理员提供单一的可见性和管理点。 更多信息请参阅“[关于企业帐户](/admin/overview/about-enterprise-accounts)”。
+{% data variables.product.prodname_ghe_cloud %} includes the option to create an enterprise account, which enables collaboration between multiple organizations and gives administrators a single point of visibility and management. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)."
-{% data reusables.enterprise.create-an-enterprise-account %} 如果您通过发票付款,则可以在 {% data variables.product.prodname_dotcom %} 上自行创建企业帐户。 如果不是,您可以[联系我们的销售团队](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards)转到发票。
+{% data reusables.enterprise.create-an-enterprise-account %} If you pay by invoice, you can create an enterprise account yourself on {% data variables.product.prodname_dotcom %}. If not, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to move to invoicing.
-企业帐户包含在 {% data variables.product.prodname_ghe_cloud %} 中,因此创建一个帐户不会影响您的帐单。
+An enterprise account is included in {% data variables.product.prodname_ghe_cloud %}, so creating one will not affect your bill.
-创建企业帐户时,现有组织将自动归企业帐户所有。 组织的所有当前所有者都将成为企业帐户的所有者。 组织的所有当前帐单管理员都将成为新企业帐户的帐单管理员。 组织的当前帐单详细信息(包括组织的帐单电子邮件地址)将成为新企业帐户的帐单详细信息。
+When you create an enterprise account, your existing organization will automatically be owned by the enterprise account. All current owners of your organization will become owners of the enterprise account. All current billing managers of the organization will become billing managers of the new enterprise account. The current billing details of the organization, including the organization's billing email address, will become billing details of the new enterprise account.
-## 在 {% data variables.product.prodname_dotcom %} 上创建企业帐户
+If the organization is connected to {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_ghe_managed %} via {% data variables.product.prodname_github_connect %}, upgrading the organization to an enterprise account **will not** update the connection. If you want to connect to the new enterprise account, you must disable and re-enable {% data variables.product.prodname_github_connect %}.
-若要在 {% data variables.product.prodname_dotcom %} 上创建企业帐户,您的组织必须使用 {% data variables.product.prodname_ghe_cloud %} 并通过发票付款。
+- "[Managing {% data variables.product.prodname_github_connect %}](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation
+- "[Managing {% data variables.product.prodname_github_connect %}](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation
+
+## Creating an enterprise account on {% data variables.product.prodname_dotcom %}
+
+To create an enterprise account on {% data variables.product.prodname_dotcom %}, your organization must be using {% data variables.product.prodname_ghe_cloud %} and paying by invoice.
{% data reusables.organizations.billing-settings %}
-1. 单击 **Upgrade to enterprise account(升级到企业帐户)**。
+1. Click **Upgrade to enterprise account**.
- 
-1. 在“Enterprise name(企业名称)”下,键入企业帐户的名称。
+ 
+1. Under "Enterprise name", type a name for your enterprise account.
- 
-1. 在“Enterprise URL slug(企业 URL 辅助信息域)”下,键入企业帐户的辅助信息。 此数据辅助信息将在企业的 URL 中使用。 例如,如果您选择 `octo-enterprise`,则企业的 URL 将为 `https://github.com/enterprises/octo-enterprise`。
+ 
+1. Under "Enterprise URL slug", type a slug for your enterprise account. This slug will be used in the URL for your enterprise. For example, if you choose `octo-enterprise`, the URL for your enterprise will be `https://github.com/enterprises/octo-enterprise`.
- 
-1. 单击 **Confirm and upgrade(确认并升级)**。
+ 
+1. Click **Confirm and upgrade**.
- 
-1. 阅读警告,然后单击 **Create enterprise account(创建企业帐户)**。
+ 
+1. Read the warnings, then click **Create enterprise account**.
- 
+ 
-## 后续步骤
+## Next steps
-创建企业帐户后,我们建议详细了解企业帐户的工作原理以及配置设置和策略。 有关详细信息,请遵循“[开始使用您的企业帐户](/admin/guides#get-started-with-your-enterprise-account)”学习路径。
+After your enterprise account is created, we recommend learning more about how enterprise accounts work and configuring settings and policies. For more information, follow the "[Get started with your enterprise account](/admin/guides#get-started-with-your-enterprise-account)" learning path.
diff --git a/translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md b/translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md
index dd80f88b9c..f25fe444a6 100644
--- a/translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md
@@ -1,6 +1,6 @@
---
-title: 为企业配置包生态系统支持
-intro: '您可以通过全局启用或禁用企业上的单个包生态系统(包括 Docker、RubyGems、npm、Apache Maven、Gradle 或 NuGet)为企业配置 {% data variables.product.prodname_registry %} 。 了解支持特定包生态系统的其他配置要求。'
+title: Configuring package ecosystem support for your enterprise
+intro: 'You can configure {% data variables.product.prodname_registry %} for your enterprise by globally enabling or disabling individual package ecosystems on your enterprise, including {% ifversion ghes > 3.4 %}{% data variables.product.prodname_container_registry %}, {% endif %}Docker, and npm. Learn about other configuration requirements to support specific package ecosystems.'
redirect_from:
- /enterprise/admin/packages/configuring-packages-support-for-your-enterprise
- /admin/packages/configuring-packages-support-for-your-enterprise
@@ -10,43 +10,45 @@ type: how_to
topics:
- Enterprise
- Packages
-shortTitle: 配置包生态系统
+shortTitle: Configure package ecosystems
---
{% data reusables.package_registry.packages-ghes-release-stage %}
-## 启用或禁用单个包生态系统
+## Enabling or disabling individual package ecosystems
-要防止上传新包,可以将以前启用的生态系统设置为**只读**,同时仍允许下载现有包。
+To prevent new packages from being uploaded, you can set an ecosystem you previously enabled to **Read-Only**, while still allowing existing packages to be downloaded.
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
{% data reusables.enterprise_site_admin_settings.packages-tab %}
-1. 在“Ecosystem Toggles(生态系统切换)”下,为每个包类型选择 **Enabled(启用)**、**Read-Only(只读)**或 **Disabled(禁用)**。
-{% ifversion ghes > 3.1 %}
- {% else %}
-{% endif %}
+1. Under "Ecosystem Toggles", for each package type, select **Enabled**, **Read-Only**, or **Disabled**.
+ {%- ifversion ghes > 3.4 %}{% note -%}
+ **Note**: Subdomain isolation must be enabled to toggle the {% data variables.product.prodname_container_registry %} options.
+ {%- endnote %}{%- endif %}{%- ifversion ghes > 3.1 %}
+ {% else %}
+ {% endif %}
{% data reusables.enterprise_management_console.save-settings %}
{% ifversion ghes %}
-## 连接到官方 npm 注册表
+## Connecting to the official npm registry
-如果您已在企业中启用了 npm 包,并希望允许访问官方 npm 注册表以及 {% data variables.product.prodname_registry %} npm 注册表,则必须执行一些附加配置。
+If you've enabled npm packages on your enterprise and want to allow access to the official npm registry as well as the {% data variables.product.prodname_registry %} npm registry, then you must perform some additional configuration.
-{% data variables.product.prodname_registry %} 使用透明的网络流量代理连接到 `registry.npmjs.com` 上的官方 npm 注册表。 代理在默认情况下已启用,不能禁用。
+{% data variables.product.prodname_registry %} uses a transparent proxy for network traffic that connects to the official npm registry at `registry.npmjs.com`. The proxy is enabled by default and cannot be disabled.
-要允许网络连接到 npm 注册表,您需要配置网络 ACL,以允许 {% data variables.product.prodname_ghe_server %} 将 HTTPS 流量通过端口 443 发送到 `registry.npmjs.com`:
+To allow network connections to the npm registry, you will need to configure network ACLs that allow {% data variables.product.prodname_ghe_server %} to send HTTPS traffic to `registry.npmjs.com` over port 443:
-| 源 | 目标 | 端口 | 类型 |
-| -------------------------------------------------- | -------------------- | ------- | ----- |
+| Source | Destination | Port | Type |
+|---|---|---|---|
| {% data variables.product.prodname_ghe_server %} | `registry.npmjs.com` | TCP/443 | HTTPS |
-请注意,`registry.npmjs.com` 的连接遍历 Cloudflare 网络,但此后不连接至单个静态 IP 地址;而是连接到此处列出的 CIDR 范围内的 IP 地址:https://www.cloudflare.com/ips/。
+Note that connections to `registry.npmjs.com` traverse through the Cloudflare network, and subsequently do not connect to a single static IP address; instead, a connection is made to an IP address within the CIDR ranges listed here: https://www.cloudflare.com/ips/.
-如果要启用 npm 上游源,请选择“`为 npm 上游`启用”。
+If you wish to enable npm upstream sources, select `Enabled` for `npm upstreaming`.
{% endif %}
-## 后续步骤
+## Next steps
-下一步,我们建议您检查是否需要更新或上传包主机 URL 的 TLS 证书。 更多信息请参阅“[企业的 GitHub Packages 使用入门](/admin/packages/getting-started-with-github-packages-for-your-enterprise)”。
+As a next step, we recommend you check if you need to update or upload a TLS certificate for your packages host URL. For more information, see "[Getting started with GitHub Packages for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)."
diff --git a/translations/zh-CN/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md b/translations/zh-CN/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md
index f1d277e45e..82600b15c7 100644
--- a/translations/zh-CN/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md
+++ b/translations/zh-CN/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md
@@ -37,10 +37,10 @@ To enable {% data variables.product.prodname_registry %} and configure third-par
## Step 3: Specify the package ecosystems to support on your instance
-Choose which package ecosystems you'd like to enable, disable, or set to read-only on {% data variables.product.product_location %}. Available options are Docker, RubyGems, npm, Apache Maven, Gradle, or NuGet. For more information, see "[Configuring package ecosystem support for your enterprise](/enterprise/admin/packages/configuring-package-ecosystem-support-for-your-enterprise)."
+Choose which package ecosystems you'd like to enable, disable, or set to read-only on {% data variables.product.product_location %}. Available options are {% ifversion ghes > 3.4 %}{% data variables.product.prodname_container_registry %}, {% endif %}Docker, RubyGems, npm, Apache Maven, Gradle, or NuGet. For more information, see "[Configuring package ecosystem support for your enterprise](/enterprise/admin/packages/configuring-package-ecosystem-support-for-your-enterprise)."
## Step 4: Ensure you have a TLS certificate for your package host URL, if needed
-If subdomain isolation is enabled for {% data variables.product.product_location %}, you will need to create and upload a TLS certificate that allows the package host URL for each ecosystem you want to use, such as `npm.HOSTNAME`. Make sure each package host URL includes `https://`.
+If subdomain isolation is enabled for {% data variables.product.product_location %}, you will need to create and upload a TLS certificate that allows the package host URL for each ecosystem you want to use, such as `{% data reusables.package_registry.container-registry-hostname %}`. Make sure each package host URL includes `https://`.
You can create the certificate manually, or you can use _Let's Encrypt_. If you already use _Let's Encrypt_, you must request a new TLS certificate after enabling {% data variables.product.prodname_registry %}. For more information about package host URLs, see "[Enabling subdomain isolation](/enterprise/admin/configuration/enabling-subdomain-isolation)." For more information about uploading TLS certificates to {% data variables.product.product_name %}, see "[Configuring TLS](/enterprise/admin/configuration/configuring-tls)."
diff --git a/translations/zh-CN/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md b/translations/zh-CN/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md
index 5771f81c62..457f7f926d 100644
--- a/translations/zh-CN/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md
+++ b/translations/zh-CN/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md
@@ -29,6 +29,14 @@ This quickstart shows you how to set up MinIO using Docker for use with {% data
For more information about your options, see the official [MinIO docs](https://docs.min.io/).
+{% warning %}
+
+**Warning**: MinIO has announced removal of MinIO Gateways. Starting June 1st, 2022, support and bug fixes for the current MinIO NAS Gateway implementation will only be available for paid customers via their LTS support contract. If you want to continue using MinIO Gateways with {% data variables.product.prodname_registry %}, we recommend moving to MinIO LTS support. For more information, see [Scheduled removal of MinIO Gateway for GCS, Azure, HDFS](https://github.com/minio/minio/issues/14331) in the minio/minio repository.
+
+Other modes of MinIO remain available with standard support.
+
+{% endwarning %}
+
## 2. Install, run, and sign in to MinIO
1. Set up your preferred environment variables for MinIO.
diff --git a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
index 206fcdcc2c..8923701ada 100644
--- a/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
+++ b/translations/zh-CN/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md
@@ -133,3 +133,22 @@ You can set the default permissions for the `GITHUB_TOKEN` in the settings for y
1. Click **Save** to apply the settings.
{% endif %}
+
+{% if actions-cache-policy-apis %}
+
+## Enforcing a policy for cache storage in your enterprise
+
+{% data reusables.actions.cache-default-size %} {% data reusables.actions.cache-eviction-process %}
+
+However, you can set an enterprise policy to customize both the default total cache size for each repository, as well as the maximum total cache size allowed for a repository. For example, you might want the default total cache size for each repository to be 5 GB, but also allow repository administrators to configure a total cache size up to 15 GB if necessary.
+
+People with admin access to a repository can set a total cache size for their repository up to the maximum cache size allowed by the enterprise policy setting.
+
+The policy settings for {% data variables.product.prodname_actions %} cache storage can currently only be modified using the REST API:
+
+* To view the current enterprise policy settings, see "[Get GitHub Actions cache usage policy for an enterprise](/rest/actions/cache#get-github-actions-cache-usage-policy-for-an-enterprise)."
+* To change the enterprise policy settings, see "[Set GitHub Actions cache usage policy for an enterprise](/rest/actions/cache#get-github-actions-cache-usage-policy-for-an-enterprise)."
+
+{% data reusables.actions.cache-no-org-policy %}
+
+{% endif %}
diff --git a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
index 8d67e269a8..3ce9d22ae1 100644
--- a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
+++ b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md
@@ -22,23 +22,33 @@ shortTitle: 管理您的组织角色
您可以选择以成员或组织所有者的身份加入企业拥有的组织,更改您在组织中的角色或离开组织。
+{% ifversion ghec %}
{% warning %}
**警告**:如果组织使用 SCIM 来预配用户,则以这种方式加入组织可能会产生意想不到的后果。 更多信息请参阅“[关于组织的 SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)”。
{% endwarning %}
+{% endif %}
+
+For information about managing other people's roles in an organization, see "[Managing membership in your organization](/organizations/managing-membership-in-your-organization)" and "[Managing people's access to your organization with roles](/organizations/managing-peoples-access-to-your-organization-with-roles)."
## 使用企业设置管理您的角色
您可以加入企业拥有的组织,并直接从企业帐户的设置中管理您在组织中的角色。
+{% ifversion ghec %}
+
如果组织强制实施 SAML 单点登录 (SSO),则无法使用企业设置加入组织。 相反,您必须使用该组织的身份提供程序 (IdP) 加入组织。 然后,您可以在企业设置中管理您的角色。 更多信息请参阅“[加入强制实施 SAML SSO 的组织](#joining-an-organization-that-enforces-saml-sso)”。
+{% endif %}
+
{% data reusables.enterprise-accounts.access-enterprise %}
1. 在 **Organizations(组织)**选项卡上,在您要在其中管理角色的组织右侧,选择 {% octicon "gear" aria-label="The gear icon" %} 下拉菜单,然后单击要执行的操作。

+{% ifversion ghec %}
+
## 加入强制实施 SAML SSO 的组织
如果组织强制实施 SAML SSO,则无法使用企业设置加入组织。 相反,您必须使用该组织的身份提供程序 (IdP) 加入组织。
@@ -52,3 +62,5 @@ shortTitle: 管理您的组织角色
`https://github.com/orgs/ORGANIZATION/sso`
加入组织后,您可以使用企业设置来管理您在组织中的角色,例如成为组织所有者。 更多信息请参阅“[使用企业设置管理您的角色](#managing-your-role-with-the-enterprise-settings)。。
+
+{% endif %}
diff --git a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
index cf1c843c0e..1eec438dcf 100644
--- a/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
+++ b/translations/zh-CN/content/admin/user-management/managing-organizations-in-your-enterprise/restoring-a-deleted-organization.md
@@ -45,7 +45,7 @@ permissions: 'Site administers can restore an organization on {% data variables.
### 恢复团队
1. 若要查找每个团队名称,请在审核日志中搜索 `action:team.create org:ORGANIZATION`。
-1. 手动重新创建团队。 For more information, see "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)."
+1. 手动重新创建团队。 更多信息请参阅“[创建团队](/organizations/organizing-members-into-teams/creating-a-team)”。
1. 要查找已添加到每个团队的成员,请搜索 `action:team.add_member team:"ORGANIZATION/TEAM"`。
1. 手动重新添加团队成员。 更多信息请参阅“[将组织成员添加到团队](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)”。
1. 要查找团队被授予访问权限的存储库,请搜索 `action:team.add_repository team:"ORGANIZATION/TEAM"`。
diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
index 4539c7f137..b0c87d6303 100644
--- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
+++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
@@ -19,8 +19,9 @@ shortTitle: Authentication to GitHub
To keep your account secure, you must authenticate before you can access{% ifversion not ghae %} certain{% endif %} resources on {% data variables.product.product_name %}. When you authenticate to {% data variables.product.product_name %}, you supply or confirm credentials that are unique to you to prove that you are exactly who you declare to be.
You can access your resources in {% data variables.product.product_name %} in a variety of ways: in the browser, via {% data variables.product.prodname_desktop %} or another desktop application, with the API, or via the command line. Each way of accessing {% data variables.product.product_name %} supports different modes of authentication.
-
-- {% ifversion ghae %}Your identity provider (IdP){% else %}Username and password with two-factor authentication{% endif %}
+{%- ifversion not fpt %}
+- Your identity provider (IdP){% endif %}{% ifversion not ghae %}
+- Username and password with two-factor authentication{% endif %}
- Personal access token
- SSH key
@@ -29,14 +30,21 @@ You can access your resources in {% data variables.product.product_name %} in a
You can authenticate to {% data variables.product.product_name %} in your browser {% ifversion ghae %}using your IdP. For more information, see "[About authentication with SAML single sign-on](/github/authenticating-to-github/about-authentication-with-saml-single-sign-on)."{% else %}in different ways.
{% ifversion fpt or ghec %}
-- If you're a member of an {% data variables.product.prodname_emu_enterprise %}, you will authenticate to {% data variables.product.product_name %} in your browser using your IdP. For more information, see "[Authenticating as a managed user](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users#authenticating-as-a-managed-user){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} If you're not a member of an {% data variables.product.prodname_emu_enterprise %}, you will authenticate using your browser on {% data variables.product.prodname_dotcom_the_website %}.
+- If you're a member of an {% data variables.product.prodname_emu_enterprise %}, you will authenticate to {% data variables.product.product_name %} in your browser using your IdP. For more information, see "[Authenticating as a managed user](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users#authenticating-as-a-managed-user){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+
+ If you're not a member of an {% data variables.product.prodname_emu_enterprise %}, you will authenticate using your {% data variables.product.prodname_dotcom_the_website %} username and password. You may also be required to enable two-factor authentication.
{% endif %}
- **Username and password only**
- - You'll create a password when you create your personal account on {% data variables.product.product_name %}. We recommend that you use a password manager to generate a random and unique password. For more information, see "[Creating a strong password](/github/authenticating-to-github/creating-a-strong-password)."
+ - You'll create a password when you create your account on {% data variables.product.product_name %}. We recommend that you use a password manager to generate a random and unique password. For more information, see "[Creating a strong password](/github/authenticating-to-github/creating-a-strong-password)."{% ifversion fpt or ghec %}
+ - If you have not enabled 2FA, {% data variables.product.product_name %} will ask for additional verification when you first sign in from an unrecognized device, such as a new browser profile, a browser where the cookies have been deleted, or a new computer.
+
+ After providing your username and password, you will be asked to provide a verification code that we will send to you via email. If you have the GitHub Mobile application installed, you'll receive a notification there instead.{% endif %}
- **Two-factor authentication (2FA)** (recommended)
- - If you enable 2FA, we'll also prompt you to provide a code that's generated by an application on your mobile device or sent as a text message (SMS) after you successfully enter your username and password. For more information, see "[Accessing {% data variables.product.prodname_dotcom %} using two-factor authentication](/github/authenticating-to-github/accessing-github-using-two-factor-authentication#providing-a-2fa-code-when-signing-in-to-the-website)."
- - In addition to authentication with a mobile application or a text message, you can optionally add a secondary method of authentication with a security key using WebAuthn. For more information, see "[Configuring two-factor authentication using a security key](/github/authenticating-to-github/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)."
+ - If you enable 2FA, after you successfully enter your username and password, we'll also prompt you to provide a code that's generated by a time-based one time password (TOTP) application on your mobile device{% ifversion fpt or ghec %} or sent as a text message (SMS){% endif %}. For more information, see "[Accessing {% data variables.product.prodname_dotcom %} using two-factor authentication](/github/authenticating-to-github/accessing-github-using-two-factor-authentication#providing-a-2fa-code-when-signing-in-to-the-website)."
+ - In addition to authentication with a TOTP application{% ifversion fpt or ghec %} or a text message{% endif %}, you can optionally add an alternative method of authentication with {% ifversion fpt or ghec %}{% data variables.product.prodname_mobile %} or{% endif %} a security key using WebAuthn. For more information, see {% ifversion fpt or ghec %}"[Configuring two-factor authentication with {% data variables.product.prodname_mobile %}](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-github-mobile)" and {% endif %}"[Configuring two-factor authentication using a security key](/github/authenticating-to-github/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)."{% endif %}{% ifversion ghes %}
+- **Identity provider (IdP) authentication**
+ - Your site administrator may configure {% data variables.product.product_location %} to use authentication with an IdP instead of a username and password. For more information, see "[External authentication methods](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#external-authentication)."
{% endif %}
## Authenticating with {% data variables.product.prodname_desktop %}
@@ -74,9 +82,10 @@ If you authenticate with {% data variables.product.prodname_cli %}, the CLI will
If you authenticate without {% data variables.product.prodname_cli %}, you will need to generate an SSH public/private keypair on your local machine and add the public key to your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}. For more information, see "[Generating a new SSH key and adding it to the ssh-agent](/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)." Every time you use Git to authenticate with {% data variables.product.product_name %}, you'll be prompted to enter your SSH key passphrase, unless you've [stored the key](/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent).
+{% ifversion fpt or ghec %}
### Authorizing for SAML single sign-on
-{% ifversion fpt or ghec %}To use a personal access token or SSH key to access resources owned by an organization that uses SAML single sign-on, you must also authorize the personal token or SSH key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" or "[Authorizing an SSH key for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %}
+To use a personal access token or SSH key to access resources owned by an organization that uses SAML single sign-on, you must also authorize the personal token or SSH key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" or "[Authorizing an SSH key for use with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %}
{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md
index 1cd036c00b..340312de61 100644
--- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md
+++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md
@@ -166,7 +166,7 @@ shortTitle: 安全日志
| `create` | 在[创建新仓库](/articles/creating-a-new-repository)时触发。 |
| `destroy` | 当[仓库被删除](/articles/deleting-a-repository)时触发。{% ifversion fpt or ghec %}
| `禁用` | 当仓库被禁用(例如,因[资金不足](/articles/unlocking-a-locked-account))时触发。{% endif %}{% ifversion fpt or ghec %}
-| `download_zip` | Triggered when a ZIP or TAR archive of a repository is downloaded. |
+| `download_zip` | 在下载存储库的 ZIP 或 TAR 存档时触发。 |
| `启用` | 在重新启用仓库时触发。{% endif %}
| `remove_member` | 从[仓库中删除 {% data variables.product.product_name %} 用户的协作者身份](/articles/removing-a-collaborator-from-a-personal-repository)时触发。 |
| `remove_topic` | 当仓库所有者从仓库中删除主题时触发。 |
diff --git a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md
index fb0d87c36c..c194c88d14 100644
--- a/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md
+++ b/translations/zh-CN/content/authentication/keeping-your-account-and-data-secure/token-expiration-and-revocation.md
@@ -54,6 +54,8 @@ redirect_from:
{% data variables.product.prodname_oauth_app %} 的所有者可以撤销帐户对其应用程序的授权,这也会吊销与授权关联的任何令牌。 有关撤销 OAuth 应用程序的授权的详细信息,请参阅“[删除应用程序授权](/rest/reference/apps#delete-an-app-authorization)”。
+{% data variables.product.prodname_oauth_app %} owners can also revoke individual tokens associated with an authorization. For more information about revoking individual tokens for your OAuth app, see "[Delete an app token](/rest/apps/oauth-applications#delete-an-app-token)".
+
## 令牌由于具有相同作用域的 {% data variables.product.prodname_oauth_app %} 的令牌过多而被吊销
{% data reusables.apps.oauth-token-limit %}
diff --git a/translations/zh-CN/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md b/translations/zh-CN/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
index 006b3d6792..7e5a2848ec 100644
--- a/translations/zh-CN/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
+++ b/translations/zh-CN/content/authentication/managing-commit-signature-verification/about-commit-signature-verification.md
@@ -48,8 +48,11 @@ Repository administrators can enforce required commit signing on a branch to blo
{% data reusables.identity-and-permissions.verification-status-check %}
-{% ifversion fpt or ghec %}
-{% data variables.product.product_name %} will automatically use GPG to sign commits you make using the {% data variables.product.product_name %} web interface. Commits signed by {% data variables.product.product_name %} will have a verified status on {% data variables.product.product_name %}. You can verify the signature locally using the public key available at https://github.com/web-flow.gpg. The full fingerprint of the key is `5DE3 E050 9C47 EA3C F04A 42D3 4AEE 18F8 3AFD EB23`. You can optionally choose to have {% data variables.product.product_name %} sign commits you make in {% data variables.product.prodname_codespaces %}. For more information about enabling GPG verification for your codespaces, see "[Managing GPG verification for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-gpg-verification-for-codespaces)."
+{% ifversion fpt or ghec or ghes > 3.4 %}
+{% ifversion ghes %}If a site administrator has enabled web commit signing, {% data variables.product.product_name %} will automatically use GPG to sign commits you make using the web interface. Commits signed by {% data variables.product.product_name %} will have a verified status. You can verify the signature locally using the public key available at `https://HOSTNAME/web-flow.gpg`. For more information, see "[Configuring web commit signing](/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing)."
+{% else %}{% data variables.product.prodname_dotcom %} will automatically use GPG to sign commits you make using the web interface. Commits signed by {% data variables.product.prodname_dotcom %} will have a verified status. You can verify the signature locally using the public key available at https://github.com/web-flow.gpg. The full fingerprint of the key is `5DE3 E050 9C47 EA3C F04A 42D3 4AEE 18F8 3AFD EB23`.
+
+You can optionally choose to have {% data variables.product.prodname_dotcom %} sign commits you make in {% data variables.product.prodname_codespaces %}. For more information about enabling GPG verification for your codespaces, see "[Managing GPG verification for {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/managing-gpg-verification-for-codespaces)."{% endif %}
{% endif %}
## GPG commit signature verification
diff --git a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md
index e5954069a7..fd0b044ffc 100644
--- a/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md
+++ b/translations/zh-CN/content/authentication/securing-your-account-with-two-factor-authentication-2fa/about-two-factor-authentication.md
@@ -19,7 +19,7 @@ shortTitle: 关于 2FA
{% data reusables.two_fa.after-2fa-add-security-key %}
{% ifversion fpt or ghec %}
-除了安全密钥之外,您还可以在配置 TOTP 移动应用程序或短信后使用 {% data variables.product.prodname_mobile %} 进行双重身份验证。 {% data variables.product.prodname_mobile %} 使用公钥加密来保护您的帐户,允许您使用用于登录 {% data variables.product.prodname_mobile %} 的任何移动设备作为第二重身份验证。
+除了安全密钥之外,您还可以在配置 TOTP 移动应用程序或短信后使用 {% data variables.product.prodname_mobile %} 进行双重身份验证。 {% data variables.product.prodname_mobile %} uses public-key cryptography to secure your account, allowing you to use any mobile device that you've used to sign in to {% data variables.product.prodname_mobile %} as your second factor.
{% endif %}
您还可以配置其他恢复方法,以防无法访问双重身份验证凭据。 有关设置 2FA 的更多信息,请参阅“[配置双重身份验证](/articles/configuring-two-factor-authentication)”和“[配置双重身份验证恢复方法](/articles/configuring-two-factor-authentication-recovery-methods)”。
diff --git a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md
index 04cde2220c..40649849c1 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md
@@ -58,7 +58,7 @@ shortTitle: 支出限额
当支出达到帐户支出限制的 50%、75%、90% 和 100% 时,系统会向帐户所有者和帐单管理员发送电子邮件通知。
-You can disable these notifications anytime by navigating to the bottom of the **Spending Limit** page.
+您可以随时通过导航到**支出限额**页面底部禁用这些通知。

diff --git a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md
index c4d8ce299e..70d1413411 100644
--- a/translations/zh-CN/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md
+++ b/translations/zh-CN/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise.md
@@ -1,6 +1,6 @@
---
title: 将 Azure 订阅连接到您的企业
-intro: '您可以使用 Microsoft Enterprise 协议来启用并支付超过企业所含金额的 {% data variables.product.prodname_actions %} 和 {% data variables.product.prodname_registry %} 的使用。'
+intro: 'You can use your Microsoft Enterprise Agreement to enable and pay for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_codespaces %} usage.'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
- /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
@@ -14,7 +14,17 @@ shortTitle: 连接 Azure 订阅
{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} 更多信息请参阅“[关于 {% data variables.product.prodname_actions %} 的计费](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)”和“[关于 {% data variables.product.prodname_registry %} 的计费](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)”。
-连接 Azure 订阅后,您还可以管理您的支出限制。 有关管理和更改帐户支出限制的信息,请参阅“[管理 {% data variables.product.prodname_registry %} 的支出限制](/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages)”和“[管理 {% data variables.product.prodname_actions %} 的支出限制](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions)”。
+{% note %}
+
+**Note:** If your enterprise account is on a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} beyond the included amounts, or to use {% data variables.product.prodname_codespaces %} at all.
+
+{% endnote %}
+
+After you connect an Azure subscription, you can also manage your spending limits.
+
+- "[Managing your spending limit for {% data variables.product.prodname_registry %}](/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages)"
+- "[Managing your spending limit for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions)"
+- "[Managing your spending limit for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces)"
## 将 Azure 订阅连接到您的企业帐户
diff --git a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md
index 2fae8de7d2..96020cb874 100644
--- a/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md
+++ b/translations/zh-CN/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md
@@ -18,7 +18,7 @@ shortTitle: Sync license usage
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 %}
-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 %}.
+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 %}.
{% data reusables.enterprise-licensing.view-consumed-licenses %}
@@ -26,9 +26,23 @@ If you don't want to enable {% data variables.product.prodname_github_connect %}
## Automatically syncing license usage
-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 %}. For more information, see "[Enabling automatic user license sync for your enterprise]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise){% ifversion ghec %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}."{% endif %}
+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 %} weekly. For more information, see "[Enabling automatic user license sync for your enterprise]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise){% ifversion ghec %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}."{% endif %}
-## Manually syncing license usage
+{% ifversion ghec or ghes > 3.4 %}
+After you enable {% data variables.product.prodname_github_connect %}, license data will be automatically synchronized weekly. You can also manually synchronize your license data at any time, by triggering a license sync job.
+
+### Triggering a license sync job
+
+1. Sign in to your {% data variables.product.prodname_ghe_server %} instance.
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.license-tab %}
+1. Under "License sync", click {% octicon "sync" aria-label="The Sync icon" %} **Sync now**.
+ 
+
+{% endif %}
+
+## Manually uploading GitHub Enterprise Server license usage
You can download a JSON file from {% data variables.product.prodname_ghe_server %} and upload the file to {% data variables.product.prodname_ghe_cloud %} to manually sync user license usage between the two deployments.
@@ -39,8 +53,6 @@ You can download a JSON file from {% data variables.product.prodname_ghe_server

{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
{% data reusables.enterprise-accounts.settings-tab %}
-8. In the left sidebar, click **Enterprise licensing**.
- 
{% data reusables.enterprise-accounts.license-tab %}
10. Under "Enterprise Server Instances", click **Add server usage**.

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 ccef24154c..637c78f8c7 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
@@ -85,12 +85,19 @@ Any valid SARIF 2.1.0 output file can be uploaded, however, {% data variables.pr
| Name | Description |
|----|----|
-| `tool.driver.name` | **Required.** The name of the analysis tool. {% data variables.product.prodname_code_scanning_capc %} displays the name on {% data variables.product.prodname_dotcom %} to allow you to filter results by tool. |
-| `tool.driver.version` | **Optional.** The version of the analysis tool. {% data variables.product.prodname_code_scanning_capc %} uses the version number to track when results may have changed due to a tool version change rather than a change in the code being analyzed. If the SARIF file includes the `semanticVersion` field, `version` is not used by {% data variables.product.prodname_code_scanning %}. |
-| `tool.driver.semanticVersion` | **Optional.** The version of the analysis tool, specified by the Semantic Versioning 2.0 format. {% data variables.product.prodname_code_scanning_capc %} uses the version number to track when results may have changed due to a tool version change rather than a change in the code being analyzed. If the SARIF file includes the `semanticVersion` field, `version` is not used by {% data variables.product.prodname_code_scanning %}. For more information, see "[Semantic Versioning 2.0.0](https://semver.org/)" in the Semantic Versioning documentation. |
-| `tool.driver.rules[]` | **Required.** An array of `reportingDescriptor` objects that represent rules. The analysis tool uses rules to find problems in the code being analyzed. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). |
+| `tool.driver` | **Required.** A `toolComponent` object that describes the analysis tool. For more information, see the [`toolComponent` object](#toolcomponent-object). |
+| `tool.extensions[]` | **Optional.** An array of `toolComponent` objects that represent any plugins or extensions used by the tool during analysis. For more information, see the [`toolComponent` object](#toolcomponent-object). |
| `results[]` | **Required.** The results of the analysis tool. {% data variables.product.prodname_code_scanning_capc %} displays the results on {% data variables.product.prodname_dotcom %}. For more information, see the [`result` object](#result-object).
+### `toolComponent` object
+
+| Name | Description |
+|----|----|
+| `name` | **Required.** The name of the analysis tool. {% data variables.product.prodname_code_scanning_capc %} displays the name on {% data variables.product.prodname_dotcom %} to allow you to filter results by tool. |
+| `version` | **Optional.** The version of the analysis tool. {% data variables.product.prodname_code_scanning_capc %} uses the version number to track when results may have changed due to a tool version change rather than a change in the code being analyzed. If the SARIF file includes the `semanticVersion` field, `version` is not used by {% data variables.product.prodname_code_scanning %}. |
+| `semanticVersion` | **Optional.** The version of the analysis tool, specified by the Semantic Versioning 2.0 format. {% data variables.product.prodname_code_scanning_capc %} uses the version number to track when results may have changed due to a tool version change rather than a change in the code being analyzed. If the SARIF file includes the `semanticVersion` field, `version` is not used by {% data variables.product.prodname_code_scanning %}. For more information, see "[Semantic Versioning 2.0.0](https://semver.org/)" in the Semantic Versioning documentation. |
+| `rules[]` | **Required.** An array of `reportingDescriptor` objects that represent rules. The analysis tool uses rules to find problems in the code being analyzed. For more information, see the [`reportingDescriptor` object](#reportingdescriptor-object). |
+
### `reportingDescriptor` object
| Name | Description |
@@ -176,7 +183,7 @@ Use the category to distinguish between multiple analyses for the same tool or c
- The run with an `id` of "my-analysis/tool1/" belongs to the category "my-analysis/tool1" but is not distinguished from other runs in that category.
- The run whose `id` is "my-analysis for tool1 " has a unique identifier but cannot be inferred to belong to any category.
-For more information about the `runAutomationDetails` object and the `id` field, see [runAutomationDetails object](https://docs.oasis-open.org/sarif/sarif/v2.1.0/cs01/sarif-v2.1.0-cs01.html#_Toc16012479) in the OASIS documentation.
+For more information about the `runAutomationDetails` object and the `id` field, see [runAutomationDetails object](https://docs.oasis-open.org/sarif/sarif/v2.1.0/cs01/sarif-v2.1.0-cs01.html#_Toc16012479) in the OASIS documentation.
Note that the rest of the supported fields are ignored.
@@ -302,7 +309,7 @@ This SARIF output file has example values to show all supported SARIF properties
]
}
},
- "automationDetails": {
+ "automationDetails": {
"id": "my-category/"
},
"results": [
diff --git a/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md b/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
index 064f777b1b..44d49b99c6 100644
--- a/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
+++ b/translations/zh-CN/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
@@ -61,15 +61,15 @@ You can display the command-line help for any command using the `--help`
- For a pull request, check out either the head commit of the pull request, or check out a {% data variables.product.prodname_dotcom %}-generated merge commit of the pull request.
2. Set up the environment for the codebase, making sure that any dependencies are available. For more information, see [Creating databases for non-compiled languages](https://codeql.github.com/docs/codeql-cli/creating-codeql-databases/#creating-databases-for-non-compiled-languages) and [Creating databases for compiled languages](https://codeql.github.com/docs/codeql-cli/creating-codeql-databases/#creating-databases-for-compiled-languages) in the documentation for the {% data variables.product.prodname_codeql_cli %}.
3. Find the build command, if any, for the codebase. Typically this is available in a configuration file in the CI system.
-4. Run `codeql database create` from the checkout root of your repository and build the codebase.
+4. Run `codeql database create` from the checkout root of your repository and build the codebase.
{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
```shell
# Single supported language - create one CodeQL databsae
- codeql database create <database> --command<build> --language=<language-identifier>
+ codeql database create <database> --command<build> --language=<language-identifier>
# Multiple supported languages - create one CodeQL database per language
codeql database create <database> --command<build> \
- --db-cluster --language=<language-identifier>,<language-identifier>
+ --db-cluster --language=<language-identifier>,<language-identifier>
```
{% else %}
```shell
@@ -106,7 +106,7 @@ $ codeql database create /codeql-dbs/example-repo --language=javascript \
in /checkouts/example-repo.
> [build-stdout] Single-threaded extraction.
> [build-stdout] Extracting
-...
+...
> Finalizing database at /codeql-dbs/example-repo.
> Successfully created database at /codeql-dbs/example-repo.
```
@@ -146,16 +146,11 @@ $
## Analyzing a {% data variables.product.prodname_codeql %} database
-1. Create a {% data variables.product.prodname_codeql %} database (see above).{% if codeql-packs %}
-2. Optional, run `codeql pack download` to download any {% data variables.product.prodname_codeql %} packs (beta) that you want to run during analysis. For more information, see "[Downloading and using {% data variables.product.prodname_codeql %} query packs](#downloading-and-using-codeql-query-packs)" below.
- ```shell
- codeql pack download <packs>
- ```
- {% endif %}
-3. Run `codeql database analyze` on the database and specify which {% if codeql-packs %}packs and/or {% endif %}queries to use.
+1. Create a {% data variables.product.prodname_codeql %} database (see above).
+2. Run `codeql database analyze` on the database and specify which {% if codeql-packs %}packs and/or {% endif %}queries to use.
```shell
codeql database analyze <database> --format=<format> \
- --output=<output> {% if codeql-packs %}<packs,queries>{% else %} <queries>{% endif %}
+ --output=<output> {% if codeql-packs %}--download <packs,queries>{% else %}<queries>{% endif %}
```
{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
@@ -179,7 +174,8 @@ codeql database analyze <database> --format=<format> \
| `--output` | {% octicon "check-circle-fill" aria-label="Required" %} | Specify where to save the SARIF results file.{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
| `--sarif-category` | {% octicon "question" aria-label="Required with multiple results sets" %} | Optional for single database analysis. Required to define the language when you analyze multiple databases for a single commit in a repository. Specify a category to include in the SARIF results file for this analysis. A category is used to distinguish multiple analyses for the same tool and commit, but performed on different languages or different parts of the code.|{% endif %}{% ifversion fpt or ghes > 3.3 or ghae or ghec %}
| `--sarif-add-query-help` | | Optional. Use if you want to include any available markdown-rendered query help for custom queries used in your analysis. Any query help for custom queries included in the SARIF output will be displayed in the code scanning UI if the relevant query generates an alert. For more information, see [Analyzing databases with the {% data variables.product.prodname_codeql_cli %}](https://codeql.github.com/docs/codeql-cli/analyzing-databases-with-the-codeql-cli/#including-query-help-for-custom-codeql-queries-in-sarif-files) in the documentation for the {% data variables.product.prodname_codeql_cli %}.{% endif %}{% if codeql-packs %}
-| `` | | Optional. Use if you have downloaded CodeQL query packs and want to run the default queries or query suites specified in the packs. For more information, see "[Downloading and using {% data variables.product.prodname_codeql %} packs](#downloading-and-using-codeql-query-packs)."{% endif %}
+| `` | | Optional. Use if you want to include CodeQL query packs in your analysis. For more information, see "[Downloading and using {% data variables.product.prodname_codeql %} packs](#downloading-and-using-codeql-query-packs)."
+| `--download` | | Optional. Use if some of your CodeQL query packs are not yet on disk and need to be downloaded before running queries.{% endif %}
| `--threads` | | Optional. Use if you want to use more than one thread to run queries. The default value is `1`. You can specify more threads to speed up query execution. To set the number of threads to the number of logical processors, specify `0`.
| `--verbose` | | Optional. Use to get more detailed information about the analysis process{% ifversion fpt or ghes > 3.1 or ghae or ghec %} and diagnostic data from the database creation process{% endif %}.
@@ -192,13 +188,12 @@ This example analyzes a {% data variables.product.prodname_codeql %} database st
```
$ codeql database analyze /codeql-dbs/example-repo \
- javascript-code-scanning.qls {% ifversion fpt or ghes > 3.1 or ghae or ghec %}--sarif-category=javascript{% endif %}
+ javascript-code-scanning.qls {% ifversion fpt or ghes > 3.1 or ghae or ghec %}--sarif-category=javascript \{% endif %}
--format={% ifversion fpt or ghae or ghec %}sarif-latest{% else %}sarifv2.1.0{% endif %} --output=/temp/example-repo-js.sarif
> Running queries.
-> Compiling query plan for /codeql-home/codeql/qlpacks/
- codeql-javascript/AngularJS/DisablingSce.ql.
-...
+> Compiling query plan for /codeql-home/codeql/qlpacks/codeql-javascript/AngularJS/DisablingSce.ql.
+...
> Shutting down query evaluator.
> Interpreting results.
```
@@ -251,38 +246,50 @@ There is no output from this command unless the upload was unsuccessful. The com
The {% data variables.product.prodname_codeql_cli %} bundle includes queries that are maintained by {% data variables.product.company_short %} experts, security researchers, and community contributors. If you want to run queries developed by other organizations, {% data variables.product.prodname_codeql %} query packs provide an efficient and reliable way to download and run queries. For more information, see "[About code scanning with CodeQL](/code-security/secure-coding/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql#about-codeql-queries)."
-Before you can use a {% data variables.product.prodname_codeql %} pack to analyze a database, you must download any packages you require from the {% data variables.product.company_short %} {% data variables.product.prodname_container_registry %} by running `codeql pack download` and specifying the packages you want to download. If a package is not publicly available, you will need to use a {% data variables.product.prodname_github_app %} or personal access token to authenticate. For more information and an example, see "[Uploading results to {% data variables.product.product_name %}](#uploading-results-to-github)" above.
-
-```shell
-codeql pack download <scope/name@version>,...
-```
+Before you can use a {% data variables.product.prodname_codeql %} pack to analyze a database, you must download any packages you require from the {% data variables.product.company_short %} {% data variables.product.prodname_container_registry %}. This can be done either by using the `--download` flag as part of the `codeql database analyze` command. If a package is not publicly available, you will need to use a {% data variables.product.prodname_github_app %} or personal access token to authenticate. For more information and an example, see "[Uploading results to {% data variables.product.product_name %}](#uploading-results-to-github)" above.
| Option | Required | Usage |
|--------|:--------:|-----|
-| `` | {% octicon "check-circle-fill" aria-label="Required" %} | Specify the scope and name of one or more CodeQL query packs to download using a comma-separated list. Optionally, include the version to download and unzip. By default the latest version of this pack is downloaded. |
+| `` | {% octicon "check-circle-fill" aria-label="Required" %} | Specify the scope and name of one or more CodeQL query packs to download using a comma-separated list. Optionally, include the version to download and unzip. By default the latest version of this pack is downloaded. Optionally, include a path to a query, directory, or query suite to run. If no path is included, then run the default queries of this pack. |
| `--github-auth-stdin` | | Optional. Pass the {% data variables.product.prodname_github_app %} or personal access token created for authentication with {% data variables.product.company_short %}'s REST API to the CLI via standard input. This is not needed if the command has access to a `GITHUB_TOKEN` environment variable set with this token.
### Basic example
-This example runs two commands to download the latest version of the `octo-org/security-queries` pack and then analyze the database `/codeql-dbs/example-repo`.
+This example runs the `codeql database analyze` command with the `--download` option to:
+
+1. Download the latest version of the `octo-org/security-queries` pack.
+2. Download a version of the `octo-org/optional-security-queries` pack that is *compatible* with version 1.0.1 (in this case, it is version 1.0.2). For more information on semver compatibility, see [npm's semantic version range documentation](https://github.com/npm/node-semver#ranges).
+3. Run all the default queries in `octo-org/security-queries`.
+4. Run only the query `queries/csrf.ql` from `octo-org/optional-security-queries`
```
-$ echo $OCTO-ORG_ACCESS_TOKEN | codeql pack download octo-org/security-queries
+$ echo $OCTO-ORG_ACCESS_TOKEN | codeql database analyze --download /codeql-dbs/example-repo \
+ octo-org/security-queries \
+ octo-org/optional-security-queries@~1.0.1:queries/csrf.ql \
+ --format=sarif-latest --output=/temp/example-repo-js.sarif
> Download location: /Users/mona/.codeql/packages
> Installed fresh octo-org/security-queries@1.0.0
-
-$ codeql database analyze /codeql-dbs/example-repo octo-org/security-queries \
- --format=sarif-latest --output=/temp/example-repo-js.sarif
-
+> Installed fresh octo-org/optional-security-queries@1.0.2
> Running queries.
> Compiling query plan for /Users/mona/.codeql/packages/octo-org/security-queries/1.0.0/potential-sql-injection.ql.
-> [1/1] Found in cache: /Users/mona/.codeql/packages/octo-org/security-queries/1.0.0/potential-sql-injection.ql.
+> [1/2] Found in cache: /Users/mona/.codeql/packages/octo-org/security-queries/1.0.0/potential-sql-injection.ql.
> Starting evaluation of octo-org/security-queries/query1.ql.
-> [1/1 eval 394ms] Evaluation done; writing results to docto-org/security-queries/query1.bqrs.
+> Compiling query plan for /Users/mona/.codeql/packages/octo-org/optional-security-queries/1.0.2/queries/csrf.ql.
+> [2/2] Found in cache: /Users/mona/.codeql/packages/octo-org/optional-security-queries/1.0.2/queries/csrf.ql.
+> Starting evaluation of octo-org/optional-security-queries/queries/csrf.ql.
+> [2/2 eval 694ms] Evaluation done; writing results to octo-org/security-queries/query1.bqrs.
> Shutting down query evaluator.
> Interpreting results.
```
+
+### Direct download of {% data variables.product.prodname_codeql %} packs
+
+If you want to download a {% data variables.product.prodname_codeql %} pack without running it immediately, then you can use the `codeql pack download` command. This is useful if you want to avoid accessing the internet when running {% data variables.product.prodname_codeql %} queries. When you run the {% data variables.product.prodname_codeql %} analysis, you can specify packs, versions, and paths in the same way as in the previous example:
+
+```shell
+echo $OCTO-ORG_ACCESS_TOKEN | codeql pack download <scope/name@version:path> <scope/name@version:path> ...
+```
{% endif %}
{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
diff --git a/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts.md b/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts.md
index ecd5fc21e1..4f6968a138 100644
--- a/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts.md
+++ b/translations/zh-CN/content/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts.md
@@ -1,7 +1,7 @@
---
-title: Configuring Dependabot alerts
-intro: 'Enable {% data variables.product.prodname_dependabot_alerts %} to be notified when a new vulnerability is found in one of your dependencies.'
-shortTitle: Configure Dependabot alerts
+title: 配置 Dependabot 警报
+intro: '启用 {% data variables.product.prodname_dependabot_alerts %},以便在其中一个依赖项中发现新漏洞时收到通知。'
+shortTitle: 配置 Dependabot 警报
versions:
fpt: '*'
ghes: '*'
@@ -17,89 +17,89 @@ topics:
- Repositories
---
-## About {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies
+## 关于有漏洞依赖项的 {% data variables.product.prodname_dependabot_alerts %}
{% data reusables.repositories.a-vulnerability-is %}
-Dependabot performs a scan to detect vulnerable dependencies and sends Dependabot alerts when a new vulnerability is added to the GitHub Advisory Database or the dependency graph for a repository changes. 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_alerts %} 警报](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)”。
+Dependabot 执行扫描以检测有漏洞的依赖项,并在将新漏洞添加到 GitHub Advisory 数据库或存储库更改的依赖关系图时发送 Dependabot 警报。 更多信息请参阅“[关于 {% data variables.product.prodname_dependabot_alerts %} 警报](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)”。
-You can enable or disable {% data variables.product.prodname_dependabot_alerts %} for:
-* Your personal account
-* Your repository
-* Your organization
+您可以对以下项启用或禁用 {% data variables.product.prodname_dependabot_alerts %}:
+* 您的个人帐户
+* 您的存储库
+* 您的组织
-## Managing {% data variables.product.prodname_dependabot_alerts %} for your personal account
+## 管理个人帐户的 {% data variables.product.prodname_dependabot_alerts %}
{% ifversion fpt or ghec %}
-You can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your personal account.
+您可以为您的个人帐户所拥有的所有仓库启用或禁用 {% data variables.product.prodname_dependabot_alerts %}。
-### Enabling or disabling {% data variables.product.prodname_dependabot_alerts %} for existing repositories
+### 启用或禁用现有存储库的 {% data variables.product.prodname_dependabot_alerts %}
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.security-analysis %}
-3. Under "Code security and analysis", to the right of {% data variables.product.prodname_dependabot_alerts %}, click **Disable all** or **Enable all**. 
-4. Optionally, enable {% data variables.product.prodname_dependabot_alerts %} by default for new repositories that you create. 
-5. Click **Disable {% data variables.product.prodname_dependabot_alerts %}** or **Enable {% data variables.product.prodname_dependabot_alerts %}** to disable or enable {% data variables.product.prodname_dependabot_alerts %} for all the repositories you own. 
+3. 在“Code security and analysis(代码安全性和分析)”下,单击 {% data variables.product.prodname_dependabot_alerts %} 右侧的 **Disable all(禁用所有)**或 **Enable all(启用所有)**。 
+4. (可选)默认情况下为您创建的新存储库启用 {% data variables.product.prodname_dependabot_alerts %}。 
+5. 单击**禁用 {% data variables.product.prodname_dependabot_alerts %}** 或**启用 {% data variables.product.prodname_dependabot_alerts %}** ,为拥有的所有存储库禁用或启用 {% data variables.product.prodname_dependabot_alerts %}。 
-When you enable {% data variables.product.prodname_dependabot_alerts %} for existing repositories, you will see any results displayed on GitHub within minutes.
+当您为现有存储库启用 {% data variables.product.prodname_dependabot_alerts %} 时,您将在几分钟内看到 GitHub 上显示的任何结果。
-### Enabling or disabling {% data variables.product.prodname_dependabot_alerts %} for new repositories
+### 启用或禁用新存储库的 {% data variables.product.prodname_dependabot_alerts %}
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.security-analysis %}
-3. Under "Code security and analysis", to the right of {% data variables.product.prodname_dependabot_alerts %}, enable or disable {% data variables.product.prodname_dependabot_alerts %} by default for new repositories that you create. 
+3. 在“Code security and analysis(代码安全性和分析)”下 {% data variables.product.prodname_dependabot_alerts %} 的右侧,默认为您创建的新存储库启用或禁用 {% data variables.product.prodname_dependabot_alerts %}。 
{% else %}
-{% data variables.product.prodname_dependabot_alerts %} for your repositories can be enabled or disabled by your enterprise owner. For more information, see "[Enabling Dependabot for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)."
+企业所有者可以启用或禁用存储库的 {% data variables.product.prodname_dependabot_alerts %}。 更多信息请参阅“[为企业启用 Dependabot](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)”。
{% endif %}
## 管理仓库的 {% data variables.product.prodname_dependabot_alerts %}
-{% ifversion fpt or ghec %}You can manage {% data variables.product.prodname_dependabot_alerts %} for your public, private or internal repository.
+{% ifversion fpt or ghec %}您可以管理公共、私有或内部存储库的 {% data variables.product.prodname_dependabot_alerts %}。
默认情况下,我们会向受影响仓库中具有管理员权限的人员通知有关新的 {% data variables.product.prodname_dependabot_alerts %}。 {% data variables.product.product_name %} 从不公开披露在任何仓库中发现的漏洞。 您也可以将 {% data variables.product.prodname_dependabot_alerts %} 设为对操作您拥有或具有管理员权限的仓库的其他人或团队可见。
{% data reusables.security.security-and-analysis-features-enable-read-only %}
-### Enabling or disabling {% data variables.product.prodname_dependabot_alerts %} for a repository
+### 为存储库启用或禁用 {% data variables.product.prodname_dependabot_alerts %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-code-security-and-analysis %}
-1. Under "Code security and analysis", to the right of {% data variables.product.prodname_dependabot_alerts %}, click **Disable** or **Enable**. 
+1. 在“Code security and analysis(代码安全性和分析)”下,单击 {% data variables.product.prodname_dependabot_alerts %} 右侧的 **Disable(禁用)**或 **Enable(启用)**。 
{% endif %}{% ifversion ghes or ghae %}
-{% data variables.product.prodname_dependabot_alerts %} for your repository can be enabled or disabled by your enterprise owner. For more information, see "[Enabling Dependabot for your enterprise](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)."
+您的企业所有者可以启用或禁用存储库的 {% data variables.product.prodname_dependabot_alerts %}。 更多信息请参阅“[为企业启用 Dependabot](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)”。
{% endif %}
## 管理组织的 {% data variables.product.prodname_dependabot_alerts %}
-{% ifversion fpt or ghec %}You can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your organization. Your changes affect all repositories.
+{% ifversion fpt or ghec %}您可以为组织拥有的所有仓库启用或禁用 {% data variables.product.prodname_dependabot_alerts %}。 您的更改会影响所有存储库。
-### Enabling or disabling {% data variables.product.prodname_dependabot_alerts %} for all existing repositories
+### 启用或禁用所有现有存储库的 {% data variables.product.prodname_dependabot_alerts %}
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.organizations.security-and-analysis %}
-2. Under "Code security and analysis", to the right of {% data variables.product.prodname_dependabot_alerts %}, click **Disable all** or **Enable all**.
+2. 在“Code security and analysis(代码安全性和分析)”下,单击 {% data variables.product.prodname_dependabot_alerts %} 右侧的 **Disable all(禁用所有)**或 **Enable all(启用所有)**。
{% ifversion fpt or ghec %}
- 
+ 
{% endif %}
{% ifversion ghae %}

{% endif %}
{% ifversion fpt or ghec %}
-3. Optionally, enable {% data variables.product.prodname_dependabot_alerts %} by default for new repositories in your organization.
+3. (可选)默认为您的组织中新的仓库启用 {% data variables.product.prodname_dependabot_alerts %}。
{% ifversion fpt or ghec %}
- 
+ 
{% endif %}
{% endif %}
{% ifversion fpt or ghec %}
-4. Click **Disable {% data variables.product.prodname_dependabot_alerts %}** or **Enable {% data variables.product.prodname_dependabot_alerts %}** to disable or enable {% data variables.product.prodname_dependabot_alerts %} for all the repositories in your organization.
+4. 单击**禁用 {% data variables.product.prodname_dependabot_alerts %}** 或**启用 {% data variables.product.prodname_dependabot_alerts %}** ,为组织中的所有存储库禁用或启用 {% data variables.product.prodname_dependabot_alerts %}。
{% ifversion fpt or ghec %}
- 
+ 
{% endif %}{% endif %}{% endif %}{% ifversion ghes or ghae %}
-{% data variables.product.prodname_dependabot_alerts %} for your organization can be enabled or disabled by your enterprise owner. For more information, see "[About Dependabot for GitHub Enterprise Server](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)."
+企业所有者可以启用或禁用组织的 {% data variables.product.prodname_dependabot_alerts %}。 更多信息请参阅“[关于 GitHub Enterprise Server 的 Dependabot](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise)”。
{% endif %}
diff --git a/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md b/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
index eec95206b6..339cc62961 100644
--- a/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
+++ b/translations/zh-CN/content/code-security/secret-scanning/protecting-pushes-with-secret-scanning.md
@@ -84,19 +84,19 @@ shortTitle: 推送保护
2. 在三小时内重新尝试在命令行上推送。 如果您在三小时内没有推送,则需要重复此过程。
{% if secret-scanning-push-protection-web-ui %}
-## Using secret scanning as a push protection from the web UI
+## 使用密钥扫描作为 Web UI 的推送保护
-When you use the web UI to attempt to commit a supported secret to a repository or organization with secret scanning as a push protection enabled, {% data variables.product.prodname_dotcom %} will block the commit. You will see a banner at the top of the page with information about the secret's location, and the secret will also be underlined in the file so you can easily find it.
+当您使用 Web UI 尝试将受支持的密钥提交到启用了机密扫描作为推送保护的存储库或组织时,{% data variables.product.prodname_dotcom %} 将阻止提交。 您将在页面顶部看到一个横幅,其中包含有关密钥位置的信息,并且密钥也将在文件中加下划线,以便您可以轻松找到它。
- 
+ 
-{% data variables.product.prodname_dotcom %} will only display one detected secret at a time in the web UI. 如果已在存储库中检测到特定机密,并且警报已存在,{% data variables.product.prodname_dotcom %} 不会阻止该机密。
+{% data variables.product.prodname_dotcom %} 将在 Web UI 中一次仅显示一个检测到的机密。 如果已在存储库中检测到特定机密,并且警报已存在,{% data variables.product.prodname_dotcom %} 不会阻止该机密。
-You can remove the secret from the file using the web UI. Once you remove the secret, the banner at the top of the page will change and tell you that you can now commit your changes.
+可以使用 Web UI 从文件中删除机密。 删除机密后,页面顶部的横幅将更改,并告诉您现在可以提交更改。
- 
+ 
-### Bypassing push protection for a secret
+### 绕过密钥的推送保护
如果 {% data variables.product.prodname_dotcom %} 阻止了您认为可以安全推送的机密,则可以允许该机密并说明应允许该机密的原因。 如果确认某个机密是真实的,并且打算稍后修复它,则应尽快修复。
@@ -104,11 +104,11 @@ You can remove the secret from the file using the web UI. Once you remove the se
如果确认某个机密是真实的,并且打算稍后修复它,则应尽快修复。
-1. In the banner that appeared at the top of the page when {% data variables.product.prodname_dotcom %} blocked your commit, click **Bypass protection**.
+1. 在 {% data variables.product.prodname_dotcom %} 阻止提交时显示在页面顶部的横幅中,单击 **Bypass protection(绕过保护)**。
{% data reusables.secret-scanning.push-protection-choose-allow-secret-options %}

-1. Click **Allow secret**.
+1. 单击 **Allow secret(允许密钥)**。
{% endif %}
diff --git a/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md b/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
index 4ae940a282..1da31684a2 100644
--- a/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
+++ b/translations/zh-CN/content/code-security/secret-scanning/secret-scanning-patterns.md
@@ -42,6 +42,8 @@ Organizations using {% data variables.product.prodname_ghe_cloud %} with {% data
When {% data variables.product.prodname_secret_scanning_GHAS %} is enabled, {% data variables.product.prodname_dotcom %} scans for secrets issued by the following service providers. {% ifversion ghec %}For more information about {% data variables.product.prodname_secret_scanning_GHAS %}, see "[About {% data variables.product.prodname_secret_scanning_GHAS %}](/code-security/secret-scanning/about-secret-scanning#about-secret-scanning-for-advanced-security)."{% endif %}
+If you use the REST API for secret scanning, you can use the `Secret type` to report on secrets from specific issuers. For more information, see "[Secret scanning](/enterprise-cloud@latest/rest/secret-scanning)."
+
{% ifversion ghes > 3.1 or ghae or ghec %}
{% note %}
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review.md b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review.md
index 08bddbd242..6a97e2ccd0 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review.md
@@ -1,7 +1,7 @@
---
-title: Configuring dependency review
-intro: You can use dependency review to catch vulnerabilities before they are added to your project.
-shortTitle: Configure dependency review
+title: 配置依赖项审查
+intro: 可以使用依赖项评审在将漏洞添加到项目之前捕获这些漏洞。
+shortTitle: 配置依赖项审查
versions:
fpt: '*'
ghes: '>= 3.2'
@@ -22,28 +22,28 @@ topics:
{% data reusables.dependency-review.feature-overview %}
-For more information, see "[About dependency review](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)" and "[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)."
+更多信息请参阅“[关于依赖项审查](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)”和“[查看拉取请求中的依赖项更改](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)”。
-## About configuring dependency review
+## 关于配置依赖项审查
{% ifversion fpt %}
-依赖项审查在所有产品的所有公共存储库中都可用,并且无法禁用。 Dependency review is available in private repositories owned by organizations that use GitHub Enterprise Cloud and have a license for [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security). 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review)。
+依赖项审查在所有产品的所有公共存储库中都可用,并且无法禁用。 依赖项审查在使用 GitHub Enterprise Cloud 并具有 [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) 许可证的组织拥有的私有存储库中可用。 更多信息请参阅 [{% data variables.product.prodname_ghe_cloud %} 文档](/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review)。
{% elsif ghec %}
-依赖项审查包含在公共存储库的 {% data variables.product.product_name %} 中。 To use dependency review in private repositories owned by organizations, you must have a license for [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) and have the dependency graph enabled.
+依赖项审查包含在公共存储库的 {% data variables.product.product_name %} 中。 要在组织拥有的私有存储库中使用依赖项审查,您必须具有 [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) 许可证并启用依赖关系图。
{% data reusables.dependabot.enabling-disabling-dependency-graph-private-repo %}
-1. If "{% data variables.product.prodname_GH_advanced_security %}" is not enabled, click **Enable** next to the feature. 
+1. 如果未启用“{% data variables.product.prodname_GH_advanced_security %}”,请单击该功能旁边的 **Enable(启用)**。 
{% elsif ghes or ghae %}
为 {% data variables.product.product_location %} 启用依赖关系图并为组织或仓库启用{% data variables.product.prodname_advanced_security %} 时,依赖项审查可用。 更多信息请参阅“[为企业启用 {% data variables.product.prodname_GH_advanced_security %}](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise)”。
-### Checking if the dependency graph is enabled
+### 检查是否启用了依赖关系图
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.navigate-to-code-security-and-analysis %}
-1. Under "Configure security and analysis features", check if the dependency graph is enabled.
-1. If dependency graph is enabled, click **Enable** next to "{% data variables.product.prodname_GH_advanced_security %}" to enable {% data variables.product.prodname_advanced_security %}, including dependency review. The enable button is disabled if your enterprise has no available licenses for {% data variables.product.prodname_advanced_security %}.{% ifversion ghes < 3.3 %} {% endif %}{% ifversion ghes > 3.2 %} {% endif %}
+1. 在“Configure security and analysis features(配置安全和分析功能)”下,检查是否启用了依赖关系图。
+1. 如果启用了依赖关系图,请单击“{% data variables.product.prodname_GH_advanced_security %}”旁边的 **Enable(启用)**以启用 {% data variables.product.prodname_advanced_security %},包括依赖项审查。 如果您的企业没有可用于 {% data variables.product.prodname_advanced_security %} 的许可证,则启用按钮处于禁用状态。{% ifversion ghes < 3.3 %} {% endif %}{% ifversion ghes > 3.2 %} {% endif %}
{% endif %}
diff --git a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph.md b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph.md
index 1b0585b358..5498409a17 100644
--- a/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph.md
+++ b/translations/zh-CN/content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-the-dependency-graph.md
@@ -1,5 +1,5 @@
---
-title: Configuring the dependency graph
+title: 配置依赖关系图
intro: 您可以通过启用依赖项关系图来允许用户标识其项目的依赖项。
redirect_from:
- /code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#enabling-the-dependency-graph
@@ -13,7 +13,7 @@ topics:
- Dependency graph
- Dependencies
- Repositories
-shortTitle: Configure dependency graph
+shortTitle: 配置依赖关系图
---
## 关于依赖项图
@@ -23,7 +23,7 @@ shortTitle: Configure dependency graph
更多信息请参阅“[关于依赖关系图](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)”。
{% ifversion fpt or ghec %} ## About configuring the dependency graph {% endif %}
-{% ifversion fpt or ghec %}要生成依赖关系图,{% data variables.product.product_name %} 需要对仓库的依赖项清单和锁定文件的只读访问权限。 依赖关系图自动为所有公共仓库生成,您可以选择为私有仓库启用它。 For more information on viewing the dependency graph, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %}
+{% ifversion fpt or ghec %}要生成依赖关系图,{% data variables.product.product_name %} 需要对仓库的依赖项清单和锁定文件的只读访问权限。 依赖关系图自动为所有公共仓库生成,您可以选择为私有仓库启用它。 有关查看依赖关系图的更多信息,请参阅“[探索存储库的依赖关系](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)”。{% endif %}
{% ifversion ghes or ghae %} ## Enabling the dependency graph
{% data reusables.dependabot.ghes-ghae-enabling-dependency-graph %}{% endif %}{% ifversion fpt or ghec %}
@@ -37,6 +37,6 @@ shortTitle: Configure dependency graph
## 延伸阅读
-{% ifversion ghec %}- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)"{% endif %}
+{% ifversion ghec %}"[查看用于组织的洞见](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)"{% endif %}
- "[查看漏洞依赖项的 {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)"
- "[漏洞依赖项检测疑难解答](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"
diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md
index 0cbb7f6298..f71d2f9abc 100644
--- a/translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md
+++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md
@@ -156,7 +156,7 @@ You can label a port to make the port more easily identifiable in a list.
## Adding a port to the codespace configuration
-You can add a forwarded port to the {% data variables.product.prodname_codespaces %} configuration for the repository, so the port will automatically be forwarded for all codespaces created from the repository. After you update the configuration, any previously created codespaces must be rebuilt for the change to apply. For more information, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project#applying-changes-to-your-configuration)."
+You can add a forwarded port to the {% data variables.product.prodname_codespaces %} configuration for the repository, so the port will automatically be forwarded for all codespaces created from the repository. After you update the configuration, any previously created codespaces must be rebuilt for the change to apply. For more information, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project#applying-configuration-changes-to-a-codespace)."
You can manually configure forwarded ports in a `.devcontainer.json` file using the `forwardPorts` property, or you can use the "Ports" panel in your codespace.
diff --git a/translations/zh-CN/content/codespaces/developing-in-codespaces/using-source-control-in-your-codespace.md b/translations/zh-CN/content/codespaces/developing-in-codespaces/using-source-control-in-your-codespace.md
index 523a02550b..f442e18f1d 100644
--- a/translations/zh-CN/content/codespaces/developing-in-codespaces/using-source-control-in-your-codespace.md
+++ b/translations/zh-CN/content/codespaces/developing-in-codespaces/using-source-control-in-your-codespace.md
@@ -47,7 +47,7 @@ shortTitle: 源控制
1. 在侧边栏的顶部,单击省略号 (**...**)。 
1. 在下拉菜单中,单击 **Pull(拉取)**。
-如果自创建代码空间以来开发容器配置已更改,则可以通过为代码空间重建容器来应用更改。 更多信息请参阅“[开发容器简介](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project#applying-changes-to-your-configuration)”。
+如果自创建代码空间以来开发容器配置已更改,则可以通过为代码空间重建容器来应用更改。 更多信息请参阅“[开发容器简介](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project#applying-configuration-changes-to-a-codespace)”。
## 设置代码空间以自动获取新更改
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 5f87b31532..ec7e936c7e 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
@@ -32,6 +32,13 @@ By default, a codespace can only access the repository from which it was created
## Enable {% data variables.product.prodname_codespaces %} for users in your organization
+{% ifversion fpt %}
+{% note %}
+
+**Note:** If you are a verified educator or a teacher, you must enable {% data variables.product.prodname_codespaces %} from a {% data variables.product.prodname_classroom %} to use your {% data variables.product.prodname_codespaces %} Education benefit. For more information, see "[Using GitHub Codespaces with GitHub Classroom](/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom#about-the-codespaces-education-benefit-for-verified-teachers)."
+
+{% endnote %}
+{% endif %}
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.organizations.click-codespaces %}
diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
index b0e209bb1e..f2d09956b3 100644
--- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
+++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
@@ -57,11 +57,11 @@ topics:

{% data reusables.codespaces.codespaces-policy-targets %}
-1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. 有关其他约束的信息,请参阅“[限制转发端口可见性](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)”和“[限制空闲超时期限](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)”。
-1. After you have finished adding constraints to your policy, click **Save**.
+1. 如果要向策略添加其他约束,请单击 **Add constraint(添加约束)** ,然后选择另一个约束。 有关其他约束的信息,请参阅“[限制转发端口可见性](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)”和“[限制空闲超时期限](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)”。
+1. 向策略添加完约束后,单击 **Save(保存)**。
## 编辑策略
-You can edit an existing policy. For example, you may want to add or remove constraints to or from a policy.
+您可以编辑现有策略。 例如,您可能希望在策略中添加或删除约束。
1. 显示“Codespace policies(代码空间策略)”页。 更多信息请参阅“[添加策略以限制可用计算机类型](#adding-a-policy-to-limit-the-available-machine-types)”。
1. 单击要编辑的策略的名称。
diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
index 0ead7424d6..50a1b3abf1 100644
--- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
+++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
@@ -1,7 +1,7 @@
---
-title: Restricting the idle timeout period
-shortTitle: Restrict timeout periods
-intro: You can set a maximum timeout period for any codespaces owned by your organization.
+title: 限制空闲超时期限
+shortTitle: 限制超时期限
+intro: 您可以为组织拥有的任何代码空间设置最长超时期限。
product: '{% data reusables.gated-features.codespaces %}'
permissions: 'To manage timeout constraints for an organization''s codespaces, you must be an owner of the organization.'
versions:
@@ -14,66 +14,66 @@ topics:
## 概览
-By default, codespaces time out after 30 minutes of inactivity. When a codespace times out it is stopped and will no longer incur charges for compute usage.
+默认情况下,代码空间在处于非活动状态 30 分钟后超时。 若代码空间超时,它将停止,并且将不再产生计算使用费用。
-The personal settings of a {% data variables.product.prodname_dotcom %} user allow them to define their own timeout period for codespaces they create. This may be longer than the default 30-minute period. For more information, see "[Setting your timeout period for Codespaces](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces)."
+{% data variables.product.prodname_dotcom %} 用户的个人设置允许他们为其创建的代码空间定义自己的超时期限。 这可能比默认的 30 分钟长。 更多信息请参阅“[设置代码空间的超时期限](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces)”。
-As an organization owner, you may want to configure constraints on the maximum idle timeout period for codespaces owned by your organization. This can help you limit costs associated with codespaces that are left to timeout after long periods of inactivity. You can set a maximum timeout for all codespaces owned by your organization, or for the codespaces of specific repositories.
+作为组织所有者,您可能希望为组织拥有的代码空间配置最长空闲超时期限的约束。 这可以帮助您限制与代码空间相关的成本,这些代码空间在长时间处于非活动状态后会超时。 您可以为组织拥有的所有代码空间或特定存储库的代码空间设置最大超时。
{% note %}
-**Note**: Maximum idle timeout constraints only apply to codespaces that are owned by your organization.
+**注意**:最大空闲超时约束仅适用于组织拥有的代码空间。
{% endnote %}
-For more information about pricing for {% data variables.product.prodname_codespaces %} compute usage, see "[About billing for Codespaces](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)."
+有关 {% data variables.product.prodname_codespaces %} 计算使用定价的详细信息,请参阅“[关于代码空间的计费](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)”。
-### Behavior when you set a maximum idle timeout constraint
+### 设置最大空闲超时约束时的行为
-If someone sets the default idle timeout to 90 minutes in their personal settings and they then start a codespace for a repository with a maximum idle timeout constraint of 60 minutes, the codespace will time out after 60 minutes of inactivity. When codespace creation completes, a message explaining this will be displayed:
+如果有人在其个人设置中将默认空闲超时设置为 90 分钟,然后他们以最大空闲超时限制为 60 分钟启动存储库的代码空间,则该代码空间将在不活动 60 分钟后超时。 代码空间创建完成后,将显示一条消息,说明这一点:
-> Idle timeout for this codespace is set to 60 minutes in compliance with your organization’s policy.
+> 根据组织的策略,此代码空间的空闲超时设置为 60 分钟。
### 设置组织范围和存储库特定的策略
-When you create a policy, you choose whether it applies to all repositories in your organization, or only to specified repositories. If you create an organization-wide policy with a timeout constraint, then the timeout constraints in any policies that are targeted at specific repositories must fall within the restriction configured for the entire organization. The shortest timeout period - in an organization-wide policy, a policy targeted at specified repositories, or in someone's personal settings - is applied.
+创建策略时,您可以选择是将其应用于组织中的所有存储库,还是仅应用于指定的存储库。 如果创建具有超时约束的组织范围策略,则针对特定存储库的任何策略中的超时约束必须位于为整个组织配置的限制范围内。 应用组织范围策略、针对指定存储库的策略或某人的个人设置中最短的超时期限。
-If you add an organization-wide policy with a timeout constraint, you should set the timeout to the longest acceptable period. You can then add separate policies that set the maximum timeout to a shorter period for specific repositories in your organization.
+如果添加具有超时约束的组织范围策略,则应将超时设置为可接受的最长期限。 然后,您可以添加单独的策略,将组织中特定存储库的最大超时时间设置为较短的时间段。
-## Adding a policy to set a maximum idle timeout period
+## 添加策略以设置最大空闲超时期限
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.codespaces.codespaces-org-policies %}
-1. Click **Add constraint** and choose **Maximum idle timeout**.
+1. 单击 **Add constraint(添加约束)** ,然后选择 **Maximum idle timeout(最大空闲超时)**。
- 
+ 
-1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint.
+1. 单击 {% octicon "pencil" aria-label="The edit icon" %} 编辑约束。
- 
+ 
-1. Enter the maximum number of minutes codespaces can remain inactive before they time out, then click **Save**.
+1. 输入代码空间在超时之前可以保持非活动状态的最大分钟数,然后单击 **Save(保存)**。

{% data reusables.codespaces.codespaces-policy-targets %}
-1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. For information about other constraints, see "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)" and "[Restricting the visibility of forwarded ports](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)."
-1. After you have finished adding constraints to your policy, click **Save**.
+1. 如果要向策略添加其他约束,请单击 **Add constraint(添加约束)** ,然后选择另一个约束。 有关其他约束的信息,请参阅“[限制对计算机类型的访问](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)”和“[限制转发端口的可见性](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)”。
+1. 向策略添加完约束后,单击 **Save(保存)**。
-The policy will be applied to all new codespaces that are created, and to existing codespaces the next time they are started.
+该策略将应用于创建的所有新代码空间,在现有代码空间下次启动时也会应用于它们。
## 编辑策略
-You can edit an existing policy. For example, you may want to add or remove constraints to or from a policy.
+您可以编辑现有策略。 例如,您可能希望在策略中添加或删除约束。
-1. 显示“Codespace policies(代码空间策略)”页。 For more information, see "[Adding a policy to set a maximum idle timeout period](#adding-a-policy-to-set-a-maximum-idle-timeout-period)."
+1. 显示“Codespace policies(代码空间策略)”页。 更多信息请参阅“[添加策略以设置最大空闲超时期限](#adding-a-policy-to-set-a-maximum-idle-timeout-period)”。
1. 单击要编辑的策略的名称。
1. 进行所需的更改,然后单击 **Save(保存)**。
## 删除策略
-1. 显示“Codespace policies(代码空间策略)”页。 For more information, see "[Adding a policy to set a maximum idle timeout period](#adding-a-policy-to-set-a-maximum-idle-timeout-period)."
+1. 显示“Codespace policies(代码空间策略)”页。 更多信息请参阅“[添加策略以设置最大空闲超时期限](#adding-a-policy-to-set-a-maximum-idle-timeout-period)”。
1. 单击要删除的策略右侧的删除按钮。

diff --git a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports.md b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports.md
index 3ba8512e4c..39c02af7e1 100644
--- a/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports.md
+++ b/translations/zh-CN/content/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports.md
@@ -45,7 +45,7 @@ topics:

-1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint.
+1. 单击 {% octicon "pencil" aria-label="The edit icon" %} 编辑约束。

@@ -54,11 +54,11 @@ topics:

{% data reusables.codespaces.codespaces-policy-targets %}
-1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. 有关其他约束的信息,请参阅“[限制对计算机类型的访问](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)”和“[限制空闲超时期限](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)”。
-1. After you have finished adding constraints to your policy, click **Save**.
+1. 如果要向策略添加其他约束,请单击 **Add constraint(添加约束)** ,然后选择另一个约束。 有关其他约束的信息,请参阅“[限制对计算机类型的访问](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)”和“[限制空闲超时期限](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)”。
+1. 向策略添加完约束后,单击 **Save(保存)**。
## 编辑策略
-You can edit an existing policy. For example, you may want to add or remove constraints to or from a policy.
+您可以编辑现有策略。 例如,您可能希望在策略中添加或删除约束。
1. 显示“Codespace policies(代码空间策略)”页。 更多信息请参阅“[添加策略以限制端口可见性选项](#adding-a-policy-to-limit-the-port-visibility-options)”。
1. 单击要编辑的策略的名称。
diff --git a/translations/zh-CN/content/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces.md b/translations/zh-CN/content/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces.md
index ec00950abe..20b9f9bf62 100644
--- a/translations/zh-CN/content/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces.md
+++ b/translations/zh-CN/content/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces.md
@@ -87,7 +87,7 @@ redirect_from:
}
```
- 要设置给定存储库的所有权限,请在 `permissions` 对象中使用 `read-all` 或 `write-all`
+ 要设置给定存储库的所有权限,请在存储库对象中使用 `"permissions": "read-all"` 或 `"permissions": "write-all"`。
```json
{
@@ -95,9 +95,7 @@ redirect_from:
"codespaces": {
"repositories": {
"my_org/my_repo": {
- "permissions": {
- "write-all"
- }
+ "permissions": "write-all"
}
}
}
diff --git a/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md b/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
index 4c7875f528..fa4c2d0088 100644
--- a/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
+++ b/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
@@ -58,7 +58,20 @@ miniTocMaxHeadingLevel: 3
1. 对预构建配置进行所需的更改,然后单击 **Update(更新)**。
-### 删除预构建配置
+### Disabling a prebuild configuration
+
+To pause the update of prebuild templates for a configuration, you can disable workflow runs for the configuration. Disabling the workflow runs for a prebuild configuration does not delete any previously created prebuild templates for that configuration and, as a result, codespaces will continue to be generated from an existing prebuild template.
+
+Disabling the workflow runs for a prebuild configuration is useful if you need to investigate template creation failures.
+
+1. On the {% data variables.product.prodname_codespaces %} page of your repository settings, click the ellipsis to the right of the prebuild configuration you want to disable.
+1. In the dropdown menu, click **Disable runs**.
+
+ 
+
+1. To confirm that you want to disable this configuration, click **OK**.
+
+### Deleting a prebuild configuration
删除预构建配置也会删除以前为该配置创建的所有预构建模板。 因此,在删除配置后不久,在创建新代码空间时,由该配置生成的预构建将不再可用。
diff --git a/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/testing-dev-container-changes.md b/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/testing-dev-container-changes.md
index 8babad4311..c1a2e333eb 100644
--- a/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/testing-dev-container-changes.md
+++ b/translations/zh-CN/content/codespaces/prebuilding-your-codespaces/testing-dev-container-changes.md
@@ -25,7 +25,7 @@ permissions: People with write permissions to a repository can create or edit th
1. 从要更改其开发容器的预构建启用分支创建代码空间。 更多信息请参阅“[创建代码空间](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)”。
1. 在代码空间中,检出测试分支。 更多信息请参阅“[在代码空间中使用源控制](/codespaces/developing-in-codespaces/using-source-control-in-your-codespace#creating-or-switching-branches)”。
1. 对开发容器配置进行所需的更改。
-1. 通过重新构建容器来应用更改。 更多信息请参阅“[开发容器简介](/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers#applying-changes-to-your-configuration)”。
+1. 通过重新构建容器来应用更改。 更多信息请参阅“[开发容器简介](/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers#applying-configuration-changes-to-a-codespace)”。
1. 在一切正常之后,我们还建议从测试分支创建一个新的代码空间,以确保一切正常。 然后,您可以将更改提交到存储库的默认分支或活动功能分支,从而触发该分支的预构建模板的更新。
{% note %}
diff --git a/translations/zh-CN/content/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers.md b/translations/zh-CN/content/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers.md
index e1ec45f21d..2b917fb848 100644
--- a/translations/zh-CN/content/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers.md
+++ b/translations/zh-CN/content/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers.md
@@ -39,47 +39,47 @@ product: '{% data reusables.gated-features.codespaces %}'
`devcontainer.json` 文件通常位于存储库的 `.devcontainer` 目录中。 或者,您可以直接在存储库的根目录中找到它,在这种情况下,文件名必须以点开头:`.devcontainer.json`。
-如果要在存储库中选择开发容器配置,则 `.devcontainer/devcontainer.json`(或 `.devcontainer.json`)文件的任何替代项都必须位于其自己的子目录中,路径为 `.devcontainer/SUBDIRECTORY/devcontainer.json`。 For example, you could have a choice of two configurations:
+如果要在存储库中选择开发容器配置,则 `.devcontainer/devcontainer.json`(或 `.devcontainer.json`)文件的任何替代项都必须位于其自己的子目录中,路径为 `.devcontainer/SUBDIRECTORY/devcontainer.json`。 例如,您可以选择两种配置:
* `.devcontainer/database-dev/devcontainer.json`
* `.devcontainer/gui-dev/devcontainer.json`
-When you have multiple `devcontainer.json` files in your repository, each codespace is created from only one of the configurations. Settings cannot be imported or inherited between `devcontainer.json` files. If a `devcontainer.json` file in a custom subdirectory has dependent files, such as the Dockerfile or scripts that are run by commands in the `devcontainer.json` file, it's recommended that you co-locate these files in the same subdirectory.
+当您的存储库中有多个 `devcontainer.json` 文件时,每个代码空间仅从其中一个配置创建。 无法在 `devcontainer.json` 文件之间导入或继承设置。 如果自定义子目录中的 `devcontainer.json` 文件具有依赖文件,例如 Dockerfile 或由 `devcontainer.json` 文件中的命令运行的脚本,则建议您在同一子目录中共同定位这些文件。
-For information about how to choose your preferred dev container configuration when you create a codespace, see "[Creating a codespace](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)."
+有关如何在创建代码空间时选择首选开发容器配置的信息,请参阅“[创建代码空间](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)”。
{% data reusables.codespaces.more-info-devcontainer %}
-#### How to use the devcontainer.json
+#### 如何使用 devcontainer.json
-It's useful to think of the `devcontainer.json` file as providing "customization" rather than "personalization." You should only include things that everyone working on your codebase needs as standard elements of the development environment, not things that are personal preferences. Things like linters are good to standardize on, and to require everyone to have installed, so they're good to include in your `devcontainer.json` file. Things like user interface decorators or themes are personal choices that should not be put in the `devcontainer.json` file.
+将 `devcontainer.json` 文件视为提供“自定义”而不是“个性化”是很有用的。 您应该只将每个在代码库上工作的人都需要的东西作为开发环境的标准元素,而不是个人偏好的东西。 像语法检查这样的东西非常适合标准化,并且要求每个人都已安装,因此最好将它们包含在您的 `devcontainer.json` 文件中。 像用户界面装饰器或主题这样的东西是个人选择,不应该放在 `devcontainer.json` 文件中。
-You can personalize your codespaces by using dotfiles and Settings Sync. For more information, see "[Personalizing Codespaces for your account](/codespaces/customizing-your-codespace/personalizing-codespaces-for-your-account)."
+您可以使用 dotfiles 和 Settings Sync 对代码空间进行个性化设置。 更多信息请参阅“[为您的帐户个性化代码空间](/codespaces/customizing-your-codespace/personalizing-codespaces-for-your-account)”。
### Dockerfile
-You can add a Dockerfile as part of your dev container configuration.
+可以将 Dockerfile 添加为开发容器配置的一部分。
-The Dockerfile is a text file that contains the instructions needed to create a Docker container image. This image is used to generate a development container each time someone creates a codespace using the `devcontainer.json` file that references this Dockerfile. The instructions in the Dockerfile typically begin by referencing a parent image on which the new image that will be created is based. This is followed by commands that are run during the image creation process, for example to install software packages.
+Dockerfile 是一个文本文件,其中包含创建 Docker 容器映像所需的说明。 每次有人使用引用此 Dockerfile 的 `devcontainer.json` 文件创建代码空间时,此映像都用于生成开发容器。 Docker 文件中的说明通常首先引用将在其上创建新映像的父映像。 接下来是在映像创建过程中运行的命令,例如安装软件包。
-The Dockerfile for a dev container is typically located in the `.devcontainer` folder, alongside the `devcontainer.json` in which it is referenced.
+开发容器的 Dockerfile 通常位于 `.devcontainer` 文件夹中,旁边是引用它的 `devcontainer.json`。
{% note %}
-**Note**: As an alternative to using a Dockerfile you can use the `image` property in the `devcontainer.json` file to refer directly to an existing image you want to use. If neither a Dockerfile nor an image is found then the default container image is used. 更多信息请参阅“[使用默认开发容器配置](#using-the-default-dev-container-configuration)”。
+**注意**:作为使用 Dockerfile 的替代方法,您可以使用 `devcontainer.json` 文件中的 `image` 属性来直接引用要使用的现有映像。 如果既找不到 Dockerfile,也找不到映像,则使用默认容器映像。 更多信息请参阅“[使用默认开发容器配置](#using-the-default-dev-container-configuration)”。
{% endnote %}
-#### Simple Dockerfile example
+#### 简单 Dockerfile 示例
-The following example uses four instructions:
+以下示例使用四条指令:
-`ARG` defines a build-time variable.
+`ARG` 定义了一个构建时变量。
-`FROM` specifies the parent image on which the generated Docker image will be based.
+`from` 指定生成的 Docker 映像将基于的父映像。
-`COPY` copies a file and adds it to the filesystem.
+`COPY` 复制文件并将其添加到文件系统中。
-`RUN` updates package lists and runs a script. You can also use a `RUN` instruction to install software, as shown by the commented out instructions. To run multiple commands, use `&&` to combine the commands into a single `RUN` statement.
+`RUN` 更新包列表并运行脚本。 您还可以使用 `RUN` 指令来安装软件,如注释掉的说明所示。 若要运行多个命令,请使用 `&&` 将这些命令合并到一个 `RUN` 语句中。
```Dockerfile{:copy}
ARG VARIANT="16-buster"
@@ -96,11 +96,11 @@ COPY library-scripts/github-debian.sh /tmp/library-scripts/
RUN apt-get update && bash /tmp/library-scripts/github-debian.sh
```
-For more information about Dockerfile instructions, see "[Dockerfile reference](https://docs.docker.com/engine/reference/builder)" in the Docker documentation.
+有关 Dockerfile 指令的更多信息,请参阅 Docker 文档中的“[Dockerfile 参考](https://docs.docker.com/engine/reference/builder)”。
-#### Using a Dockerfile
+#### 使用 Dockerfile
-To use a Dockerfile as part of a dev container configuration, reference it in your `devcontainer.json` file by using the `dockerfile` property.
+要将 Dockerfile 用作开发容器配置的一部分,请使用 `dockerfile` 属性在 `devcontainer.json` 文件中引用它。
```json{:copy}
{
@@ -110,26 +110,26 @@ To use a Dockerfile as part of a dev container configuration, reference it in yo
}
```
-For more information about using a Dockerfile in a dev container configuration, see the {% data variables.product.prodname_vscode %} documentation "[Create a development container](https://code.visualstudio.com/docs/remote/create-dev-container#_dockerfile)."
+有关在开发容器配置中使用 Dockerfile 的详细信息,请参阅 {% data variables.product.prodname_vscode %} 文档“[创建开发容器](https://code.visualstudio.com/docs/remote/create-dev-container#_dockerfile)”。
-## Using the default dev container configuration
+## 使用默认开发容器配置
-If you don't define a configuration in your repository, {% data variables.product.prodname_dotcom %} creates a codespace using a default Linux image. This Linux image includes languages and runtimes like Python, Node.js, JavaScript, TypeScript, C++, Java, .NET, PHP, PowerShell, Go, Ruby, and Rust. It also includes other developer tools and utilities like Git, GitHub CLI, yarn, openssh, and vim. To see all the languages, runtimes, and tools that are included use the `devcontainer-info content-url` command inside your codespace terminal and follow the URL that the command outputs.
+如果未在存储库中定义配置,{% data variables.product.prodname_dotcom %} 使用默认 Linux 映像创建代码空间。 这个 Linux 镜像包括 Python、Node.js、JavaScript、TypeScript、C++、Java、.NET、PHP、PowerShell、Go、Ruby 和 Rust 等语言和运行时。 它还包括其他开发工具和实用程序,例如 Git、GitHub CLI、yarn、openssh 和 vim。 要查看包含的所有语言、运行时和工具,请在代码空间终端内使用 `devcontainer-info content-url` 命令,然后遵循命令输出的 URL。
-Alternatively, for more information about everything that's included in the default Linux image, see the latest file in the [`microsoft/vscode-dev-containers`](https://github.com/microsoft/vscode-dev-containers/tree/main/containers/codespaces-linux) repository.
+或者,要详细了解默认 Linux 映像中包含的所有内容,请参阅 [`microsoft/vscode-dev-containers`](https://github.com/microsoft/vscode-dev-containers/tree/main/containers/codespaces-linux) 仓库中的最新文件。
-The default configuration is a good option if you're working on a small project that uses the languages and tools that {% data variables.product.prodname_github_codespaces %} provides.
+如果您要处理使用 {% data variables.product.prodname_github_codespaces %} 提供的语言和工具的小型项目,默认配置是个不错的选择。
-## Using a predefined dev container configuration
+## 使用预定义的开发容器配置
-You can choose from a list of predefined configurations to create a dev container configuration for your repository. These configurations provide common setups for particular project types, and can help you quickly get started with a configuration that already has the appropriate container options, {% data variables.product.prodname_vscode %} settings, and {% data variables.product.prodname_vscode %} extensions that should be installed.
+可以从预定义配置列表中进行选择,以便为存储库创建开发容器配置。 这些配置为特定项目类型提供了常见设置,并可以帮助您快速开始使用已具有相应容器选项、{% data variables.product.prodname_vscode %} 设置和应安装的 {% data variables.product.prodname_vscode %} 扩展的配置。
-如果您需要一些额外的扩展性,使用预先定义的配置是一个好主意。 You can also start with a predefined configuration and amend it as needed for your project.
+如果您需要一些额外的扩展性,使用预先定义的配置是一个好主意。 您也可以从预定义的配置开始,然后根据项目的需要对其进行修改。
-You can add a predefined dev container configuration either while working in a codespace, or while working on a repository locally.
+可以在代码空间中工作时或在本地处理存储库时添加预定义的开发容器配置。
{% data reusables.codespaces.command-palette-container %}
-1. Click the definition you want to use.
+1. 单击要使用的定义。

@@ -138,7 +138,7 @@ You can add a predefined dev container configuration either while working in a c

-1. If you are working in a codespace, apply your changes, by clicking **Rebuild now** in the message at the bottom right of the window. 有关重建容器的更多信息,请参阅“[应用对配置的更改](#applying-changes-to-your-configuration)”。
+1. 如果在代码空间中工作,请应用更改,方法是单击窗口右下角消息中的**立即重新构建**。 For more information about rebuilding your container, see "[Applying changes to your configuration](#applying-configuration-changes-to-a-codespace)."

@@ -150,7 +150,7 @@ You can add a predefined dev container configuration either while working in a c
{% endnote %}
-You can add features to your predefined container configuration to customize which tools are available and extend the functionality of your workspace without having to create a custom dev container configuration from scratch. 例如,您可以使用预定义的容器配置并添加 {% data variables.product.prodname_cli %}。 在设置容器配置时,可以通过将这些功能添加到 `devcontainer.json` 文件,使这些附加功能可用于项目。
+可以向预定义的容器配置添加功能,以自定义可用的工具并扩展工作区的功能,而无需从头开始创建自定义开发容器配置。 例如,您可以使用预定义的容器配置并添加 {% data variables.product.prodname_cli %}。 在设置容器配置时,可以通过将这些功能添加到 `devcontainer.json` 文件,使这些附加功能可用于项目。
您可以通过在配置预定义容器时选择一些最常用的功能来添加这些功能。 有关可用功能的详细信息,请参阅 `vscode-dev-containers` 存储库中的[脚本库](https://github.com/microsoft/vscode-dev-containers/tree/main/script-library#scripts) 。
@@ -163,7 +163,7 @@ You can add features to your predefined container configuration to customize whi

-1. 要应用更改,请在屏幕右下角单击 **Rebuild now(立即重建)**。 有关重建容器的更多信息,请参阅“[应用对配置的更改](#applying-changes-to-your-configuration)”。
+1. 要应用更改,请在屏幕右下角单击 **Rebuild now(立即重建)**。 For more information about rebuilding your container, see "[Applying changes to your configuration](#applying-configuration-changes-to-a-codespace)."

@@ -172,51 +172,51 @@ You can add features to your predefined container configuration to customize whi
如果预定义的配置都不能满足您的需求,则可以通过编写自己的 `devcontainer.json` 文件来创建自定义配置。
* 如果要添加供从存储库创建代码空间的每个人使用的单个 `devcontainer.json` 文件,请在存储库根目录下的 `.devcontainer` 目录中创建该文件。
-* If you want to offer users a choice of configuration, you can create multiple custom `devcontainer.json` files, each located within a separate subdirectory of the `.devcontainer` directory.
+* 如果要为用户提供配置选择,可以创建多个自定义 `devcontainer.json` 文件,每个文件都位于 `.devcontainer` 目录的单独子目录中。
{% note %}
- **Note**: You can't locate your `devcontainer.json` files in directories more than one level below `.devcontainer`. For example, a file at `.devcontainer/teamA/devcontainer.json` will work, but `.devcontainer/teamA/testing/devcontainer.json` will not.
+ **注意**:您无法在 `.devcontainer` 下超过一级的目录中找到您的 `devcontainer.json` 文件。 例如,`.devcontainer/teamA/devcontainer.json` 上的文件将会运行,但 `.devcontainer/teamA/testing/devcontainer.json` 不会。
{% endnote %}
- If multiple `devcontainer.json` files are found in the repository, they are listed in the codespace creation options page. 更多信息请参阅“[创建代码空间](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)”。
+ 如果在存储库中找到多个 `devcontainer.json` 文件,则会在代码空间创建选项页中列出这些文件。 更多信息请参阅“[创建代码空间](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)”。
- 
+ 
-### Default configuration selection during codespace creation
+### 代码空间创建期间的默认配置选择
-If `.devcontainer/devcontainer.json` or `.devcontainer.json` exists, it will be the default selection in the list of available configuration files when you create a codespace. If neither file exists, the default dev container configuration will be selected by default.
+如果存在 `.devcontainer/devcontainer.json` 或 `.devcontainer.json`,则在创建代码空间时,它将是可用配置文件列表中的默认选择。 如果这两个文件都不存在,则默认情况下将选择默认的开发容器配置。
-
+
-### Editing the devcontainer.json file
+### 编辑 devcontainer.json 文件
-You can add and edit the supported configuration keys in the `devcontainer.json` file to specify aspects of the codespace's environment, like which {% data variables.product.prodname_vscode %} extensions will be installed. {% data reusables.codespaces.more-info-devcontainer %}
+您可以在 `devcontainer.json` 文件中添加和编辑支持的配置键,以指定代码空间环境的各个方面,例如将安装哪些 {% data variables.product.prodname_vscode %} 扩展。 {% data reusables.codespaces.more-info-devcontainer %}
-The `devcontainer.json` file is written using the JSONC format. This allows you to include comments within the configuration file. For more information, see "[Editing JSON with Visual Studio Code](https://code.visualstudio.com/docs/languages/json#_json-with-comments)" in the {% data variables.product.prodname_vscode %} documentation.
+`devcontainer.json` 文件是使用 JSONC 格式编写的。 这允许您在配置文件中包含注释。 更多信息请参阅 {% data variables.product.prodname_vscode %} 文档中的“[使用 Visual Studio Code 编辑 JSON](https://code.visualstudio.com/docs/languages/json#_json-with-comments)”。
{% note %}
-**Note**: If you use a linter to validate the `devcontainer.json` file, make sure it is set to JSONC and not JSON or comments will be reported as errors.
+**注意**:如果您使用语法检查验证 `devcontainer.json` 文件,请确保将其设置为 JSONC 而不是 JSON,否则注释将被报告为错误。
{% endnote %}
-### Editor settings for Visual Studio Code
+### Visual Studio Code 的编辑器设置
{% data reusables.codespaces.vscode-settings-order %}
您可以在两个地方定义 {% data variables.product.prodname_vscode %} 的默认编辑器设置。
-* Editor settings defined in the `.vscode/settings.json` file in your repository are applied as _Workspace_-scoped settings in the codespace.
-* Editor settings defined in the `settings` key in the `devcontainer.json` file are applied as _Remote [Codespaces]_-scoped settings in the codespace.
+* 在存储库的 `.vscode/settings.json` 文件中定义的编辑器设置将作为代码空间中_工作区_范围的设置进行应用。
+* `devcontainer.json` 文件的 `settings` 键中定义的编辑器设置在代码空间中用作 _Remote [Codespaces]_ 范围的设置。
-## 应用对配置的更改
+## Applying configuration changes to a codespace
{% data reusables.codespaces.apply-devcontainer-changes %}
{% data reusables.codespaces.rebuild-command %}
-1. {% data reusables.codespaces.recovery-mode %} Fix the errors in the configuration.
+1. {% data reusables.codespaces.recovery-mode %} 修复配置中的错误。

diff --git a/translations/zh-CN/content/codespaces/troubleshooting/troubleshooting-prebuilds.md b/translations/zh-CN/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
index 87abe5495b..e72e2655d3 100644
--- a/translations/zh-CN/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
+++ b/translations/zh-CN/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
@@ -57,6 +57,10 @@ cat /workspaces/.codespaces/shared/environment-variables.json | jq '.ACTION_NAME
* 检查最近是否将对开发容器配置的更改推送到启用了预构建的分支。 如果是这样,通常必须等到为此推送运行的预构建工作流程完成,然后预构建才会再次可用。
* 如果最近未进行任何配置更改,请转到存储库的“ **操作** ”选项卡,单击工作流程列表中的 **{% octicon "codespaces" aria-label="The Codespaces icon" %} {% data variables.product.prodname_codespaces %} 预构建** ,然后检查分支的预构建工作流程运行是否成功。 如果工作流程的最新运行失败,并且其中一个或多个失败的运行包含对开发容器配置的更改,则关联分支将没有可用的预构建。
+## Troubleshooting failed workflow runs for prebuilds
+
+If the workflow runs for a prebuild configuration are failing, you can temporarily disable the prebuild configuration while you investigate. For more information, see "[Managing prebuilds](/codespaces/prebuilding-your-codespaces/managing-prebuilds#disabling-a-prebuild-configuration)."
+
## 延伸阅读
- “[配置预构建](/codespaces/prebuilding-your-codespaces/configuring-prebuilds)”
diff --git a/translations/zh-CN/content/communities/moderating-comments-and-conversations/managing-disruptive-comments.md b/translations/zh-CN/content/communities/moderating-comments-and-conversations/managing-disruptive-comments.md
index 79e2972ffd..67582aae15 100644
--- a/translations/zh-CN/content/communities/moderating-comments-and-conversations/managing-disruptive-comments.md
+++ b/translations/zh-CN/content/communities/moderating-comments-and-conversations/managing-disruptive-comments.md
@@ -47,12 +47,14 @@ shortTitle: 管理评论
编辑评论和删除无助于促进对话以及违反社区行为准则{% ifversion fpt or ghec %} 或 GitHub [社区指导方针](/free-pro-team@latest/github/site-policy/github-community-guidelines){% endif %} 的内容是明智之举。
-编辑评论时,请记下删除的内容所在的位置,也可记下删除的原因。
+Sometimes it may make sense to clearly indicate edits and their justification.
-对仓库具有读取权限的任何人都可查看评论的编辑历史记录。 评论顶部的 **edited(已编辑)**下拉菜单包含编辑历史记录,其中会显示每次编辑的用户和时间戳。
+That said, anyone with read access to a repository can view a comment's edit history. 评论顶部的 **edited(已编辑)**下拉菜单包含编辑历史记录,其中会显示每次编辑的用户和时间戳。

+## Redacting sensitive information
+
评论作者和具有仓库写入权限的任何人也都可以删除评论编辑历史记录中的敏感信息。 更多信息请参阅“[跟踪评论中的更改](/communities/moderating-comments-and-conversations/tracking-changes-in-a-comment)”。
1. 导航到您要编辑的评论。
@@ -65,20 +67,22 @@ shortTitle: 管理评论
对仓库具有写入权限的任何人都可以删除议题、拉取请求及提交上的评论。 组织所有者、团队维护员和评论作者也可删除团队页面上的评论。
+如果评论包含一些对议题或拉取请求中的对话有建设性的内容,您可以编辑评论。
+
删除评论是调解员最后的选择。 如果整个评论没有给对话带来建设性的内容,或者违反社区的行为准则{% ifversion fpt or ghec %} 或 GitHub [社区指导方针](/free-pro-team@latest/github/site-policy/github-community-guidelines){% endif %},删除评论是明智之举。
删除评论会创建对仓库具有读取权限的所有人可见的时间表事件。 但评论删除者的用户名只有能够写入仓库的人可见。 对于没有写入权限的任何人,时间表事件会匿名化。

-如果评论包含一些对议题或拉取请求中的对话有建设性的内容,您可以编辑评论。
-
{% note %}
**注:**议题或拉取请求的初始评论(或正文)不能删除。 但可以编辑议题和拉取请求正文,以删除不需要的内容。
{% endnote %}
+### Steps to delete a comment
+
1. 导航到您要删除的评论。
2. 在评论的右上角,单击 {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %},然后单击 **Delete(删除)**。 
3. 也可以说明您删除了哪些评论,为什么要删除。
diff --git a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project.md b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project.md
index 9d018d5e86..692474e9c1 100644
--- a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project.md
+++ b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project.md
@@ -126,7 +126,7 @@ shortTitle: 提交和审核更改
6. 如果您有基于正在处理的分支的拉取请求, {% data variables.product.prodname_desktop %} 将显示已为拉取请求运行的检查的状态。 有关检查的详细信息,请参阅“[Viewing and re-running checks in GitHub Desktop(在 GitHub Desktop 中查看和重新运行检查)](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)”。
- 
+ 
如果尚未为当前分支创建拉取请求,{% data variables.product.prodname_desktop %} 将为您提供创建一个请求的选项。 更多信息请参阅“[创建议题或拉取请求](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)”。
diff --git a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md
index bf122e88a8..5b091f029d 100644
--- a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md
+++ b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md
@@ -1,63 +1,63 @@
---
-title: Configuring notifications in GitHub Desktop
+title: 在 GitHub Desktop 中配置通知
shortTitle: 配置通知
-intro: '{% data variables.product.prodname_desktop %} will keep you up-to-date with notifications about events that occur in your pull request branch.'
+intro: '{% data variables.product.prodname_desktop %} 将为您提供有关拉取请求分支中发生的事件的通知。'
versions:
fpt: '*'
---
-## About notifications in {% data variables.product.prodname_desktop %}
+## 关于 {% data variables.product.prodname_desktop %} 中的通知
-{% data variables.product.prodname_desktop %} will show a system notification for events that occur in the currently selected repository. Notifications will be shown when:
+{% data variables.product.prodname_desktop %} 将显示当前选定存储库中发生的事件的系统通知。 在以下情况下将显示通知:
-- Pull request checks have failed.
-- A pull request review is left with a comment, approval, or requested changes.
+- 拉取请求检查失败。
+- 拉取请求审核留下评论、批准或请求的更改。
-Clicking the notification will switch application focus to {% data variables.product.prodname_desktop %} and provide more detailed information.
+单击通知会将应用程序焦点切换到 {% data variables.product.prodname_desktop %} ,并提供更详细的信息。
-## Notifications about pull request check failures
+## 有关拉取请求检查失败的通知
-When changes are made to a pull request branch, you will receive a notification if the checks fail.
+对拉取请求分支进行更改时,如果检查失败,您将收到通知。
-
+
-Clicking the notification will display a dialog with details about the checks. Once you've reviewed why the checks have failed, you can re-run the checks, or quickly switch to the pull request branch to get started on fixing the errors. For more information, see "[Viewing and re-running checks in GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)."
+单击通知将显示一个对话框,其中包含有关检查的详细信息。 查看检查失败的原因后,可以重新运行检查,或快速切换到拉取请求分支以开始修复错误。 更多信息请参阅“[在 GitHub Desktop 中查看和重新运行检查](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)”。
-
-## Notifications for pull request reviews
+
+## 拉取请求审核通知
-{% data variables.product.prodname_desktop %} will surface a system notification when a teammate has approved, commented, or requested changes in your pull request. See "[About pull request reviews](/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews)" for more information on pull request reviews.
+{% data variables.product.prodname_desktop %} 将在队友批准、评论或请求拉取请求更改时显示系统通知。 有关拉取请求审核的详细信息,请参阅“[拉取请求审核](/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews)”。
-
+
-Clicking the notification will switch application focus to {% data variables.product.prodname_desktop %} and provide more context for the pull request review comment.
+单击通知会将应用程序焦点切换到 {% data variables.product.prodname_desktop %} ,并为拉取请求审核评论提供更多上下文。
-
-## Enabling notifications
+
+## 启用通知
-If system notifications are disabled for {% data variables.product.prodname_desktop %} you can follow the steps below to enable them.
+如果系统通知对 {% data variables.product.prodname_desktop %} 禁用,您可以按照以下步骤启用它们。
{% mac %}
-1. Click the **Apple** menu, then select **System Preferences**.
-2. Select **Notifications & Focus**.
-3. Select **{% data variables.product.prodname_desktop %}** from the list of applications.
-4. Click **Allow Notifications**.
+1. 单击 **Apple** 菜单,然后选择 **System Preferences(系统偏好设置)**。
+2. 选择 **Notifications & Focus(通知和焦点)**。
+3. 从应用程序列表中选择 **{% data variables.product.prodname_desktop %}**。
+4. 单击 **Allow Notifications(允许通知)**。
-
+
-For more information about macOS system notifications, see "[Use notifications on your Mac](https://support.apple.com/en-us/HT204079)."
+有关 macOS 系统通知的更多信息,请参阅“[在 Mac 上使用通知](https://support.apple.com/en-us/HT204079)”。
{% endmac %}
{% windows %}
-1. Open the **Start** menu, then select **Settings**.
-2. Select **System**, then click **Notifications**.
-3. Find **{% data variables.product.prodname_desktop %}** in the application list and click **On**.
+1. 打开 **Start(开始)**菜单,然后选择 **Settings(设置)**。
+2. 选择 **System(系统)**,然后单击 **Notifications(通知)**。
+3. 在应用程序列表中找到 **{% data variables.product.prodname_desktop %}** ,然后单击 **On(打开)**。
-
+
-For more information about Windows system notifications, see "[Change notification settings in Windows](https://support.microsoft.com/en-us/windows/change-notification-settings-in-windows-8942c744-6198-fe56-4639-34320cf9444e)."
+有关 Windows 系统通知的详细信息,请参阅“[更改 Windows 中的通知设置](https://support.microsoft.com/en-us/windows/change-notification-settings-in-windows-8942c744-6198-fe56-4639-34320cf9444e)”。
{% endwindows %}
diff --git a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-a-pull-request-in-github-desktop.md b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-a-pull-request-in-github-desktop.md
index 3e2cb08449..174f7bf8ca 100644
--- a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-a-pull-request-in-github-desktop.md
+++ b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-a-pull-request-in-github-desktop.md
@@ -15,7 +15,7 @@ versions:
在 {% data variables.product.prodname_desktop %} 中查看拉取请求时,您可以看到贡献者的提交历史记录。 您还可以查看修改、添加或删除了提交的文件。 从 {% data variables.product.prodname_desktop %} 可以在首选文本编辑器中打开仓库以查看任何更改或进行其他更改。 在审查拉取请求中的更改后,您可以对 {% data variables.product.prodname_dotcom %} 提供反馈。 更多信息请参阅“[关于拉取请求审查](/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews)”。
-如果存储库中已启用检查,{% data variables.product.prodname_desktop %} 将显示拉取请求上的检查状态,并允许您重新运行检查。 For more information, see "[Viewing and re-running checks in GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)."
+如果存储库中已启用检查,{% data variables.product.prodname_desktop %} 将显示拉取请求上的检查状态,并允许您重新运行检查。 更多信息请参阅“[在 GitHub Desktop 中查看和重新运行检查](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)”。
## 在 {% data variables.product.prodname_desktop %} 中查看拉取请求
{% data reusables.desktop.current-branch-menu %}
diff --git a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop.md b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop.md
index d022a660b2..ec5bc049c6 100644
--- a/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop.md
+++ b/translations/zh-CN/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop.md
@@ -1,25 +1,25 @@
---
-title: Viewing and re-running checks in GitHub Desktop
-shortTitle: Viewing and re-running checks
-intro: 'You can view the status of checks and re-run them in {% data variables.product.prodname_desktop %}.'
+title: 在 GitHub Desktop 中查看和重新运行检查
+shortTitle: 查看和重新运行检查
+intro: '您可以查看检查的状态,并在 {% data variables.product.prodname_desktop %} 中重新运行它们。'
versions:
fpt: '*'
---
-## About checks in {% data variables.product.prodname_desktop %}
+## 关于 {% data variables.product.prodname_desktop %} 中的检查
-{% data variables.product.prodname_desktop %} displays the status of checks that have run in your pull request branches. The checks badge next to the branch name will display the *pending, passing,* or *failing* state of the checks. You can also re-run all, failed, or individual checks when viewing the status of the checks in {% data variables.product.prodname_desktop %}. For more information on setting up checks in your repository, see "[About status checks](/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)."
+{% data variables.product.prodname_desktop %} 显示已在拉取请求分支中运行的检查的状态。 分支名称旁边的检查标志将显示*挂起、通过、*或*失败*检查状态。 您还可以在 {% data variables.product.prodname_desktop %} 中查看检查的状态时重新运行所有检查、失败的检查或单个检查。 有关在存储库中设置检查的详细信息,请参阅“[关于状态检查](/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)”。
-{% data variables.product.prodname_desktop %} will also show a system notification when checks fail. For more information on enabling notifications, see "[Configuring notifications in GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop)."
+{% data variables.product.prodname_desktop %} 还将在检查失败时显示系统通知。 有关启用通知的详细信息,请参阅“[在 GitHub 桌面中配置通知](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop)”。
-## Viewing and re-running checks
+## 查看和重新运行检查
{% data reusables.desktop.current-branch-menu %}
{% data reusables.desktop.click-pull-requests %}

{% data reusables.desktop.choose-pr-from-list %}

-4. Click on the pull request number, to the right of the pull request branch name. 
-5. To re-run failed checks, click **{% octicon "sync" aria-label="The sync icon" %} Re-run** and select **Re-run Failed Checks**. 
-6. To re-run individual checks, hover over the individual check you want to re-run and select the {% octicon "sync" aria-label="The sync icon" %} icon to re-run the check. 
-7. You will see a confirmation dialog with the summary of the checks that will be re-run. Click **Re-run Checks** to confirm that you want to perform the re-run. 
+4. 单击拉取请求分支名称右侧的拉取请求编号。 
+5. 要重新运行失败的检查,请单击 **{% octicon "sync" aria-label="The sync icon" %} Re-run(重新运行)** ,然后选择 **Re-run Failed Checks(重新运行失败的检查)**。 
+6. 要重新运行单个检查,请将鼠标悬停在要重新运行的单个检查上,然后选择 {% octicon "sync" aria-label="The sync icon" %} 图标以重新运行检查。 
+7. 您将看到一个确认对话框,其中包含将重新运行的检查的摘要。 单击 **Re-run Checks(重新运行检查)**以确认要执行重新运行。 
diff --git a/translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md b/translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md
index a5b2a40fe7..53c2d80265 100644
--- a/translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md
+++ b/translations/zh-CN/content/discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions.md
@@ -27,7 +27,7 @@ versions:
要在仓库讨论中与维护者合作,仓库管理员或项目维护者必须为仓库启用 {% data variables.product.prodname_discussions %}。 更多信息请参阅“[为仓库启用或禁用 {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)”。
-要在组织讨论中与维护者协作,必须为组织启用 {% data variables.product.prodname_discussions %}。 For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)."
+要在组织讨论中与维护者协作,必须为组织启用 {% data variables.product.prodname_discussions %}。 更多信息请参阅“[为组织启用或禁用 {% data variables.product.prodname_discussions %}](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)”。
## 开始讨论
diff --git a/translations/zh-CN/content/discussions/guides/finding-your-discussions.md b/translations/zh-CN/content/discussions/guides/finding-your-discussions.md
index ce5e1de6dc..7f5c96ba01 100644
--- a/translations/zh-CN/content/discussions/guides/finding-your-discussions.md
+++ b/translations/zh-CN/content/discussions/guides/finding-your-discussions.md
@@ -1,6 +1,6 @@
---
-title: Finding your discussions
-intro: You can easily access every discussion you've created or participated in.
+title: 查找讨论
+intro: 您可以轻松访问您创建或参与的每个讨论。
versions:
fpt: '*'
ghec: '*'
diff --git a/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md b/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md
index 1466007873..1f5c5821bc 100644
--- a/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md
+++ b/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-categories-for-discussions.md
@@ -1,6 +1,6 @@
---
-title: Managing categories for discussions
-intro: 'You can categorize discussions to organize conversations for your community members, and you can choose a format for each category.'
+title: 管理讨论的类别
+intro: 您可以对讨论进行分类以组织社区成员的对话,并且可以为每个类别选择格式。
permissions: Repository administrators and people with write or greater access to a repository can manage categories for discussions in the repository. Repository administrators and people with write or greater access to the source repository for organization discussions can manage categories for discussions in the organization.
versions:
fpt: '*'
@@ -21,18 +21,18 @@ redirect_from:
## 默认类别
-| 分类 | 目的 | 格式 |
-|:------- |:--------------------------------------------------------------------- |:----- |
-| 📣 公告 | 项目维护者提供的最新消息和新闻 | 公告 |
-| #️⃣ 常规 | 与项目相关的任何及所有内容 | 开放式讨论 |
-| 💡 想法 | 改变或改进项目的想法 | 开放式讨论 |
-| 🗳 Polls | Polls with multiple options for the community to vote for and discuss | Polls |
-| 🙏 问答 | 供社区回答的问题,使用问题/回答的形式 | 问题及解答 |
-| 🙌 展示和说明 | 与项目有关的创作、试验或测试 | 开放式讨论 |
+| 分类 | 目的 | 格式 |
+|:------- |:------------------- |:----- |
+| 📣 公告 | 项目维护者提供的最新消息和新闻 | 公告 |
+| #️⃣ 常规 | 与项目相关的任何及所有内容 | 开放式讨论 |
+| 💡 想法 | 改变或改进项目的想法 | 开放式讨论 |
+| 🗳 投票 | 具有多种选项的投票,供社区投票和讨论 | 投票 |
+| 🙏 问答 | 供社区回答的问题,使用问题/回答的形式 | 问题及解答 |
+| 🙌 展示和说明 | 与项目有关的创作、试验或测试 | 开放式讨论 |
## 创建类别
-1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category.
+1. 在 {% data variables.product.product_location %} 上,导航到要在其中创建类别的存储库或组织的主页。
{% data reusables.discussions.discussions-tab %}
{% data reusables.discussions.edit-categories %}
1. 单击 **New category(新类别)**。 
@@ -43,7 +43,7 @@ redirect_from:
您可以编辑类别以更改类别的表情符号、标题、说明和讨论格式。
-1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category.
+1. 在 {% data variables.product.product_location %} 上,导航到要在其中创建类别的存储库或组织的主页。
{% data reusables.discussions.discussions-tab %}
1. 在列表中类别右侧,单击 {% octicon "pencil" aria-label="The pencil icon" %}。 
1. {% data reusables.discussions.edit-category-details %}
@@ -54,7 +54,7 @@ redirect_from:
删除类别时,{% data variables.product.product_name %} 会将已删除类别中的所有讨论移到您选择的现有类别。
-1. On {% data variables.product.product_location %}, navigate to the main page of the repository or organization where you want to create a category.
+1. 在 {% data variables.product.product_location %} 上,导航到要在其中创建类别的存储库或组织的主页。
{% data reusables.discussions.discussions-tab %}
1. 在列表中类别右侧,单击 {% octicon "trash" aria-label="The trash icon" %}。 
1. 使用下拉菜单,为要删除的类别中的任何讨论选择新类别。 
diff --git a/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-discussions.md b/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-discussions.md
index 372b660413..bf7774f176 100644
--- a/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-discussions.md
+++ b/translations/zh-CN/content/discussions/managing-discussions-for-your-community/managing-discussions.md
@@ -1,6 +1,6 @@
---
title: 管理讨论
-intro: 'You can categorize, spotlight, transfer, or delete the discussions.'
+intro: 您可以对讨论进行分类、聚焦、转让或删除。
permissions: Repository administrators and people with write or greater access to a repository can manage discussions in the repository. Repository administrators and people with write or greater access to the source repository for organization discussions can manage discussions in the organization.
versions:
fpt: '*'
@@ -15,7 +15,7 @@ redirect_from:
{% data reusables.discussions.about-discussions %} 有关讨论的更多信息,请参阅“[关于讨论](/discussions/collaborating-with-your-community-using-discussions/about-discussions)”。
-Organization owners can choose the permissions required to create a discussion in repositories owned by the organization. Similarly, to choose the permissions required to create an organization discussion, organization owners can change the permissions required in the source repository. 更多信息请参阅“[管理组织中仓库的讨论创建](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)”。
+组织所有者可以选择为组织拥有的仓库创建讨论所需的权限。 同样,要选择创建组织讨论所需的权限,组织所有者可以更改源存储库中所需的权限。 更多信息请参阅“[管理组织中仓库的讨论创建](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)”。
作为讨论维护者,您可以创建社区资源,以鼓励与总体项目目标一致的讨论,并为协作者维护一个友好、开放的论坛。 为协作者制定行为守则或参与指南将有助于促进协作和富有成效的论坛。 有关创建社区资源的更多信息,请参阅“[为项目中添加行为准则](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)”和“[设置仓库参与者指南](/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors)”。
@@ -29,13 +29,13 @@ Organization owners can choose the permissions required to create a discussion i
要管理仓库中的讨论,必须为仓库启用 {% data variables.product.prodname_discussions %}。 更多信息请参阅“[为仓库启用或禁用 {% data variables.product.prodname_discussions %}](/github/administering-a-repository/enabling-or-disabling-github-discussions-for-a-repository)”。
-To manage discussions in an organization, {% data variables.product.prodname_discussions %} must be enabled for the organization. For more information, see "[Enabling or disabling {% data variables.product.prodname_discussions %} for an organization](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)."
+要管理组织中的讨论,必须为组织启用 {% data variables.product.prodname_discussions %}。 更多信息请参阅“[为组织启用或禁用 {% data variables.product.prodname_discussions %}](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)”。
## 更改讨论类别
-您可以对讨论进行分类,以帮助社区成员查找相关的讨论。 For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)."
+您可以对讨论进行分类,以帮助社区成员查找相关的讨论。 更多信息请参阅“[管理讨论的类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)”。
-您也可以将讨论移动到另一个类别。 It's not possible to move a discussion to or from the polls category.
+您也可以将讨论移动到另一个类别。 无法将讨论移入或移出投票类别。
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.discussions.discussions-tab %}
@@ -45,7 +45,7 @@ To manage discussions in an organization, {% data variables.product.prodname_dis
## 固定讨论
-You can pin up to four important discussions above the list of discussions for the repository or organization.
+您可以在仓库或组织的讨论列表上固定多达四个重要的讨论。
{% data reusables.discussions.navigate-to-repo-or-org %}
{% data reusables.discussions.discussions-tab %}
@@ -56,7 +56,7 @@ You can pin up to four important discussions above the list of discussions for t
## 编辑固定的讨论
-编辑固定的讨论不会更改讨论的类别。 For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)."
+编辑固定的讨论不会更改讨论的类别。 更多信息请参阅“[管理讨论的类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)”。
{% data reusables.discussions.navigate-to-repo-or-org %}
{% data reusables.discussions.discussions-tab %}
@@ -75,13 +75,13 @@ You can pin up to four important discussions above the list of discussions for t
## 转让讨论
-要转让讨论,您必须具有在要转让讨论的仓库中创建讨论的权限。 If you want to transfer a discussion to an organization, you must have permissions to create discussions in the source repository for the organization's discussions. 您只能在同一用户或组织帐户拥有的仓库之间转让讨论。 您无法将私有仓库的讨论转让给公共仓库。
+要转让讨论,您必须具有在要转让讨论的仓库中创建讨论的权限。 如果要将讨论转移到组织,您必须有权限在源存储库中为组织的讨论创建讨论。 您只能在同一用户或组织帐户拥有的仓库之间转让讨论。 您无法将私有仓库的讨论转让给公共仓库。
{% data reusables.discussions.navigate-to-repo-or-org %}
{% data reusables.discussions.discussions-tab %}
{% data reusables.discussions.click-discussion-in-list %}
1. 在右侧边栏中,单击 {% octicon "arrow-right" aria-label="The right arrow icon" %} **Transfer discussion(转让讨论)**。 
-1. 选择 **Choose a repository(选择仓库)**下拉菜单,并单击讨论要转让到的仓库。 If you want to transfer a discussion to an organization, choose the source repository for the organization's discussions. 
+1. 选择 **Choose a repository(选择仓库)**下拉菜单,并单击讨论要转让到的仓库。 如果要将讨论转移到组织,请选择组织讨论的源存储库。 
1. 单击 **Transfer discussion(转让讨论)**。 
## 删除讨论
@@ -96,7 +96,7 @@ You can pin up to four important discussions above the list of discussions for t
您可以将具有相同标签的所有议题批量转换为讨论。 具有此标签的未来议题也将自动转换为您配置的讨论和类别。
-1. On {% data variables.product.product_location %}, navigate to the main page of the repository or, for organization discussions, the source repository.
+1. 在 {% data variables.product.product_location %}上,导航到存储库的主页面,或者对于组织讨论,导航到源存储库。
{% data reusables.repositories.sidebar-issues %}
{% data reusables.project-management.labels %}
1. 在要转换为议题的标签旁边,单击 **Convert issues(转换议题)**。
diff --git a/translations/zh-CN/content/discussions/quickstart.md b/translations/zh-CN/content/discussions/quickstart.md
index 44adfa11c2..ad3e93a5aa 100644
--- a/translations/zh-CN/content/discussions/quickstart.md
+++ b/translations/zh-CN/content/discussions/quickstart.md
@@ -62,7 +62,7 @@ shortTitle: 快速入门
仓库所有者和对仓库具有写入权限的人可以创建新类别来保持讨论井然有序。 同样,由于组织讨论基于源存储库,因此存储库所有者和对源存储库具有写入访问权限的人员可以为组织讨论创建新类别。
-参与和创建新讨论的协作者可以将讨论分组到最相关的现有类别。 讨论也可以在创建后重新分类。 For more information, see "[Managing categories for discussions](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)."
+参与和创建新讨论的协作者可以将讨论分组到最相关的现有类别。 讨论也可以在创建后重新分类。 更多信息请参阅“[管理讨论的类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions)”。
{% data reusables.discussions.you-can-label-discussions %}
diff --git a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
index 0c8989772d..e88c70ade6 100644
--- a/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
+++ b/translations/zh-CN/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork/about-github-education-for-students.md
@@ -11,11 +11,11 @@ versions:
shortTitle: 适合学生
---
-将 {% data variables.product.prodname_dotcom %} 用于学校项目是一种与别人协作的实用方式,可创建展示真实世界的作品集。
-
{% data reusables.education.about-github-education-link %}
-拥有 {% data variables.product.prodname_dotcom %} 帐户的每个人都可通过 {% data variables.product.prodname_free_user %} 在无限的公共和私有仓库中协作。 作为学生,您还可以申请 GitHub 学生福利,其中包括访问 GitHub 全球校园,这是一个数字校园,供我们的 GitHub 学生社区利用 GitHub 教育提供的一些最佳计划。 GitHub全球校园包括 {% data variables.product.prodname_student_pack %},提供专业开发人员使用的免费工具和服务,以及对 [校园电视](https://www.twitch.tv/githubeducation)内容、学生活动、GitHub 课堂作业等的访问权限,以帮助学生实现他们的技术职业目标。 更多信息请参阅“[申请学生开发包](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)”和 [{% data variables.product.prodname_education %}](https://education.github.com/)。
+将 {% data variables.product.prodname_dotcom %} 用于学校项目是一种与别人协作的实用方式,可创建展示真实世界的作品集。
+
+拥有 {% data variables.product.prodname_dotcom %} 帐户的每个人都可通过 {% data variables.product.prodname_free_user %} 在无限的公共和私有仓库中协作。 作为学生,您还可以申请 GitHub 学生福利。 更多信息请参阅“[申请学生开发包](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)”和 [{% data variables.product.prodname_education %}](https://education.github.com/)。
如果您是 FIRST 机器人俱乐部的成员,您的辅导员可以申请教育者折扣,这样您的团队可以免费使用 {% data variables.product.prodname_team %}(允许无限的用户和私有仓库) 进行协作。 更多信息请参阅“[申请教育者或研究人员折扣](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)”。
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/index.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/index.md
index 0a7e13a719..341141bbf4 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/index.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/index.md
@@ -6,6 +6,7 @@ versions:
fpt: '*'
children:
- /integrate-github-classroom-with-an-ide
+ - /using-github-codespaces-with-github-classroom
- /about-using-visual-studio-code-with-github-classroom
- /about-using-makecode-arcade-with-github-classroom
- /replit-with-github-classroom
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/integrate-github-classroom-with-an-ide.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/integrate-github-classroom-with-an-ide.md
index 57a834d60d..ce0ae6eed4 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/integrate-github-classroom-with-an-ide.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/integrate-github-classroom-with-an-ide.md
@@ -21,10 +21,11 @@ redirect_from:
{% data variables.product.prodname_classroom %} 支持以下 IDE。 您可以详细了解每个 IDE 的学生体验。
-| IDE | 更多信息 |
-|:------------------------- |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Microsoft MakeCode Arcade | "[关于结合使用 MakeCode Arcade 与 {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/about-using-makecode-arcade-with-github-classroom)" |
-| Visual Studio Code | Visual Studio Marketplace 中的 [{% data variables.product.prodname_classroom %} 扩展](http://aka.ms/classroom-vscode-ext) |
+| IDE | 更多信息 |
+|:--------------------------------------------------------- |:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| {% data variables.product.prodname_github_codespaces %} | “[将 {% data variables.product.prodname_github_codespaces %} 与 {% data variables.product.prodname_classroom %} 一起使用](/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom)” |
+| Microsoft MakeCode Arcade | "[关于结合使用 MakeCode Arcade 与 {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/about-using-makecode-arcade-with-github-classroom)" |
+| Visual Studio Code | Visual Studio Marketplace 中的 [{% data variables.product.prodname_classroom %} 扩展](http://aka.ms/classroom-vscode-ext) |
我们知道云 IDE 集成对您的课堂非常重要,正在努力提供更多选择。
@@ -32,11 +33,13 @@ redirect_from:
创建作业时,您可以选择要用于作业的 IDE。 要了解如何创建使用 IDE 的新作业,请参阅“[创建个人作业](/education/manage-coursework-with-github-classroom/create-an-individual-assignment)”或“[创建小组作业](/education/manage-coursework-with-github-classroom/create-a-group-assignment)”。
-## 为 IDE 授权 OAuth 应用程序
+## 在新 IDE 中设置任务
-第一次使用 IDE 配置作业时,必须为组织的 IDE 授权 OAuth 应用程序。
+首次使用其他 IDE 配置分配时,必须确保设置正确。
-对于所有仓库,授予应用程序**读取**元数据、管理和代码的权限,以及**写入**问管理和代码的权限。 更多信息请参阅“[授权 OAuth 应用程序](/github/authenticating-to-github/authorizing-oauth-apps)”。
+除非使用 {% data variables.product.prodname_github_codespaces %},否则必须为组织的 IDE 授权 OAuth 应用程序。 对于所有仓库,授予应用程序**读取**元数据、管理和代码的权限,以及**写入**问管理和代码的权限。 更多信息请参阅“[授权 OAuth 应用程序](/github/authenticating-to-github/authorizing-oauth-apps)”。
+
+{% data variables.product.prodname_github_codespaces %} 不需要 OAuth 应用程序,但需要启用 {% data variables.product.prodname_github_codespaces %},以便组织能够使用 {% data variables.product.prodname_codespaces %} 配置作业。 更多信息请参阅“[将 {% data variables.product.prodname_github_codespaces %} 与 {% data variables.product.prodname_classroom %} 一起使用](/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom#enabling-codespaces-for-your-organization)”。
## 延伸阅读
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
new file mode 100644
index 0000000000..d34be70f4d
--- /dev/null
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -0,0 +1,86 @@
+---
+title: Using GitHub Codespaces with GitHub Classroom
+shortTitle: Using Codespaces with GitHub Classroom
+product: '{% data reusables.gated-features.codespaces-classroom-articles %}'
+intro: 'You can use {% data variables.product.prodname_github_codespaces %} as the preferred editor in your assignments to give students access to a browser-based Visual Studio Code environment with one-click setup.'
+versions:
+ fpt: '*'
+permissions: 'Organization owners who are admins for a classroom can enable {% data variables.product.prodname_github_codespaces %} for their organization and integrate {% data variables.product.prodname_github_codespaces %} as the supported editor for an assignment. {% data reusables.classroom.classroom-admins-link %}'
+---
+## About {% data variables.product.prodname_codespaces %}
+
+{% data variables.product.prodname_github_codespaces %} is an instant, cloud-based development environment that uses a container to provide you with common languages, tools, and utilities for development. {% data variables.product.prodname_codespaces %} is also configurable, allowing you to create a customized development environment that is the same for all users of your project. For more information, see "[{% data variables.product.prodname_github_codespaces %} overview](/codespaces/overview)."
+
+Once {% data variables.product.prodname_codespaces %} is enabled in an organization or enterprise, users can create a codespace from any branch or commit in an organization or enterprise repository and begin developing using cloud-based compute resources. You can connect to a codespace from the browser or locally using Visual Studio Code. {% data reusables.codespaces.links-to-get-started %}
+
+Setting {% data variables.product.prodname_codespaces %} as the preferred editor for an assignment in GitHub Classroom assignments, is beneficial for both students and teachers. {% data variables.product.prodname_codespaces %} is a good option for students using loaned devices or without access to a local IDE setup, since each codespace is cloud-based and requires no local setup. Students can launch a codespace for an assignment repository in Visual Studio Code directly in their browser, and begin developing right away without needing any further configuration.
+
+For assignments with complex setup environments, teachers can customize the dev container configuration for a repository's codespaces. This ensures that when a student creates a codespace, it automatically opens with the development environment configured by the teacher. For more information on dev containers, see "[Introduction to dev containers](/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers)."
+
+## About the {% data variables.product.prodname_codespaces %} Education benefit for verified teachers
+
+The {% data variables.product.prodname_codespaces %} Education benefit gives verified teachers a free monthly allowance of {% data variables.product.prodname_codespaces %} hours to use in {% data variables.product.prodname_classroom %}. The free allowance is estimated to be enough for a class of 50 with 5 assignments per month, on a 2 core machine with 1 codespace stored per student.
+
+{% data reusables.classroom.free-limited-codespaces-for-verified-teachers-beta-note %}
+
+To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[Applying for an educator or teacher benefit](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount#applying-for-an-educator-or-researcher-discount)."
+
+After you have confirmation that you are a verified teacher, visit [Global Campus for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-products#github-team).
+
+If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_codespaces %} usage. However, you can change or remove these policies in your organization settings. For more information, see "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
+
+When the {% data variables.product.prodname_codespaces %} Education benefit moves out of beta, if your organization exceeds their free allowance for {% data variables.product.prodname_codespaces %} usage, your organization will be billed for additional usage. For more information, see "[About billing for {% data variables.product.prodname_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#about-billing-for-codespaces)."
+
+## Enabling {% data variables.product.prodname_codespaces %} for your organization
+
+{% data variables.product.prodname_codespaces %} is available to use with {% data variables.product.prodname_classroom %} for organizations that use {% data variables.product.prodname_team %}. If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, you must enable {% data variables.product.prodname_codespaces %} through {% data variables.product.prodname_classroom %}, instead of enabling it directly in your organization settings. Otherwise, your organization will be billed directly for all usage of {% data variables.product.prodname_codespaces %}.
+
+### Enabling Codespaces for an organization when creating a new classroom
+{% data reusables.classroom.sign-into-github-classroom %}
+1. Click **New classroom**.
+
+ 
+
+1. In the list of organizations, click the organization you'd like to use for your classroom. Organizations that are eligible for {% data variables.product.prodname_codespaces %} will have a note showing that they are eligible. Optionally, you can create a new organization. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)."
+
+ 
+
+1. In the "Name your classroom" page, under "{% data variables.product.prodname_codespaces %} in your Classroom", click **Enable**. Note that this will enable {% data variables.product.prodname_codespaces %} for all repositories and users in the organization.
+
+ 
+
+1. When you are ready to create the new classroom, click **Create classroom**.
+
+### Enabling Codespaces for an organization via an existing classroom
+
+{% data reusables.classroom.sign-into-github-classroom %}
+{% data reusables.classroom.click-classroom-in-list %}
+{% data reusables.classroom.click-settings %}
+1. Under "{% data variables.product.prodname_github_codespaces %}", click **Enable**. This will enable {% data variables.product.prodname_codespaces %} for all repositories and users in the organization. A new Codespace policy is also added to restrict machine types for all codespaces in the organization to 2 core machines.
+
+ 
+
+You can use the same methods as above to disable {% data variables.product.prodname_codespaces %} for your organization as well. Note that this will disable {% data variables.product.prodname_codespaces %} for all users and repositories in the organization.
+
+## Configuring an assignment to use {% data variables.product.prodname_codespaces %}
+To make {% data variables.product.prodname_codespaces %} available to students for an assignment, you can choose {% data variables.product.prodname_codespaces %} as the supported editor for the assignment. When creating a new assignment, in the "Add your starter code and choose your optional online IDE" page, under "Add a supported editor", select **{% data variables.product.prodname_github_codespaces %}** from the dropdown menu.
+
+
+
+If you use a template repository for an assignment, you can define a dev container in the repository to customize the tools and runtimes available to students when they launch a codespace to work on the assignment. If you do not define a dev container, {% data variables.product.prodname_github_codespaces %} will use a default configuration, which contains many of the common tools that your students might need for development. For more information on defining a dev container, see "[Add a dev container configuration to your repository](/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces)."
+
+## Launching an assignment using {% data variables.product.prodname_codespaces %}
+
+When a student opens an assignment, the repository's README file includes their teacher's recommendation of the IDE they should use for the work.
+
+
+
+Students can launch a new or existing codespace by clicking the **{% octicon "code" aria-label="The code icon" %} Code** button on the main page of the assignment repository, then selecting the **Codespaces** tab. For more information, see "[Creating a codespace](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)."
+
+
+
+Teachers can view each student's codespace for an assignment in the assignment overview page. You can click on the Codespaces icon on the right side of each student row to launch the codespace.
+
+
+
+When you connect to a codespace through a browser, auto-save is enabled automatically. If you want to save changes to the repository, you will need to commit the changes and push them to a remote branch. If you leave your codespace running without interaction for 30 minutes by default, the codespace will timeout and stop running. Your data will be preserved from the last time you made a change. For more information on the lifecycle of a codespace, see "[Codespaces lifecycle](/codespaces/developing-in-codespaces/codespaces-lifecycle)."
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
index dad409d7d5..2e4556f542 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-a-group-assignment.md
@@ -96,6 +96,8 @@ redirect_from:
{% data reusables.classroom.about-online-ides %} 更多信息请参阅“[集成 {% data variables.product.prodname_classroom %} 与 IDE](/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide)”。
+{% data reusables.classroom.classroom-codespaces-link %}
+
{% data reusables.classroom.assignments-guide-choose-an-online-ide %}
{% data reusables.classroom.assignments-guide-click-continue-after-starter-code-and-feedback %}
diff --git a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
index 2fc0d09579..0602d2c15c 100644
--- a/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
+++ b/translations/zh-CN/content/education/manage-coursework-with-github-classroom/teach-with-github-classroom/create-an-individual-assignment.md
@@ -78,6 +78,8 @@ shortTitle: 个人作业
{% data reusables.classroom.about-online-ides %} 更多信息请参阅“[集成 {% data variables.product.prodname_classroom %} 与 IDE](/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide)”。
+{% data reusables.classroom.classroom-codespaces-link %}
+
{% data reusables.classroom.assignments-guide-choose-an-online-ide %}
## 为作业提供反馈
diff --git a/translations/zh-CN/content/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github.md b/translations/zh-CN/content/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github.md
index 6514b61968..8d7a42b5ee 100644
--- a/translations/zh-CN/content/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github.md
+++ b/translations/zh-CN/content/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github.md
@@ -25,7 +25,7 @@ shortTitle: 为开源做贡献
如果您一直活跃在 {% data variables.product.product_location %} 上,可以根据您过去的参与、标星以及在 [Explore](https://github.com/explore) 中的其他活动,为您的项目找到个性化的建议和合适的第一个议题。 您还可以注册 Explore 通讯以根据您的兴趣接收相关电子邮件,了解参与 {% data variables.product.product_name %} 的机会。 要注册,请参阅 [Explore 电子邮件通讯](https://github.com/explore/subscribe)。
-使用个人仪表板及时了解您关注的存储库和人员{% if for-you-feed %} 以及组织{% endif %} 的最近活动。 更多信息请参阅“[关于个人仪表板](/articles/about-your-personal-dashboard)”。
+使用个人仪表板及时了解您关注的存储库和人员以及组织的最近活动。 更多信息请参阅“[关于个人仪表板](/articles/about-your-personal-dashboard)”。
{% data reusables.support.ask-and-answer-forum %}
diff --git a/translations/zh-CN/content/get-started/exploring-projects-on-github/following-organizations.md b/translations/zh-CN/content/get-started/exploring-projects-on-github/following-organizations.md
index bdd160909e..9d5de728df 100644
--- a/translations/zh-CN/content/get-started/exploring-projects-on-github/following-organizations.md
+++ b/translations/zh-CN/content/get-started/exploring-projects-on-github/following-organizations.md
@@ -17,7 +17,7 @@ topics:
当您关注组织时,您将在个人仪表板上看到他们的公共活动。 更多信息请参阅“[关于个人仪表板](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard#staying-updated-with-activity-from-the-community)”。
-如果您不希望在 {% data variables.product.product_name %} 上看到某个组织的公开活动,则可以取消关注该组织。
+You can unfollow an organization if you do not wish to see their {% ifversion fpt or ghec %}public{% endif %} activity on {% data variables.product.product_name %}.
## 在 {% data variables.product.product_name %} 上关注组织
diff --git a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md
index ef0e6f3013..fab84e17e6 100644
--- a/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md
+++ b/translations/zh-CN/content/get-started/quickstart/fork-a-repo.md
@@ -210,6 +210,6 @@ gh repo fork repository --remote-name "main-remote-repo"
* 您也可以创建一个新的仓库,以将所有项目放在 {% data variables.product.prodname_dotcom %} 上并共享代码。 {% data reusables.getting-started.create-a-repository %}"
-* {% data variables.product.product_name %} 中的每个仓库均归个人或组织所有。 您可以在 {% data variables.product.product_name %} 上连接和关注用户、仓库和组织以与之进行交互。 {% data reusables.getting-started.being-social %}
+* {% data reusables.getting-started.being-social %}
* {% data reusables.support.connect-in-the-forum-bootcamp %}
diff --git a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
index 4a64640533..b7d84a2064 100644
--- a/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
+++ b/translations/zh-CN/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
@@ -237,6 +237,12 @@ git commit
您可以在 {% data variables.product.product_name %} 上提及人员或[团队](/articles/setting-up-teams/),方法是键入 @ 加上其用户名或团队名称。 这将触发通知并提请他们注意对话。 如果您在编辑的评论中提及某人的用户名或团队名称,该用户也会收到通知。 有关通知的更多信息,请参阅{% ifversion fpt or ghes or ghae or ghec %}"[关于通知](/github/managing-subscriptions-and-notifications-on-github/about-notifications){% else %}“[关于通知](/github/receiving-notifications-about-activity-on-github/about-notifications){% endif %}”。
+{% note %}
+
+**Note:** A person will only be notified about a mention if the person has read access to the repository and, if the repository is owned by an organization, the person is a member of the organization.
+
+{% endnote %}
+
`@github/support 您如何看待这些更新?`

diff --git a/translations/zh-CN/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md b/translations/zh-CN/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md
index afbf7b129b..64fc4c2aee 100644
--- a/translations/zh-CN/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md
+++ b/translations/zh-CN/content/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue.md
@@ -47,7 +47,7 @@ shortTitle: 将 PR 链接到议题
* resolves
* resolved
-如果使用关键字在另一个拉取请求中引用拉取请求注释,则将链接拉取请求。 合并引用拉取请求也会关闭引用的拉取请求。
+如果使用关键字在另一个拉取请求中引用拉取请求注释,则将链接拉取请求。 Merging the referencing pull request will also close the referenced issue.
关闭关键词的语法取决于议题是否与拉取请求在同一仓库中。
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
index 93a3488e57..fcc2e7fa11 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/creating-a-project.md
@@ -111,7 +111,7 @@ topics:
## 恢复存档的项
-1. Navigate to your project.
+1. 导航到您的项目。
1. 在右上角,单击 {% octicon "kebab-horizontal" aria-label="the kebab icon" %}。
1. 在菜单中,单击 **Archived items(已存档的项)**。
1. (可选)要筛选显示的已存档项,请在项列表上方的文本框中键入筛选器。 有关可用筛选器的详细信息,请参阅“[筛选项目 (测试版)](/issues/trying-out-the-new-projects-experience/filtering-projects)”。
@@ -163,7 +163,7 @@ topics:
6. 如果您指定**单选**为类型,请输入选项。
7. 如果指定**迭代**为类型,请输入第一个迭代的开始日期和迭代的持续时间。 将自动创建三个迭代,您可以在项目的设置页上添加其他迭代。
-您可以稍后编辑单选和迭代字段的下拉选项。
+You can also edit your custom fields.
{% data reusables.projects.project-settings %}
1. 在 **Fields(字段)**下,选择要编辑的字段。
diff --git a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md
index b5e7491360..c0b51a13fe 100644
--- a/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md
+++ b/translations/zh-CN/content/issues/trying-out-the-new-projects-experience/using-insights-with-projects.md
@@ -36,8 +36,8 @@ topics:
{% data reusables.projects.access-insights %}
1. 在左侧菜单中,单击要配置的图表。
1. 在页面右侧,单击 **Configure(配置)**。 右侧将打开一个面板。
-2. 要更改图表类型,请选择 **Layout(布局)**下拉列表,然后单击要使用的图表类型。
-3. 要更改用于图表 X 轴的字段,请选择 **X-axis(X 轴)**下拉列表,然后单击要使用的字段。 如果选择“Time(时间)”,“Group by(分组依据)”将变为“Status(状态)”,“Y-Axis(Y 轴)”将变为“Count of items(项数)”。
-4. (可选)要按其他字段对 X 轴上的项目进行分组,请选择 **Group by(分组依据)**,然后单击要使用的字段,或单击“None(无)”以禁用分组。
-5. (可选)如果项目包含数字字段,并且您希望 Y 轴显示其中一个数字字段的总和、平均值、最小值或最大值,请选择 **Y-axis(Y 轴)** ,然后单击选项。 然后,选择下面显示的下拉列表,并单击要使用的数字字段。
-6. 要保存图表,请单击 **Save changes(保存更改)**。
+1. 要更改图表类型,请选择 **Layout(布局)**下拉列表,然后单击要使用的图表类型。
+1. 要更改用于图表 X 轴的字段,请选择 **X-axis(X 轴)**下拉列表,然后单击要使用的字段。
+1. (可选)要按其他字段对 X 轴上的项目进行分组,请选择 **Group by(分组依据)**,然后单击要使用的字段,或单击“None(无)”以禁用分组。
+1. (可选)如果项目包含数字字段,并且您希望 Y 轴显示其中一个数字字段的总和、平均值、最小值或最大值,请选择 **Y-axis(Y 轴)** ,然后单击选项。 然后,选择下面显示的下拉列表,并单击要使用的数字字段。
+1. 要保存图表,请单击 **Save changes(保存更改)**。
diff --git a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md
index f335d08382..f559b2b84b 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile.md
@@ -49,7 +49,7 @@ shortTitle: 自定义组织配置文件
## 添加成员专享组织资料 README
-1. 如果您的组织还没有 `.github-private` 存储库,请创建一个公共 `.github-private` 存储库。 此操作可由对该存储库具有写入权限的任何用户执行。
+1. 如果您的组织还没有 `.github-private` 存储库,请创建一个名为 `.github-private` 的私有存储库。
2. 在组织的 `.github-private` 存储库中,在 `profile` 文件夹中创建 `README.md` 文件。
3. 将更改提交到 `README.md` 文件。 `README.md` 的内容将显示在组织资料的成员视图中。
diff --git a/translations/zh-CN/content/organizations/collaborating-with-your-team/about-team-discussions.md b/translations/zh-CN/content/organizations/collaborating-with-your-team/about-team-discussions.md
index 3e58c326a4..a639d9cfa2 100644
--- a/translations/zh-CN/content/organizations/collaborating-with-your-team/about-team-discussions.md
+++ b/translations/zh-CN/content/organizations/collaborating-with-your-team/about-team-discussions.md
@@ -44,7 +44,7 @@ topics:
{% ifversion fpt or ghec %}
-## Organization discussions
+## 组织讨论
您还可以使用组织讨论来促进整个组织的对话。 更多信息请参阅“[为组织启用或禁用 GitHub Discussions](/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization)”。
diff --git a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
index b712fd998e..40c99ceccc 100644
--- a/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/zh-CN/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md
@@ -77,7 +77,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
| [`repository_secret_scanning_custom_pattern`](#respository_secret_scanning_custom_pattern-category-actions) | Contains repository-level activities related to secret scanning custom patterns. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)." {% endif %}{% if secret-scanning-audit-log-custom-patterns %}
| [`repository_secret_scanning_push_protection`](#respository_secret_scanning_push_protection) | Contains repository-level activities related to secret scanning custom patterns. For more information, see "[Protecting pushes with secert scanning](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)." {% endif %}{% ifversion fpt or ghes or ghae-issue-4864 or ghec %}
| [`repository_vulnerability_alert`](#repository_vulnerability_alert-category-actions) | Contains all activities related to [{% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% ifversion fpt or ghec %}
-| [`repository_vulnerability_alerts`](#repository_vulnerability_alerts-category-actions) | Contains repository-level configuration activities for {% data variables.product.prodname_dependabot_alerts %}.{% endif %}{% ifversion ghec %}
+| [`repository_vulnerability_alerts`](#repository_vulnerability_alerts-category-actions) | Contains repository-level configuration activities for {% data variables.product.prodname_dependabot_alerts %}.{% endif %}{% if custom-repository-roles %}
| [`role`](#role-category-actions) | Contains all activities related to [custom repository roles](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization).{% endif %}{% ifversion ghes or ghae or ghec %}
| [`secret_scanning`](#secret_scanning-category-actions) | Contains organization-level configuration activities for secret scanning in existing repositories. For more information, see "[About secret scanning](/github/administering-a-repository/about-secret-scanning)."
| [`secret_scanning_new_repos`](#secret_scanning_new_repos-category-actions) | Contains organization-level configuration activities for secret scanning for new repositories created in the organization. {% endif %}{% ifversion fpt or ghec %}
@@ -725,7 +725,7 @@ For more information, see "[Managing the publication of {% data variables.produc
| `disable` | Triggered when a repository owner or person with admin access to the repository disables {% data variables.product.prodname_dependabot_alerts %}.
| `enable` | Triggered when a repository owner or person with admin access to the repository enables {% data variables.product.prodname_dependabot_alerts %}.
-{% endif %}{% ifversion ghec %}
+{% endif %}{% if custom-repository-roles %}
### `role` category actions
| Action | Description
|------------------|-------------------
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 836b4072b8..ec169b0963 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
@@ -31,7 +31,7 @@ shortTitle: 存储库角色
{% ifversion fpt %}
如果您的组织使用 {% data variables.product.prodname_ghe_cloud %},则可以创建自定义存储库角色。 更多信息请参阅 {% data variables.product.prodname_ghe_cloud %} 文档中的“[管理组织的自定义仓库角色](/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。
-{% elsif ghec %}
+{% elsif ghec or ghes > 3.4 or ghae-issue-6271 %}
您可以创建自定义存储库角色。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。
{% endif %}
diff --git a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md
index 1e711bd8ed..9771723cb0 100644
--- a/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md
@@ -23,7 +23,7 @@ shortTitle: 设置基本权限
如果对组织存储库具有管理员访问权限的人员向成员授予对存储库的更高级别的访问权限,则较高级别的访问权限将覆盖基本权限。
-{% ifversion ghec %}
+{% if custom-repository-roles %}
如果您创建了继承角色的访问权限低于组织基本权限的自定义仓库角色,则分配给该角色的任何成员都将默认使用组织的基本权限,而不是继承的角色。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。
{% endif %}
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md
index 03787aab0a..ccfe89d1b1 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/enabling-or-disabling-github-discussions-for-an-organization.md
@@ -1,22 +1,22 @@
---
-title: Enabling or disabling GitHub Discussions for an organization
-intro: 'You can use {% data variables.product.prodname_discussions %} in a organization as a place for your organization to have conversations that aren''t specific to a single repository within your organization.'
+title: 为组织启用或禁用 GitHub 讨论
+intro: '您可以使用组织中的 {% data variables.product.prodname_discussions %} 作为组织进行对话的位置,这些对话不特定于组织中的单个存储库。'
permissions: 'Organization owners can enable {% data variables.product.prodname_discussions %} for their organization.'
versions:
fpt: '*'
ghec: '*'
topics:
- Organizations
-shortTitle: Organization discussions
+shortTitle: 组织讨论
---
-## About organization discussions
+## 关于组织讨论
{% data reusables.discussions.about-organization-discussions %}
-You can also manage repository discussions. For more information, see "[Enabling or disabling GitHub Discussions for a repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository)" and "[Managing discussion creation for repositories in your organization](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)."
+您还可以管理存储库讨论。 更多信息请参阅“[为存储库启用或禁用 GitHub 讨论](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository)”和“[管理组织中存储库的讨论创建](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)”。
-## Enabling or disabling {% data variables.product.prodname_discussions %} for your organization
+## 为组织启用或禁用 {% data variables.product.prodname_discussions %}
{% data reusables.discussions.enabling-or-disabling-github-discussions-for-your-organization %}
1. 要禁用讨论,请在“Discussions(讨论)”下,取消选择 **Enable discussions for this organization(为此组织启用讨论)**。
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md b/translations/zh-CN/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
index a220acfc04..ece1da96e7 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md
@@ -13,23 +13,21 @@ topics:
- Organizations
- Teams
shortTitle: 设置可见性更改策略
+permissions: Organization owners can restrict repository visibility changes for an organization.
---
-您可以将更改仓库可见性的权限仅限于组织所有者,或者允许具有仓库管理员权限的成员也可以更改仓库可见性。
+You can restrict who has the ability to change the visibility of repositories in your organization, such as changing a repository from private to public. For more information about repository visibility, see "[About repositories](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)."
+
+You can restrict the ability to change repository visibility to organization owners only, or you can allow anyone with admin access to a repository to change visibility.
{% warning %}
-**警告**:如果启用,此设置允许具有管理员权限的用户将现有仓库更改为任何可见性,即使您不允许创建该类型的仓库。 有关在创建过程中限制仓库可见性的更多信息,请参阅“[限制组织中的仓库创建](/articles/restricting-repository-creation-in-your-organization)”。
+**Warning**: If enabled, this setting allows people with admin access to choose any visibility for an existing repository, even if you do not allow that type of repository to be created. 有关在创建过程中限制仓库可见性的更多信息,请参阅“[限制组织中的仓库创建](/articles/restricting-repository-creation-in-your-organization)”。
{% endwarning %}
-
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
{% data reusables.organizations.member-privileges %}
5. 在“Repository visibility change(仓库可见性更改)”下,取消选择 **Allow members to change repository visibilities for this organization(允许成员为此组织更改仓库可见性)**。 
6. 单击 **Save(保存)**。
-
-## 延伸阅读
-
-- "[关于仓库](/repositories/creating-and-managing-repositories/about-repositories#about-repository-visibility)"
diff --git a/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
index cb9a697b3e..d022ae6eaf 100644
--- a/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
+++ b/translations/zh-CN/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md
@@ -1,6 +1,6 @@
---
title: 设置添加外部协作者的权限
-intro: 为了保护组织的数据和组织中使用的付费许可数,您可以只允许所有者邀请外部协作者加入组织仓库。
+intro: 为保护组织的数据和组织中使用的付费许可证数,可以配置谁可以将外部协作者添加到组织存储库。
redirect_from:
- /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories
- /articles/setting-permissions-for-adding-outside-collaborators
@@ -15,7 +15,7 @@ topics:
shortTitle: 设置协作者策略
---
-默认情况下,对存储库具有管理员访问权限的任何人都可以邀请外部协作者处理存储库。 您可以选择将邀请外部协作者的能力限制为仅邀请组织所有者。
+默认情况下,对存储库具有管理员访问权限的任何人都可以邀请外部协作者处理存储库。 您可以选择将添加外部协作者的能力仅限于组织所有者。
{% ifversion ghec %}
{% note %}
@@ -31,6 +31,7 @@ shortTitle: 设置协作者策略
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
-{% data reusables.organizations.member-privileges %}
-5. 在“Repository invitations(仓库邀请)”下,选择 **Allow members to invite outside collaborators to repositories for this organization(允许成员邀请外部协作者加入此组织的仓库)**。 
+{% data reusables.organizations.member-privileges %}{% ifversion ghes < 3.3 %}
+5. 在“Repository invitations(仓库邀请)”下,选择 **Allow members to invite outside collaborators to repositories for this organization(允许成员邀请外部协作者加入此组织的仓库)**。 {% else %}
+5. 在“Repository outside collaborators(存储库外部协作者)”下,取消选择 **Allow repository administrators to invite outside collaborators to repositories for this organization(允许外部协作者邀请外部协作者访问此组织的存储库)**。 {% endif %}
6. 单击 **Save(保存)**。
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 0b33306951..19c556c236 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
@@ -3,7 +3,7 @@ title: 管理组织的自定义存储库角色
intro: 通过创建自定义存储库角色,可以更精细地控制对组织存储库的访问。
permissions: Organization owners can manage custom repository roles.
versions:
- ghec: '*'
+ feature: custom-repository-roles
topics:
- Organizations
- Teams
@@ -12,11 +12,9 @@ redirect_from:
- /early-access/github/articles/managing-custom-repository-roles-for-an-organization
---
-{% data reusables.pre-release-program.custom-roles-public-beta %}
-
## 关于自定义存储库角色
-要对 {% data variables.product.product_name %} 执行任何操作,例如在存储库中创建拉取请求或更改组织的计费设置,人员必须具有对相关帐户或资源的足够访问权限。 This access is controlled by permissions. A permission is the ability to perform a specific action. For example, the ability to delete an issue is a permission. A role is a set of permissions you can assign to individuals or teams.
+要对 {% data variables.product.product_name %} 执行任何操作,例如在存储库中创建拉取请求或更改组织的计费设置,人员必须具有对相关帐户或资源的足够访问权限。 此访问受权限控制。 权限是执行特定操作的能力。 例如,删除议题的能力是一种权限。 角色是可以分配给个人或团队的一组权限。
在组织内,您可以在组织、团队和存储库级别分配角色。 有关不同级别角色的更多信息,请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)”。
@@ -51,6 +49,17 @@ redirect_from:
仅当继承的角色中尚未包含其他权限时,才能选择该权限。 例如,如果继承的角色提供对存储库**写入**访问权限,则“关闭拉取请求”权限将已包含在继承的角色中。
+{% ifversion ghec %}
+### Discussions
+
+- **创建讨论类别**:能够创建新的讨论类别。 更多信息请参阅“[创建新类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions#creating-a-category)”。
+- **编辑讨论类别**:编辑讨论类别的功能。 更多信息请参阅“[编辑讨论类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions#editing-a-category)”。
+- **删除讨论类别**:删除讨论类别的功能。 更多信息请参阅“[删除讨论类别](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions#deleting-a-category)”。
+- **标记或取消标记讨论答案**:如果讨论的类别接受答案,则能够标记讨论的答案。 更多信息请参阅“[标记或取消标记讨论中的评论作为答案](/discussions/managing-discussions-for-your-community/moderating-discussions#marking-a-comment-as-an-answer)”。
+- **隐藏或取消隐藏讨论评论**:能够隐藏和取消隐藏讨论中的评论。 更多信息请参阅“[主持讨论](/communities/moderating-comments-and-conversations/managing-disruptive-comments#hiding-a-comment)”。
+- **将议题转换为讨论**:能够将议题转换为讨论。 更多信息请参阅“[将议题转换为讨论](/discussions/managing-discussions-for-your-community/moderating-discussions#converting-an-issue-to-a-discussion)”。
+{% endif %}
+
### 议题和拉取请求
- **分配或删除用户**:将用户分配给问题或拉取请求,或从问题或拉取请求中删除用户。
@@ -79,7 +88,9 @@ redirect_from:
- **管理 web 挂钩**:将 web 挂钩添加到存储库。
- **管理部署密钥**:将部署密钥添加到存储库。
- **编辑存储库元数据**:更新存储库描述以及存储库主题。
+{%- ifversion ghec %}
- **设置交互限制**:暂时限制某些用户在公共存储库中发表评论、打开议题或创建拉取请求,以强制执行一段有限的活动。 更多信息请参阅“[限制存储库中的交互](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)”。
+{%- endif %}
- **设置社交预览**:将识别图像添加到存储库,该图像在链接存储库时显示在社交媒体平台上。 更多信息请参阅“[自定义仓库的社交媒体审查](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/customizing-your-repositorys-social-media-preview)”。
- **推送提交到受保护分支**:推送到标记为受保护分支的分支。
- **创建受保护的标记**:创建与标记保护规则匹配的标记。 更多信息请参阅“[配置标记保护规则](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)”。
diff --git a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-moderators-in-your-organization.md b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-moderators-in-your-organization.md
index 3685aa94cb..a6f5e34130 100644
--- a/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-moderators-in-your-organization.md
+++ b/translations/zh-CN/content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-moderators-in-your-organization.md
@@ -24,7 +24,7 @@ shortTitle: 管理版主
将某人设为组织版主不会向他们授予除上述能力以外的其他能力。 例如,仅对存储库具有读取访问权限的人不会通过成为版主而获得写入访问权限。
-您最多可以添加 10 个人或团队作为版主。 如果您已将 10 个人和/或团队分配为用户,并且想要添加更多用户,则可以将人员分组到版主团队中,然后使用它来替换一个或多个现有任务。 For more information, see "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)."
+您最多可以添加 10 个人或团队作为版主。 如果您已将 10 个人和/或团队分配为用户,并且想要添加更多用户,则可以将人员分组到版主团队中,然后使用它来替换一个或多个现有任务。 更多信息请参阅“[创建团队](/organizations/organizing-members-into-teams/creating-a-team)”。
## 添加组织版主
diff --git a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations.md b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations.md
index 1f05ae9563..9c26e86cf2 100644
--- a/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations.md
+++ b/translations/zh-CN/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations.md
@@ -1,5 +1,5 @@
---
-title: About SCIM for organizations
+title: 关于组织的 SCIM
intro: '通过“跨域身份管理系统”(System for Cross-domain Identity Management, SCIM),管理员可以在系统之间自动交换用户身份信息。'
redirect_from:
- /articles/about-scim
@@ -12,30 +12,30 @@ topics:
- Teams
---
-## About SCIM for organizations
+## 关于组织的 SCIM
-If your organization uses [SAML SSO](/articles/about-identity-and-access-management-with-saml-single-sign-on), you can implement SCIM to add, manage, and remove organization members' access to {% data variables.product.product_name %}. 例如,管理员可以使用 SCIM 撤销配置组织成员,以及从组织中自动删除成员。
+如果您的组织使用 [SAML SSO](/articles/about-identity-and-access-management-with-saml-single-sign-on),则可以实施 SCIM 来添加、管理和删除组织成员对 {% data variables.product.product_name %} 的访问。 例如,管理员可以使用 SCIM 撤销配置组织成员,以及从组织中自动删除成员。
{% data reusables.saml.ghec-only %}
{% data reusables.scim.enterprise-account-scim %}
-如果您使用 SAML SSO 而不实施 SCIM,将不能自动撤销配置。 当组织成员的会话在其访问权限从 IdP 删除后到期时,他们就会自动从组织中删除。 即使会话已到期,通过授权的令牌也可授予对组织的访问。 If SCIM is not used, to fully remove a member's access, an organization owner must remove the member's access in the IdP and manually remove the member from the organization on {% data variables.product.prodname_dotcom %}.
+如果您使用 SAML SSO 而不实施 SCIM,将不能自动撤销配置。 当组织成员的会话在其访问权限从 IdP 删除后到期时,他们就会自动从组织中删除。 即使会话已到期,通过授权的令牌也可授予对组织的访问。 如果未使用 SCIM,要完全移除成员的访问权限,组织所有者必须在 IdP 中删除该成员的访问权限,并在 {% data variables.product.prodname_dotcom %} 上手动从组织中删除该成员。
{% data reusables.scim.changes-should-come-from-idp %}
## 支持的身份提供程序
-These identity providers (IdPs) are compatible with the {% data variables.product.product_name %} SCIM API for organizations. 更多信息请参阅 {% ifversion ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API 文档中的 [SCIM](/rest/scim) 。
+这些身份提供程序 (IdP) 兼容组织的 {% data variables.product.product_name %} SCIM API。 更多信息请参阅 {% ifversion ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API 文档中的 [SCIM](/rest/scim) 。
- Azure AD
- Okta
- OneLogin
-## About SCIM configuration for organizations
+## 关于组织的 SCIM 配置
{% data reusables.scim.dedicated-configuration-account %}
-Before you authorize the {% data variables.product.prodname_oauth_app %}, you must have an active SAML session. 更多信息请参阅“[关于使用 SAML 单点登录进行身份验证](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on#about-oauth-apps-github-apps-and-saml-sso)”。
+在授权 {% data variables.product.prodname_oauth_app %} 之前,您必须具有活动的 SAML 会话。 更多信息请参阅“[关于使用 SAML 单点登录进行身份验证](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on#about-oauth-apps-github-apps-and-saml-sso)”。
{% note %}
diff --git a/translations/zh-CN/content/packages/index.md b/translations/zh-CN/content/packages/index.md
index 014ca354fb..6ebdcb6fc2 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 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 %}'
+ - '{% ifversion fpt or ghec or ghes > 3.4 %}/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 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 %}'
+ - '{% ifversion fpt or ghec or ghes > 3.4 %}/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/learn-github-packages/configuring-a-packages-access-control-and-visibility.md b/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
index 43c95a23b1..426cebe418 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md
@@ -8,9 +8,12 @@ redirect_from:
versions:
fpt: '*'
ghec: '*'
+ ghes: '*'
shortTitle: 访问控制和可见性
---
+{% data reusables.package_registry.container-registry-ghes-beta %}
+
具有精细权限的包仅限于个人用户或组织帐户。 您可以从与包相连(或链接)的仓库分别更改包的访问控制和可见性。
目前,您只能对 {% data variables.product.prodname_container_registry %} 使用粒度权限。 粒度权限不支持我们的其他软件包注册表,如 npm 注册表。
@@ -27,7 +30,7 @@ shortTitle: 访问控制和可见性
如果您的软件包是私人或内部的并且由组织拥有,则您只能向其他组织成员或团队授予访问。
-{% data reusables.package_registry.package-settings-from-user-level %}
+{% data reusables.package_registry.package-settings-option %}
1. 在软件包设置页面上,单击 **Invite teams or people(邀请团队或人员)**,然后输入名称、用户名或您想要授予访问权限的人员的电子邮件地址。 不能授予团队访问个人帐户拥有的容器映像。 
1. 在用户名或团队名称旁边,使用“Role(角色)”下拉菜单选择所需的权限级别。 
@@ -40,6 +43,7 @@ shortTitle: 访问控制和可见性
如果您的软件包是私人或内部的并且由组织拥有,则您只能向其他组织成员或团队授予访问。
{% data reusables.package_registry.package-settings-from-org-level %}
+{% data reusables.package_registry.package-settings-option %}
1. 在软件包设置页面上,单击 **Invite teams or people(邀请团队或人员)**,然后输入名称、用户名或您想要授予访问权限的人员的电子邮件地址。 您还可以从组织输入团队名称,以允许所有团队成员访问。 
1. 在用户名或团队名称旁边,使用“Role(角色)”下拉菜单选择所需的权限级别。 
@@ -54,6 +58,7 @@ shortTitle: 访问控制和可见性
仓库一旦同步,您就无法访问包的精细访问设置。 要通过精细的包访问设置自定义包的权限,您必须先删除同步的仓库。
{% data reusables.package_registry.package-settings-from-org-level %}
+{% data reusables.package_registry.package-settings-option %}
2. 在“Repository source(仓库来源)”下,选择 **Inherit access from repository (recommended)(从仓库继承访问权限 [推荐])**。 
## 确保工作流程访问您的包
@@ -70,7 +75,7 @@ shortTitle: 访问控制和可见性
### 用户帐户拥有的容器映像的 {% data variables.product.prodname_actions %} 访问权限
-{% data reusables.package_registry.package-settings-from-user-level %}
+{% data reusables.package_registry.package-settings-option %}
1. 在左侧边栏中,单击 **Actions access(操作访问)**。 
2. 为确保工作流程有权访问容器包,您必须添加存储工作流程的仓库。 单击 **Add repository(添加仓库)**并搜索要添加的仓库。 
3. (使用“role(角色)”下拉菜单,选择您希望仓库访问您的容器映像所必须拥有的默认访问权限。 
@@ -80,12 +85,14 @@ shortTitle: 访问控制和可见性
### 组织拥有的容器映像的 {% data variables.product.prodname_actions %} 访问权限
{% data reusables.package_registry.package-settings-from-org-level %}
+{% data reusables.package_registry.package-settings-option %}
1. 在左侧边栏中,单击 **Actions access(操作访问)**。 
2. 单击 **Add repository(添加仓库)**并搜索要添加的仓库。 
3. 使用“role(角色)”下拉菜单,选择您希望仓库成员访问您的容器映像所必须拥有的默认访问权限。 外部协作者将不包括在内。 
要进一步自定义对容器映像的访问,请参阅“[配置对组织的容器映像的访问](#configuring-access-to-container-images-for-an-organization)”。
+{% ifversion fpt or ghec %}
## 确保 {% data variables.product.prodname_codespaces %} 访问您的软件包
默认情况下,代码空间可以无缝访问 {% data variables.product.prodname_dotcom %} 容器注册表中的某些包,例如在选中了 **Inherit access(继承访问)**选项的同一仓库中发布的包。 有关自动配置哪些访问权限的详细信息,请参阅“[访问存储在容器注册表 {% data variables.product.prodname_dotcom %} 中的映像](/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry#accessing-images-stored-in-github-container-registry)”。
@@ -114,13 +121,14 @@ shortTitle: 访问控制和可见性

+{% endif %}
## 为个人帐户配置容器映像的可见性
首次发布包时,默认可见性是私有的,只有您才能看到包。 您可以通过更改访问设置来修改私有或公共容器映像的访问权限。
公共包可以匿名访问,无需身份验证。 包一旦被设为公共,便无法再次将其设为私有。
-{% data reusables.package_registry.package-settings-from-user-level %}
+{% data reusables.package_registry.package-settings-option %}
5. 在“Danger Zone(危险区域)”下,选择可见性设置:
- 要使容器映像对任何人都可见,请单击“**Make public(设为公共)**”。
{% warning %}
@@ -149,6 +157,7 @@ shortTitle: 访问控制和可见性
公共包可以匿名访问,无需身份验证。 包一旦被设为公共,便无法再次将其设为私有。
{% data reusables.package_registry.package-settings-from-org-level %}
+{% data reusables.package_registry.package-settings-option %}
5. 在“Danger Zone(危险区域)”下,选择可见性设置:
- 要使容器映像对任何人都可见,请单击“**Make public(设为公共)**”。
{% warning %}
diff --git a/translations/zh-CN/content/packages/learn-github-packages/connecting-a-repository-to-a-package.md b/translations/zh-CN/content/packages/learn-github-packages/connecting-a-repository-to-a-package.md
index 07d3c66511..e160458dab 100644
--- a/translations/zh-CN/content/packages/learn-github-packages/connecting-a-repository-to-a-package.md
+++ b/translations/zh-CN/content/packages/learn-github-packages/connecting-a-repository-to-a-package.md
@@ -1,6 +1,6 @@
---
title: 将仓库连接到包
-intro: '您可以在 {% data variables.product.prodname_dotcom %} 上将仓库连接到容器映像。'
+intro: '您可以在 {% data variables.product.product_location %} 上将仓库连接到容器映像。'
product: '{% data reusables.gated-features.packages %}'
redirect_from:
- /packages/managing-container-images-with-github-container-registry/connecting-a-repository-to-a-container-image
@@ -8,6 +8,7 @@ redirect_from:
versions:
fpt: '*'
ghec: '*'
+ ghes: '*'
shortTitle: 连接仓库
---
@@ -25,16 +26,21 @@ shortTitle: 连接仓库
{% data reusables.package_registry.repository_connection_steps %}
+{% ifversion fpt or ghec or ghes > 3.4 %}
## 使用命令行将仓库连接到容器映像
-1. 在 Dockerfile 中添加此行,将 `OWNER` 和 `REPO` 替换为您的详细信息:
+{% ifversion ghes > 3.4 %}
+{% data reusables.package_registry.container-registry-ghes-beta %}
+{% endif %}
+
+1. 在 Dockerfile 中,添加以下行,将 {% ifversion ghes %}`HOSTNAME`、{% endif %}`OWNER` 和 `REPO` 替换为您的详细信息:
```shell
- LABEL org.opencontainers.image.source=https://github.com/OWNER/REPO
+ LABEL org.opencontainers.image.source=https://{% ifversion fpt or ghec %}github.com{% else %}HOSTNAME{% endif %}/OWNER/REPO
```
- 例如,如果您是用户 `monalisa` 并且拥有 `my-repo`,您会将此行添加到 Dockerfile:
+ 例如,如果您是用户 `monalisa` 并且拥有 `my-repo`,并且 {% data variables.product.product_location %} 主机名是 `github.companyname.com`,则可以将以下行添加到 Dockerfile 中:
```shell
- LABEL org.opencontainers.image.source=https://github.com/monalisa/my-repo
+ LABEL org.opencontainers.image.source=https://{% ifversion fpt or ghec %}github.com{% else %}{% data reusables.package_registry.container-registry-example-hostname %}{% endif %}/monalisa/my-repo
```
更多信息请参阅官方 Docker 文档中的“[LABEL](https://docs.docker.com/engine/reference/builder/#label)”,以及 `opencontainers/image-spec` 仓库中的“[预定义的标注键](https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys)”。
@@ -46,33 +52,34 @@ shortTitle: 连接仓库
3. (可选)查看您想要标记的 Docker 映像的详细信息。
```shell
$ docker images
- > REPOSITORY TAG IMAGE ID CREATED SIZE
- > ghcr.io/my-org/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
- > ghcr.io/my-username/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
- > hello-world latest fce289e99eb9 16 months ago 1.84kB
+ > REPOSITORY TAG IMAGE ID CREATED SIZE
+ > {% data reusables.package_registry.container-registry-example-hostname %}/my-org/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
+ > {% data reusables.package_registry.container-registry-example-hostname %}/my-username/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
+ > hello-world latest fce289e99eb9 16 months ago 1.84kB
```
4. 使用所需的映像名称和托管目标标记 Docker 映像。
```shell
- $ docker tag IMAGE_NAME ghcr.io/OWNER/NEW_IMAGE_NAME:TAG
+ $ docker tag IMAGE_NAME {% data reusables.package_registry.container-registry-hostname %}/OWNER/NEW_IMAGE_NAME:TAG
```
例如:
```shell
- $ docker tag 38f737a91f39 ghcr.io/monalisa/hello_docker:latest
+ $ docker tag 38f737a91f39 {% data reusables.package_registry.container-registry-example-hostname %}/monalisa/hello_docker:latest
```
5. 如果尚未向 {% data variables.product.prodname_container_registry %} 验证,请验证。 更多信息请参阅“[向 {% data variables.product.prodname_container_registry %} 验证](/packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images#authenticating-to-the-container-registry)”。
{% raw %}
```shell
- $ echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
+ $ echo $CR_PAT | docker login {% endraw %}{% data reusables.package_registry.container-registry-hostname %}{% raw %} -u USERNAME --password-stdin
> Login Succeeded
```
{% endraw %}
6. 推送容器映像到 {% data variables.product.prodname_container_registry %}。
```shell
- $ docker push ghcr.io/OWNER/IMAGE-NAME:TAG
+ $ docker push {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE-NAME:TAG
```
例如:
```shell
- $ docker push ghcr.io/monalisa/hello_docker:latest
+ $ docker push {% data reusables.package_registry.container-registry-example-hostname %}/monalisa/hello_docker:latest
```
+{% endif %}
diff --git a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md
index 0e0da902f3..3d00a34394 100644
--- a/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md
+++ b/translations/zh-CN/content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md
@@ -1,6 +1,6 @@
---
-title: 使用容器注册表
-intro: '您可以在使用包命名空间 `https://ghcr.io` 的 {% data variables.product.prodname_container_registry %} 中存储和管理 Docker 和 OCI 映像。'
+title: Working with the Container registry
+intro: 'You can store and manage Docker and OCI images in the {% data variables.product.prodname_container_registry %}, which uses the package namespace `https://{% data reusables.package_registry.container-registry-hostname %}`.'
product: '{% data reusables.gated-features.packages %}'
redirect_from:
- /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
@@ -15,107 +15,122 @@ redirect_from:
versions:
fpt: '*'
ghec: '*'
+ ghes: '>= 3.5'
shortTitle: Container registry
---
+{% ifversion ghes > 3.4 %}
+{% note %}
-## 关于 {% data variables.product.prodname_container_registry %} 支持
+**Note**: {% data variables.product.prodname_container_registry %} is currently in beta for {% data variables.product.product_name %} and subject to change.
-{% data variables.product.prodname_container_registry %} 目前支持以下容器映像格式:
+{% endnote %}
+{% endif %}
-* [Docker 映像清单 V2,架构 2](https://docs.docker.com/registry/spec/manifest-v2-2/)
-* [Open Container Initiative (OCI) 规格](https://github.com/opencontainers/image-spec)
+{% ifversion ghes > 3.4 %}
+## Prerequisites
-在安装或发布 Docker 映像时,{% data variables.product.prodname_container_registry %} 支持外部层,如 Windows 映像。
+To configure and use the {% data variables.product.prodname_container_registry %} on {% data variables.product.prodname_ghe_server %}, your site administrator must first enable {% data variables.product.prodname_registry %} **and** subdomain isolation. For more information, see "[Getting started with GitHub Packages for your enterprise](/admin/packages/getting-started-with-github-packages-for-your-enterprise)" and "[Enabling subdomain isolation](/admin/configuration/configuring-network-settings/enabling-subdomain-isolation)."
+{% endif %}
+## About {% data variables.product.prodname_container_registry %} support
-## 向 {% data variables.product.prodname_container_registry %} 验证
+The {% data variables.product.prodname_container_registry %} currently supports the following container image formats:
+
+* [Docker Image Manifest V2, Schema 2](https://docs.docker.com/registry/spec/manifest-v2-2/)
+* [Open Container Initiative (OCI) Specifications](https://github.com/opencontainers/image-spec)
+
+When installing or publishing a Docker image, the {% data variables.product.prodname_container_registry %} supports foreign layers, such as Windows images.
+
+## Authenticating to the {% data variables.product.prodname_container_registry %}
{% data reusables.package_registry.authenticate_with_pat_for_container_registry %}
+{% ifversion ghes %}Ensure that you replace `HOSTNAME` with {% data variables.product.product_location_enterprise %} hostname or IP address in the examples below.{% endif %}
+
{% data reusables.package_registry.authenticate-to-container-registry-steps %}
-## 推送容器映像
+## Pushing container images
-此示例推送最新版本的 `IMAGE-NAME`。
+This example pushes the latest version of `IMAGE-NAME`.
```shell
- $ docker push ghcr.io/OWNER/IMAGE_NAME:latest
+ $ docker push {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME:latest
```
-此示例推送 `2.5` 版的映像。
+This example pushes the `2.5` version of the image.
```shell
- $ docker push ghcr.io/OWNER/IMAGE-NAME:2.5
+ $ docker push {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE-NAME:2.5
```
-首次发布包时,默认可见性是私有的。 要更改可见性或设置访问权限,请参阅“[配置包的访问控制和可见性](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)”。
+When you first publish a package, the default visibility is private. To change the visibility or set access permissions, see "[Configuring a package's access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)."
-## 拉取容器映像
+## Pulling container images
-### 通过摘要拉取
+### Pull by digest
-为了确保始终使用相同的映像,您可以通过 `digest` SHA 值指定要拉取的准确容器映像版本。
+To ensure you're always using the same image, you can specify the exact container image version you want to pull by the `digest` SHA value.
-1. 要查找摘要 SHA 值,请使用 `docker inspect` 或 `docker pull`,并复制 `Digest:` 后的 SHA 值
+1. To find the digest SHA value, use `docker inspect` or `docker pull` and copy the SHA value after `Digest:`
```shell
- $ docker inspect ghcr.io/OWNER/IMAGE_NAME
+ $ docker inspect {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME
```
-2. 按需要在本地删除映像。
+2. Remove image locally as needed.
```shell
- $ docker rmi ghcr.io/OWNER/IMAGE_NAME:latest
+ $ docker rmi {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME:latest
```
-3. 拉取图像名称后有 `@YOUR_SHA_VALUE` 的容器映像。
+3. Pull the container image with `@YOUR_SHA_VALUE` after the image name.
```shell
- $ docker pull ghcr.io/OWNER/IMAGE_NAME@sha256:82jf9a84u29hiasldj289498uhois8498hjs29hkuhs
+ $ docker pull {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME@sha256:82jf9a84u29hiasldj289498uhois8498hjs29hkuhs
```
-### 按名称拉取
+### Pull by name
```shell
- $ docker pull ghcr.io/OWNER/IMAGE_NAME
+ $ docker pull {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME
```
-### 按名称和版本拉取
+### Pull by name and version
-显示按名称和 `1.14.1` 版本标记拉取映像的 Docker CLI 示例:
+Docker CLI example showing an image pulled by its name and the `1.14.1` version tag:
```shell
- $ docker pull ghcr.io/OWNER/IMAGE_NAME:1.14.1
+ $ docker pull {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME:1.14.1
> 5e35bd43cf78: Pull complete
> 0c48c2209aab: Pull complete
> fd45dd1aad5a: Pull complete
> db6eb50c2d36: Pull complete
> Digest: sha256:ae3b135f133155b3824d8b1f62959ff8a72e9cf9e884d88db7895d8544010d8e
- > Status: Downloaded newer image for ghcr.io/orgname/image-name/release:1.14.1
- > ghcr.io/orgname/image-name/release:1.14.1
+ > Status: Downloaded newer image for {% data reusables.package_registry.container-registry-hostname %}/orgname/image-name/release:1.14.1
+ > {% data reusables.package_registry.container-registry-hostname %}/orgname/image-name/release:1.14.1
```
-### 按名称和最新版本拉取
+### Pull by name and latest version
```shell
- $ docker pull ghcr.io/OWNER/IMAGE_NAME:latest
+ $ docker pull {% data reusables.package_registry.container-registry-hostname %}/OWNER/IMAGE_NAME:latest
> latest: Pulling from user/image-name
> Digest: sha256:b3d3e366b55f9a54599220198b3db5da8f53592acbbb7dc7e4e9878762fc5344
- > Status: Downloaded newer image for ghcr.io/user/image-name:latest
- > ghcr.io/user/image-name:latest
+ > Status: Downloaded newer image for {% data reusables.package_registry.container-registry-hostname %}/user/image-name:latest
+ > {% data reusables.package_registry.container-registry-hostname %}/user/image-name:latest
```
-## 构建容器映像
+## Building container images
-此示例构建 `hello_docker` 映像:
+This example builds the `hello_docker` image:
```shell
$ docker build -t hello_docker .
```
-## 标记容器映像
+## Tagging container images
-1. 找到要标记的 Docker 映像的 ID。
+1. Find the ID for the Docker image you want to tag.
```shell
$ docker images
> REPOSITORY TAG IMAGE ID CREATED SIZE
- > ghcr.io/my-org/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
- > ghcr.io/my-username/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
+ > {% data reusables.package_registry.container-registry-hostname %}/my-org/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
+ > {% data reusables.package_registry.container-registry-hostname %}/my-username/hello_docker latest 38f737a91f39 47 hours ago 91.7MB
> hello-world latest fce289e99eb9 16 months ago 1.84kB
```
-2. 使用映像 ID 以及所需的映像名称和托管目标标记 Docker 映像。
+2. Tag your Docker image using the image ID and your desired image name and hosting destination.
```shell
- $ docker tag 38f737a91f39 ghcr.io/OWNER/NEW_IMAGE_NAME:latest
+ $ docker tag 38f737a91f39 {% data reusables.package_registry.container-registry-hostname %}/OWNER/NEW_IMAGE_NAME:latest
```
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 542edfc930..f5b9453f58 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
@@ -81,6 +81,16 @@ If you want to keep the source files for your site in a different location, you
If you choose the `/docs` folder of any branch as your publishing source, {% data variables.product.prodname_pages %} will read everything to publish your site{% ifversion fpt or ghec %}, including the _CNAME_ file,{% endif %} from the `/docs` folder.{% ifversion fpt or ghec %} For example, when you edit your custom domain through the {% data variables.product.prodname_pages %} settings, the custom domain will write to `/docs/CNAME`. For more information about _CNAME_ files, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}
+{% ifversion ghec %}
+## Limitations for {% data variables.product.prodname_emus %}
+If you're a {% data variables.product.prodname_managed_user %}, your use of {% data variables.product.prodname_pages %} is limited.
+
+ - {% data variables.product.prodname_pages %} sites can only be published from repositories owned by organizations.
+ - {% data variables.product.prodname_pages %} sites are only visible to other members of the enterprise.
+
+For more information about {% data variables.product.prodname_emus %}, see "[About {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-and-saml-for-iam/about-enterprise-managed-users)."
+{% endif %}
+
## Static site generators
{% data variables.product.prodname_pages %} publishes any static files that you push to your repository. You can create your own static files or use a static site generator to build your site for you. You can also customize your own build process locally or on another server. We recommend Jekyll, a static site generator with built-in support for {% data variables.product.prodname_pages %} and a simplified build process. For more information, see "[About {% data variables.product.prodname_pages %} and Jekyll](/articles/about-github-pages-and-jekyll)."
diff --git a/translations/zh-CN/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md b/translations/zh-CN/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md
index 3f2da1e3d3..b5e4f2c00e 100644
--- a/translations/zh-CN/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md
+++ b/translations/zh-CN/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md
@@ -15,7 +15,7 @@ shortTitle: 更改站点可见性
{% data reusables.pages.privately-publish-ghec-only %}
-如果您的企业使用 {% data variables.product.prodname_emus %},则所有 {% data variables.product.prodname_pages %} 站点都是私密发布的。 有关 {% data variables.product.prodname_emus %} 的更多信息,请参阅“[关于 {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)”。
+If your enterprise uses {% data variables.product.prodname_emus %}, access control is not available, and all {% data variables.product.prodname_pages %} sites are only accessible to other enterprise members. 有关 {% data variables.product.prodname_emus %} 的更多信息,请参阅“[关于 {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#limitations-for-enterprise-managed-users)”。
如果您的组织使用 {% data variables.product.prodname_ghe_cloud %} 而没有 {% data variables.product.prodname_emus %},您可以选择在互联网上私下或公开地向任何人发布您的站点。 从组织拥有的私人或内部仓库发布的项目站点可使用访问控制。 您无法管理组织站点的访问控制。 有关 {% data variables.product.prodname_pages %} 站点类型的更多信息,请参阅“[关于 {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites)”。
diff --git a/translations/zh-CN/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md b/translations/zh-CN/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md
index 2c62517d5b..c9fb789c60 100644
--- a/translations/zh-CN/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md
+++ b/translations/zh-CN/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md
@@ -27,6 +27,7 @@ shortTitle: 创建 GitHub Pages 站点
{% data reusables.repositories.create_new %}
{% data reusables.repositories.owner-drop-down %}
+{% indented_data_reference reusables.pages.emu-org-only spaces=3 %}
{% data reusables.pages.create-repo-name %}
{% data reusables.repositories.choose-repo-visibility %}
{% data reusables.repositories.initialize-with-readme %}
diff --git a/translations/zh-CN/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md b/translations/zh-CN/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md
index 09d38f23e2..24247e58c2 100644
--- a/translations/zh-CN/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md
+++ b/translations/zh-CN/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md
@@ -32,6 +32,7 @@ shortTitle: 使用 Jekyll 创建站点
{% data reusables.repositories.create_new %}
{% data reusables.repositories.owner-drop-down %}
+{% indented_data_reference reusables.pages.emu-org-only spaces=3 %}
{% data reusables.pages.create-repo-name %}
{% data reusables.repositories.choose-repo-visibility %}
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
index 7e74166293..7108cb73f1 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md
@@ -162,9 +162,13 @@ remote: error: Changes have been requested.
如果您的仓库为使用 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %} 的组织所拥有,您可以启用分支限制。
{% endif %}
-启用分支限制时,只有已授予权限的用户、团队或应用程序才能推送到受保护的分支。 您可以在受保护分支的设置中查看和编辑对受保护分支具有推送权限的用户、团队或应用程序。 当需要状态检查时,如果所需的检查失败,仍会阻止有权推送到受保护分支的人员、团队和应用合并。 当需要拉取请求时,有权推送到受保护分支的人员、团队和应用仍需要创建拉取请求。
+启用分支限制时,只有已授予权限的用户、团队或应用程序才能推送到受保护的分支。 您可以在受保护分支的设置中查看和编辑对受保护分支具有推送权限的用户、团队或应用程序。 When status checks are required, the people, teams, and apps that have permission to push to a protected branch will still be prevented from merging into the branch when the required checks fail. 当需要拉取请求时,有权推送到受保护分支的人员、团队和应用仍需要创建拉取请求。
-您只能向对仓库具有 write 权限的用户、团队或已安装的 {% data variables.product.prodname_github_apps %} 授予推送到受保护分支的权限。 对仓库具有管理员权限的人员和应用程序始终能够推送到受保护分支。
+{% if restrict-pushes-create-branch %}
+Optionally, you can apply the same restrictions to the creation of branches that match the rule. For example, if you create a rule that only allows a certain team to push to any branches that contain the word `release`, only members of that team would be able to create a new branch that contains the word `release`.
+{% endif %}
+
+You can only give push access to a protected branch, or give permission to create a matching branch, to users, teams, or installed {% data variables.product.prodname_github_apps %} with write access to a repository. People and apps with admin permissions to a repository are always able to push to a protected branch or create a matching branch.
### 允许强制推送
diff --git a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
index 8ef5bf1a30..88ca6b8ea5 100644
--- a/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
+++ b/translations/zh-CN/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md
@@ -79,7 +79,7 @@ shortTitle: 分支保护规则
1. (可选)要使用合并队列合并拉取请求,请选择 **Require merge queue(需要合并队列)**。 {% data reusables.pull_requests.merge-queue-references %} 
{% tip %}
- **提示:** 拉取请求合并队列功能目前处于有限公测阶段,可能会发生更改。 Organizations owners can request early access to the beta by joining the [waitlist](https://github.com/features/merge-queue/signup).
+ **提示:** 拉取请求合并队列功能目前处于有限公测阶段,可能会发生更改。 组织所有者可以通过加入[等待列表](https://github.com/features/merge-queue/signup)来请求提前访问测试版。
{% endtip %}
{%- endif %}
@@ -88,8 +88,9 @@ shortTitle: 分支保护规则
{%- endif %}
1. (可选)选择 **Apply the rules above to administrators(将上述规则应用于管理员)**。 
1. (可选){% ifversion fpt or ghec %}如果仓库由组织拥有,可使用 {% data variables.product.prodname_team %} 或 {% data variables.product.prodname_ghe_cloud %}{% endif %} 启用分支限制。
- - 选择 **Restrict who can push to matching branches(限制谁可以推送到匹配分支)**。 
- - 搜索并选择有权限推送到受保护分支的人员、团队或应用程序。 
+ - 选择 **Restrict who can push to matching branches(限制谁可以推送到匹配分支)**。 {% if restrict-pushes-create-branch %}
+ - Optionally, to also restrict the creation of matching branches, select **Restrict pushes that create matching branches**. {% endif %}
+ - Search for and select the people, teams, or apps who will have permission to push to the protected branch or create a matching branch. ![Branch restriction search]{% if restrict-pushes-create-branch %}(/assets/images/help/repository/restrict-branch-search-with-create.png){% else %}(/assets/images/help/repository/restrict-branch-search.png){% endif %}
1. (可选)在“Rules applied to everyone including administrators(适用于包括管理员在内的所有人规则)”下,选择 **Allow force pushes(允许强制推送)**。 
{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5624 %}
然后,选择谁可以强制推送到分支。
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/deleting-a-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/deleting-a-repository.md
index a9a8ee72ba..e13d101145 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/deleting-a-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/deleting-a-repository.md
@@ -29,7 +29,7 @@ topics:
{% endwarning %}
-某些已删除的存储库可以在删除后的 90 天内恢复。 {% ifversion ghes or ghae %}站点管理员或能为您恢复已删除的存储库。 更多信息请参阅“[恢复删除的仓库](/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository)”。 {% else %}更多信息请参阅“[恢复删除的仓库](/articles/restoring-a-deleted-repository)”。{% endif %}
+某些已删除的存储库可以在删除后的 {% ifversion fpt or ghec or ghes > 3.4 %}30{% else %}90{% endif%} 天内恢复。 {% ifversion ghes or ghae %}站点管理员或能为您恢复已删除的存储库。 更多信息请参阅“[恢复删除的仓库](/admin/user-management/managing-repositories-in-your-enterprise/restoring-a-deleted-repository)”。 {% else %}更多信息请参阅“[恢复删除的仓库](/articles/restoring-a-deleted-repository)”。{% endif %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
diff --git a/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md b/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
index 8d9c488e07..e127c77b7c 100644
--- a/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
+++ b/translations/zh-CN/content/repositories/creating-and-managing-repositories/restoring-a-deleted-repository.md
@@ -20,7 +20,7 @@ shortTitle: 恢复已删除的仓库
## 关于仓库恢复
-删除的仓库可在 90 天内恢复,除非仓库是目前非空白的复刻网络的一部分。 复刻网络由父仓库、仓库的复刻以及该仓库复刻的复刻组成。 如果仓库是复刻网络的一部分,则在网络中的每个其他仓库被删除或者从网络中脱离之前,无法恢复它。 有关复刻的更多信息,请参阅“[关于复刻](/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)”。
+已删除的存储库可以在 {% ifversion fpt or ghec or ghes > 3.4 %}30{% else %}90{% endif %} 天内恢复,除非该存储库是当前不为空的复刻网络的一部分。 复刻网络由父仓库、仓库的复刻以及该仓库复刻的复刻组成。 如果仓库是复刻网络的一部分,则在网络中的每个其他仓库被删除或者从网络中脱离之前,无法恢复它。 有关复刻的更多信息,请参阅“[关于复刻](/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)”。
如果要恢复属于当前非空白的复刻网络一部分的仓库,可以联系 {% data variables.contact.contact_support %}。
diff --git a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
index 2948a403ea..b7d0a0a1d8 100644
--- a/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
+++ b/translations/zh-CN/content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md
@@ -156,3 +156,20 @@ miniTocMaxHeadingLevel: 3
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.settings-sidebar-actions-general %}
{% data reusables.actions.change-retention-period-for-artifacts-logs %}
+
+{% if actions-cache-policy-apis %}
+
+## 为存储库配置缓存存储
+
+{% data reusables.actions.cache-default-size %} 但是,如果企业所有者更改了这些默认大小,则这些默认大小可能会有所不同。 {% data reusables.actions.cache-eviction-process %}
+
+可以将存储库的总缓存存储大小设置为企业策略设置允许的最大大小。
+
+{% data variables.product.prodname_actions %} 缓存存储的存储库设置目前只能使用 REST API 进行修改:
+
+* 要查看存储库的当前缓存存储限制,请参阅“[获取存储库的 GitHub 操作缓存使用策略](/rest/actions/cache#get-github-actions-cache-usage-policy-for-a-repository)”。
+* 要更改存储库的缓存存储限制,请参阅“[设置存储库的 GitHub 操作缓存使用策略](/rest/actions/cache#set-github-actions-cache-usage-policy-for-a-repository)”。
+
+{% data reusables.actions.cache-no-org-policy %}
+
+{% 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
index 98aae6e36b..2777b78e77 100644
--- 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
@@ -5,9 +5,9 @@ intro: 您可以为存储库配置标记保护规则,以防止参与者创建
product: '{% data reusables.gated-features.tag-protection-rules %}'
versions:
fpt: '*'
- ghes: '>3.4'
ghae: issue-6337
ghec: '*'
+ ghes: '>3.4'
---
{% note %}
@@ -18,7 +18,8 @@ versions:
添加标记保护规则时,与提供的模式匹配的所有标记都将受到保护。 只有具有存储库中管理员或维护权限的用户才能创建受保护的标记,并且只有具有存储库管理员权限的用户才能删除受保护的标记。 更多信息请参阅“[组织的仓库角色](/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role)”。 {% data variables.product.prodname_github_apps %} 需要`存储库管理:写入`权限才能修改受保护的标记。
-此外,您还可以创建自定义存储库角色,以允许其他用户组创建或删除与标记保护规则匹配的标记。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。
+{% if custom-repository-roles %}
+此外,您还可以创建自定义存储库角色,以允许其他用户组创建或删除与标记保护规则匹配的标记。 更多信息请参阅“[管理组织的自定义仓库角色](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization)”。{% endif %}
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
diff --git a/translations/zh-CN/content/rest/actions/artifacts.md b/translations/zh-CN/content/rest/actions/artifacts.md
index 1eef8c22c6..ef8c9c7df1 100644
--- a/translations/zh-CN/content/rest/actions/artifacts.md
+++ b/translations/zh-CN/content/rest/actions/artifacts.md
@@ -1,8 +1,8 @@
---
-title: GitHub Actions Artifacts
+title: GitHub Actions 构件
allowTitleToDifferFromFilename: true
shortTitle: 构件
-intro: 'The {% data variables.product.prodname_actions %} Artifacts API allows you to download, delete, and retrieve information about workflow artifacts.'
+intro: '{% data variables.product.prodname_actions %} 构件 API 允许您下载、删除和检索有关工作流程构件的信息。'
topics:
- API
versions:
@@ -12,8 +12,8 @@ versions:
ghec: '*'
---
-## About the Artifacts API
+## 关于构件 API
-The {% data variables.product.prodname_actions %} Artifacts API allows you to download, delete, and retrieve information about workflow artifacts. {% data reusables.actions.about-artifacts %}更多信息请参阅“[使用构件持久化工作流程](/actions/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
+{% data variables.product.prodname_actions %} 构件 API 允许您下载、删除和检索有关工作流程构件的信息。 {% data reusables.actions.about-artifacts %}更多信息请参阅“[使用构件持久化工作流程](/actions/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)”。
{% data reusables.actions.actions-authentication %} {% data reusables.actions.actions-app-actions-permissions-api %}
diff --git a/translations/zh-CN/content/rest/actions/cache.md b/translations/zh-CN/content/rest/actions/cache.md
index 359b5a818b..803bd5e100 100644
--- a/translations/zh-CN/content/rest/actions/cache.md
+++ b/translations/zh-CN/content/rest/actions/cache.md
@@ -1,15 +1,16 @@
---
-title: GitHub Actions Cache
+title: GitHub Actions 缓存
allowTitleToDifferFromFilename: true
shortTitle: 缓存
-intro: 'The {% data variables.product.prodname_actions %} Cache API allows you to query and manage the {% data variables.product.prodname_actions %} cache for repositories.'
+intro: '{% data variables.product.prodname_actions %} 缓存 API 允许您查询和管理存储库的 {% data variables.product.prodname_actions %} 缓存。'
topics:
- API
versions:
fpt: '*'
ghec: '*'
+ ghes: '>3.4'
---
-## About the Cache API
+## 关于缓存 API
-The {% data variables.product.prodname_actions %} Cache API allows you to query and manage the {% data variables.product.prodname_actions %} cache for repositories. 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy)”。
+{% data variables.product.prodname_actions %} 缓存 API 允许您查询和管理存储库的 {% data variables.product.prodname_actions %} 缓存。 更多信息请参阅“[缓存依赖项以加快工作流程](/actions/advanced-guides/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy)”。
diff --git a/translations/zh-CN/content/rest/actions/permissions.md b/translations/zh-CN/content/rest/actions/permissions.md
index dde543c8d5..d26a461547 100644
--- a/translations/zh-CN/content/rest/actions/permissions.md
+++ b/translations/zh-CN/content/rest/actions/permissions.md
@@ -1,8 +1,8 @@
---
-title: GitHub Actions Permissions
+title: GitHub Actions 权限
allowTitleToDifferFromFilename: true
shortTitle: 权限
-intro: 'The {% data variables.product.prodname_actions %} Permissions API allows you to set permissions for what enterprises, organizations, and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions{% if actions-workflow-policy %} and reusable workflows{% endif %} are allowed to run.'
+intro: '{% data variables.product.prodname_actions %} 权限 API 可让您设置权限,允许哪些企业、组织和存储库运行 {% data variables.product.prodname_actions %},以及允许哪些操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}运行。'
topics:
- API
versions:
@@ -12,6 +12,6 @@ versions:
ghec: '*'
---
-## About the Permissions API
+## 关于权限 API
-The {% data variables.product.prodname_actions %} Permissions API allows you to set permissions for what enterprises, organizations, and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions{% if actions-workflow-policy %} and reusable workflows{% endif %} are allowed to run.{% ifversion fpt or ghec or ghes %} For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)."{% endif %}
+{% data variables.product.prodname_actions %} 权限 API 可让您设置权限,允许哪些企业、组织和存储库运行 {% data variables.product.prodname_actions %},以及允许哪些操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}运行。{% ifversion fpt or ghec or ghes %} 更多信息请参阅“[使用限制、计费和管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)”。{% endif %}
diff --git a/translations/zh-CN/content/rest/actions/secrets.md b/translations/zh-CN/content/rest/actions/secrets.md
index 80b2ffe09b..4cbcf99c30 100644
--- a/translations/zh-CN/content/rest/actions/secrets.md
+++ b/translations/zh-CN/content/rest/actions/secrets.md
@@ -1,8 +1,8 @@
---
-title: GitHub Actions Secrets
+title: GitHub Actions 机密
allowTitleToDifferFromFilename: true
shortTitle: 密码
-intro: 'The {% data variables.product.prodname_actions %} Secrets API lets you create, update, delete, and retrieve information about encrypted secrets that can be used in {% data variables.product.prodname_actions %} workflows.'
+intro: '{% data variables.product.prodname_actions %} 密钥 API 允许您创建、更新、删除和检索有关可在 {% data variables.product.prodname_actions %} 工作流程中使用的加密机密的信息。'
topics:
- API
versions:
@@ -12,8 +12,8 @@ versions:
ghec: '*'
---
-## About the Secrets API
+## 关于机密 API
-The {% data variables.product.prodname_actions %} Secrets API lets you create, update, delete, and retrieve information about encrypted secrets that can be used in {% data variables.product.prodname_actions %} workflows. {% data reusables.actions.about-secrets %}更多信息请参阅“[创建和使用加密密码](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)”。
+{% data variables.product.prodname_actions %} 密钥 API 允许您创建、更新、删除和检索有关可在 {% data variables.product.prodname_actions %} 工作流程中使用的加密机密的信息。 {% data reusables.actions.about-secrets %}更多信息请参阅“[创建和使用加密密码](/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)”。
{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须具有`密码`权限才可使用此 API。 经过身份验证的用户必须对仓库具有协作者权限才可创建、更新或读取密码。
diff --git a/translations/zh-CN/content/rest/actions/self-hosted-runner-groups.md b/translations/zh-CN/content/rest/actions/self-hosted-runner-groups.md
index 6de07c6412..836a3f75d2 100644
--- a/translations/zh-CN/content/rest/actions/self-hosted-runner-groups.md
+++ b/translations/zh-CN/content/rest/actions/self-hosted-runner-groups.md
@@ -11,8 +11,8 @@ versions:
---
-## About the Self-hosted runner groups API
+## 关于自托管运行器组 API
-The Self-hosted runners groups API allows you manage groups of self-hosted runners. 更多信息请参阅“[使用组管理对自托管运行器的访问](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)”。
+自托管运行器组 API 允许您管理自托管运行器组。 更多信息请参阅“[使用组管理对自托管运行器的访问](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)”。
{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限,或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须具有对存储库或组织的管理员访问权限或者企业的 `manage_runners:enterprise` 作用域才能使用此 API。
diff --git a/translations/zh-CN/content/rest/actions/self-hosted-runners.md b/translations/zh-CN/content/rest/actions/self-hosted-runners.md
index 152675f789..27db53ed82 100644
--- a/translations/zh-CN/content/rest/actions/self-hosted-runners.md
+++ b/translations/zh-CN/content/rest/actions/self-hosted-runners.md
@@ -1,6 +1,6 @@
---
title: 自托管运行器
-intro: 'The Self-hosted runners API allows you to register, view, and delete self-hosted runners.'
+intro: 自托管运行器 API 允许您注册、查看和删除自托管的运行器。
topics:
- API
versions:
@@ -11,8 +11,8 @@ versions:
---
-## About the Self-hosted runners API
+## 关于自托管运行器 API
-The Self-hosted runners API allows you to register, view, and delete self-hosted runners. {% data reusables.actions.about-self-hosted-runners %} 更多信息请参阅“[托管您自己的运行器](/actions/hosting-your-own-runners)”。
+自托管运行器 API 允许您注册、查看和删除自托管的运行器。 {% data reusables.actions.about-self-hosted-runners %} 更多信息请参阅“[托管您自己的运行器](/actions/hosting-your-own-runners)”。
{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须对仓库具有`管理`权限,或者对组织具有 `organization_self_hosted_runners` 权限。 经过身份验证的用户必须具有对存储库或组织的管理员访问权限或者企业的 `manage_runners:enterprise` 作用域才能使用此 API。
diff --git a/translations/zh-CN/content/rest/actions/workflow-jobs.md b/translations/zh-CN/content/rest/actions/workflow-jobs.md
index fb3793e430..e81793dba5 100644
--- a/translations/zh-CN/content/rest/actions/workflow-jobs.md
+++ b/translations/zh-CN/content/rest/actions/workflow-jobs.md
@@ -10,8 +10,8 @@ versions:
ghec: '*'
---
-## About the Workflow jobs API
+## 关于工作流程作业 API
-The Workflow jobs API allows you to view logs and workflow jobs. {% data reusables.actions.about-workflow-jobs %} 更多信息请参阅“[GitHub Actions 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions)”。
+工作流程作业 API 允许您查看日志和工作流程作业。 {% data reusables.actions.about-workflow-jobs %} 更多信息请参阅“[GitHub Actions 的工作流程语法](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions)”。
{% data reusables.actions.actions-authentication %} {% data reusables.actions.actions-app-actions-permissions-api %}
diff --git a/translations/zh-CN/content/rest/actions/workflow-runs.md b/translations/zh-CN/content/rest/actions/workflow-runs.md
index f3779d7048..7f3f5e53c2 100644
--- a/translations/zh-CN/content/rest/actions/workflow-runs.md
+++ b/translations/zh-CN/content/rest/actions/workflow-runs.md
@@ -1,6 +1,6 @@
---
title: 工作流程运行
-intro: 'The Workflow runs API allows you to view, re-run, cancel, and view logs for workflow runs.'
+intro: 工作流程运行 API 允许您查看、重新运行、取消和查看工作流程运行的日志。
topics:
- API
versions:
@@ -10,8 +10,8 @@ versions:
ghec: '*'
---
-## About the Workflow runs API
+## 关于工作流程运行 API
-The Workflow runs API allows you to view, re-run, cancel, and view logs for workflow runs. {% data reusables.actions.about-workflow-runs %} 更多信息请参阅“[管理工作流程运行](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)”。
+工作流程运行 API 允许您查看、重新运行、取消和查看工作流程运行的日志。 {% data reusables.actions.about-workflow-runs %} 更多信息请参阅“[管理工作流程运行](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run)”。
{% data reusables.actions.actions-authentication %} {% data reusables.actions.actions-app-actions-permissions-api %}
diff --git a/translations/zh-CN/content/rest/actions/workflows.md b/translations/zh-CN/content/rest/actions/workflows.md
index b99c7a9dbd..2c23e8d634 100644
--- a/translations/zh-CN/content/rest/actions/workflows.md
+++ b/translations/zh-CN/content/rest/actions/workflows.md
@@ -10,7 +10,7 @@ versions:
ghec: '*'
---
-## About the Workflows API
+## 关于工作流程作业 API
工作流程 API 允许您查看仓库的工作流程。 {% data reusables.actions.about-workflows %} 更多信息请参阅“[使用 GitHub Actions 自动化工作流程](/actions/automating-your-workflow-with-github-actions)”。
diff --git a/translations/zh-CN/content/rest/activity/feeds.md b/translations/zh-CN/content/rest/activity/feeds.md
index b5def8924f..f70e9b116f 100644
--- a/translations/zh-CN/content/rest/activity/feeds.md
+++ b/translations/zh-CN/content/rest/activity/feeds.md
@@ -11,9 +11,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Feeds API
+## 关于馈送 API
-To see what feeds are available to you, use the [Get feeds](#get-feeds) operation. You can then get a feed by sending a request to one of the feed URLs.
+要查看哪些源可供您使用,请使用[获取馈送](#get-feeds)操作。 然后,您可以通过向其中一个馈送 URL 发送请求来获取馈送。
### 获取 Atom 馈送的示例
diff --git a/translations/zh-CN/content/rest/activity/notifications.md b/translations/zh-CN/content/rest/activity/notifications.md
index 562228f287..943281e267 100644
--- a/translations/zh-CN/content/rest/activity/notifications.md
+++ b/translations/zh-CN/content/rest/activity/notifications.md
@@ -1,6 +1,6 @@
---
title: 通知
-intro: 'The Notifications API lets you manage {% data variables.product.product_name %} notifications.'
+intro: '通知 API 允许您管理 {% data variables.product.product_name %} 通知。'
versions:
fpt: '*'
ghes: '*'
@@ -11,9 +11,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Notifications API
+## 关于通知 API
-The Notifications API lets you manage {% data variables.product.product_name %} notifications. For more information about notifications, see "[About notifications](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications)."
+通知 API 允许您管理 {% data variables.product.product_name %} 通知。 有关通知的详细信息,请参阅“[关于通知](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications)”。
所有通知 API 调用都需要 `notifications` 或 `repo` API 作用域。 这将赋予对某些议题和提交内容的只读权限。 您仍需要 `repo` 作用域才能从相应的端点访问议题和提交。
@@ -35,11 +35,11 @@ $ -H "If-Modified-Since: Thu, 25 Oct 2012 15:16:27 GMT"
> X-Poll-Interval: 60
```
-### About notification reasons
+### 关于通知原因
从通知 API 检索响应时,每个有效负载都有一个名为 `reason` 的键。 这些键对应于触发通知的事件。
-These are the potential `reason`s for receiving a notification:
+以下是收到通知的潜在`原因`:
| 原因名称 | 描述 |
| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
diff --git a/translations/zh-CN/content/rest/activity/starring.md b/translations/zh-CN/content/rest/activity/starring.md
index 7aff50956b..3edecfca0d 100644
--- a/translations/zh-CN/content/rest/activity/starring.md
+++ b/translations/zh-CN/content/rest/activity/starring.md
@@ -1,6 +1,6 @@
---
title: 标星
-intro: The Starring API lets you bookmark a repository.
+intro: 通过星标 API,您可以为存储库添加书签。
versions:
fpt: '*'
ghes: '*'
@@ -11,9 +11,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Starring API
+## 关于星标 API
-The Starring API lets you bookmark a repository. 显示在仓库旁边的星标表示大致的兴趣程度。 星标对通知或活动馈送没有影响。 更多信息请参阅“[使用星标保存仓库](/get-started/exploring-projects-on-github/saving-repositories-with-stars)”。
+通过星标 API,您可以为存储库添加书签。 显示在仓库旁边的星标表示大致的兴趣程度。 星标对通知或活动馈送没有影响。 更多信息请参阅“[使用星标保存仓库](/get-started/exploring-projects-on-github/saving-repositories-with-stars)”。
### 标星与 关注
diff --git a/translations/zh-CN/content/rest/activity/watching.md b/translations/zh-CN/content/rest/activity/watching.md
index 09416c06d8..5454d832f6 100644
--- a/translations/zh-CN/content/rest/activity/watching.md
+++ b/translations/zh-CN/content/rest/activity/watching.md
@@ -1,6 +1,6 @@
---
title: 关注
-intro: The Watching API lets users subscribe to notifications for activity in a repository.
+intro: 关注 API 允许用户订阅存储库中活动的通知。
versions:
fpt: '*'
ghes: '*'
@@ -11,6 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Watching API
+## 关于关注 API
-The Watching API lets users subscribe to notifications for activity in a repository. To bookmark a repository instead, see "[Starring](/rest/reference/activity#starring)."
+关注 API 允许用户订阅存储库中活动的通知。 要改为将存储库添加为书签,请参阅“[星标](/rest/reference/activity#starring)”。
diff --git a/translations/zh-CN/content/rest/apps/apps.md b/translations/zh-CN/content/rest/apps/apps.md
index 1bc25adbd6..1cfe4d5d37 100644
--- a/translations/zh-CN/content/rest/apps/apps.md
+++ b/translations/zh-CN/content/rest/apps/apps.md
@@ -1,6 +1,7 @@
---
-title: 应用
-intro: GitHub Apps API 使您能够检索有关安装的信息以及有关 GitHub 应用程序的特定信息。
+title: GitHub 应用程序
+allowTitleToDifferFromFilename: true
+intro: '{% data variables.product.prodname_github_apps %} API 使您能够检索有关 {% data variables.product.prodname_github_apps %} 的信息。'
topics:
- API
miniTocMaxHeadingLevel: 3
@@ -11,12 +12,14 @@ versions:
ghec: '*'
---
+## 关于 {% data variables.product.prodname_github_apps %} API
+
{% data reusables.apps.general-apps-restrictions %}
本页列出了验证为 GitHub 应用程序后可访问的端点。 更多信息请参阅“[验证为 GitHub 应用程序](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-a-github-app)”。
验证为 GitHub 应用程序后,GitHub 应用程序 API 使您能够获取有关 GitHub 应用程序的高层次信息以及有关应用程序安装的特定信息。
-验证为 GitHub 应用程序后,您可以访问 REST API v3 端点。 这些端点带有“备注”部分,即“与 GitHub 应用程序结合使用”。 验证为用户后也可以访问这些端点。
+验证为 GitHub 应用程序后,您可以访问 REST API v3 端点。 这些端点包含显示为 “使用 GitHub App”的文字。 验证为用户后也可以访问这些端点。
某些 REST API v3 端点需要验证为 GitHub 应用程序安装设施。 有关这些端点的列表,请参阅[安装设施](/rest/reference/apps#installations)。
diff --git a/translations/zh-CN/content/rest/apps/installations.md b/translations/zh-CN/content/rest/apps/installations.md
index 9330eac667..a95d0eb5dd 100644
--- a/translations/zh-CN/content/rest/apps/installations.md
+++ b/translations/zh-CN/content/rest/apps/installations.md
@@ -1,6 +1,8 @@
---
-title: 安装设施
-intro: 安装设施 API 使您能够获取有关 GitHub 应用程序安装设施的信息并在这些安装设施中执行操作。
+title: GitHub 应用程序安装
+allowTitleToDifferFromFilename: true
+shortTitle: 安装设施
+intro: '通过 {% data variables.product.prodname_github_app %} 安装 API,您可以获取有关 {% data variables.product.prodname_github_app %} 安装的信息,并在这些安装中执行操作。'
topics:
- API
miniTocMaxHeadingLevel: 3
@@ -11,6 +13,8 @@ versions:
ghec: '*'
---
+## 关于 {% data variables.product.prodname_github_app %} 安装 API
+
_安装设施_是指已安装该应用程序的任何用户或组织帐户。 有关如何验证为安装设施和限制访问特定仓库的信息,请参阅“[验证为安装设施](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-an-installation)”。
要列出组织的所有 GitHub 应用程序安装设施,请参阅“[列出组织的应用程序安装设施](/rest/reference/orgs#list-app-installations-for-an-organization)”。
diff --git a/translations/zh-CN/content/rest/apps/marketplace.md b/translations/zh-CN/content/rest/apps/marketplace.md
index d49e3bed46..da34e0cda0 100644
--- a/translations/zh-CN/content/rest/apps/marketplace.md
+++ b/translations/zh-CN/content/rest/apps/marketplace.md
@@ -1,5 +1,7 @@
---
-title: Marketplace
+title: GitHub Marketplace
+allowTitleToDifferFromFilename: true
+shortTitle: Marketplace
intro: ''
topics:
- API
@@ -9,6 +11,8 @@ versions:
ghec: '*'
---
+## About the {% data variables.product.prodname_marketplace %} API
+
For more information about {% data variables.product.prodname_marketplace %}, see "[GitHub Marketplace](/marketplace/)."
The {% data variables.product.prodname_marketplace %} API allows you to see which customers are using a pricing plan, see a customer's purchases, and see if an account has an active subscription.
diff --git a/translations/zh-CN/content/rest/apps/oauth-applications.md b/translations/zh-CN/content/rest/apps/oauth-applications.md
index b940e2398b..e2076e8b0a 100644
--- a/translations/zh-CN/content/rest/apps/oauth-applications.md
+++ b/translations/zh-CN/content/rest/apps/oauth-applications.md
@@ -1,5 +1,6 @@
---
-title: OAuth Applications
+title: OAuth 应用程序
+allowTitleToDifferFromFilename: true
intro: ''
topics:
- API
@@ -11,4 +12,6 @@ versions:
ghec: '*'
---
-您可以使用此 API 来管理 OAuth 应用程序用于访问人们在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上的帐户的 OAuth 令牌。
+## 关于 {% data variables.product.prodname_oauth_app %} API
+
+您可以使用此 API 来管理 {% data variables.product.prodname_oauth_app %} 用于访问 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上用户帐户的 OAuth 令牌。
diff --git a/translations/zh-CN/content/rest/apps/webhooks.md b/translations/zh-CN/content/rest/apps/webhooks.md
index 7b1706c937..28b8af2376 100644
--- a/translations/zh-CN/content/rest/apps/webhooks.md
+++ b/translations/zh-CN/content/rest/apps/webhooks.md
@@ -1,5 +1,7 @@
---
-title: Web 挂钩
+title: GitHub App web 挂钩
+allowTitleToDifferFromFilename: true
+shortTitle: Web 挂钩
intro: ''
topics:
- API
@@ -11,4 +13,6 @@ versions:
ghec: '*'
---
-A {% data variables.product.prodname_github_app %}'s webhook allows you to receive HTTP `POST` payloads whenever certain events happen for an app. {% data reusables.webhooks.webhooks-rest-api-links %}
+## 关于 {% data variables.product.prodname_github_app %} web 挂钩 API
+
+{% data variables.product.prodname_github_app %} 的 web 挂钩允许您在某些事件发生时接收 HTTP `POST` 有效载荷。 {% data reusables.webhooks.webhooks-rest-api-links %}
diff --git a/translations/zh-CN/content/rest/billing.md b/translations/zh-CN/content/rest/billing.md
index d9f0213c64..4d6b69cc74 100644
--- a/translations/zh-CN/content/rest/billing.md
+++ b/translations/zh-CN/content/rest/billing.md
@@ -1,6 +1,6 @@
---
title: 计费
-intro: The Billing API lets you get billing information for an enterprise.
+intro: 通过计费 API,可以获取企业的计费信息。
topics:
- API
miniTocMaxHeadingLevel: 3
@@ -12,6 +12,6 @@ redirect_from:
- /rest/reference/billing
---
-## About the Billing API
+## 关于计费 API
您可以获取企业的帐单信息。 更多信息请参阅“[{% data variables.product.prodname_dotcom %} Enterprise 管理](/rest/reference/enterprise-admin#billing)”REST API。
diff --git a/translations/zh-CN/content/rest/branches/branches.md b/translations/zh-CN/content/rest/branches/branches.md
index cc24867604..57fef95b73 100644
--- a/translations/zh-CN/content/rest/branches/branches.md
+++ b/translations/zh-CN/content/rest/branches/branches.md
@@ -1,6 +1,6 @@
---
title: 分支
-intro: The Branches API allows you to modify branches and their protection settings.
+intro: 分支 API 允许你修改分支及其保护设置。
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/rest/code-scanning.md b/translations/zh-CN/content/rest/code-scanning.md
index 4b81270190..98a5413736 100644
--- a/translations/zh-CN/content/rest/code-scanning.md
+++ b/translations/zh-CN/content/rest/code-scanning.md
@@ -1,5 +1,5 @@
---
-title: Code Scanning
+title: 代码扫描
intro: '{% data variables.product.prodname_code_scanning %} API 可让您从仓库检索和更新 {% data variables.product.prodname_code_scanning %} 警报。'
versions:
fpt: '*'
@@ -17,7 +17,7 @@ redirect_from:
{% data reusables.code-scanning.beta %}
-## About the Code scanning API
+## 关于代码扫描 API
{% data variables.product.prodname_code_scanning %} API 可让您从仓库检索和更新 {% data variables.product.prodname_code_scanning %} 警报。 您可以使用端点为组织中的 {% data variables.product.prodname_code_scanning %} 警报创建自动报告,或上传使用离线 {% data variables.product.prodname_code_scanning %} 工具生成的分析结果。 更多信息请参阅“[查找代码中的安全漏洞和错误](/github/finding-security-vulnerabilities-and-errors-in-your-code)”。
diff --git a/translations/zh-CN/content/rest/codes-of-conduct.md b/translations/zh-CN/content/rest/codes-of-conduct.md
index a3e3ece070..71618450ac 100644
--- a/translations/zh-CN/content/rest/codes-of-conduct.md
+++ b/translations/zh-CN/content/rest/codes-of-conduct.md
@@ -1,6 +1,6 @@
---
title: 行为准则
-intro: The Codes of conduct API lets you retrieve information about a repository's code of conduct.
+intro: 行为准则 API 允许您检索有关存储库行为准则的信息。
versions:
fpt: '*'
ghes: '*'
@@ -13,6 +13,6 @@ redirect_from:
- /rest/reference/codes-of-conduct
---
-## About the Codes of conduct API
+## 关于行为准则 API
-您可以使用行为准则 API 检索有关仓库行为准则的信息。 To get a code of conduct for a repository, use the "[Get a repository](/rest/reference/repos#get-a-repository)" endpoint.
+您可以使用行为准则 API 检索有关仓库行为准则的信息。 要获取存储库的行为准则,请使用“[获取存储库](/rest/reference/repos#get-a-repository)”端点。
diff --git a/translations/zh-CN/content/rest/codespaces/codespaces.md b/translations/zh-CN/content/rest/codespaces/codespaces.md
index 86ba75efd8..051f919f10 100644
--- a/translations/zh-CN/content/rest/codespaces/codespaces.md
+++ b/translations/zh-CN/content/rest/codespaces/codespaces.md
@@ -1,6 +1,6 @@
---
title: Codespaces
-intro: The Codespaces API enables you to manage your codespaces using the REST API.
+intro: 代码空间 API 可让您使用 REST API 管理代码空间。
versions:
fpt: '*'
ghec: '*'
@@ -11,4 +11,6 @@ miniTocMaxHeadingLevel: 3
{% data reusables.codespaces.codespaces-api-beta-note %}
-{% data variables.product.prodname_codespaces %} API 允许您使用 REST API 来管理 {% data variables.product.prodname_codespaces %}。 This API is available for authenticated users and OAuth Apps, but not GitHub Apps. 更多信息请参阅“[{% data variables.product.prodname_codespaces %}](/codespaces)”。
+## 关于代码空间 API
+
+{% data variables.product.prodname_codespaces %} API 允许您使用 REST API 来管理 {% data variables.product.prodname_codespaces %}。 此 API 适用于经过身份验证的用户和 OAuth 应用,但不适用于 GitHub 应用。 更多信息请参阅“[{% data variables.product.prodname_codespaces %}](/codespaces)”。
diff --git a/translations/zh-CN/content/rest/codespaces/machines.md b/translations/zh-CN/content/rest/codespaces/machines.md
index b39416253f..e0b79522df 100644
--- a/translations/zh-CN/content/rest/codespaces/machines.md
+++ b/translations/zh-CN/content/rest/codespaces/machines.md
@@ -1,6 +1,8 @@
---
-title: Machines
-intro: 'The Machines API allows a user to determine which machine types are available to create a codespace, either on a given repository or as an authenticated user.'
+title: 代码空间计算机
+allowTitleToDifferFromFilename: true
+shortTitle: 机器
+intro: 代码空间计算机 API 允许用户确定哪些计算机类型可用于在给定存储库上或作为经过身份验证的用户创建代码空间。
versions:
fpt: '*'
ghec: '*'
@@ -9,6 +11,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
-For more information, see "[About machine types](/codespaces/developing-in-codespaces/changing-the-machine-type-for-your-codespace#about-machine-types)."
+## 关于代码空间计算机 API
-You can also use this information when changing the machine of an existing codespace by updating its `machine` property. The machine update will take place the next time the codespace is restarted. For more information, see "[Changing the machine type for your codespace](/codespaces/developing-in-codespaces/changing-the-machine-type-for-your-codespace)."
\ No newline at end of file
+代码空间计算机 API 允许用户确定哪些计算机类型可用于在给定存储库上或作为经过身份验证的用户创建代码空间。 更多信息请参阅“[关于计算机类型](/codespaces/developing-in-codespaces/changing-the-machine-type-for-your-codespace#about-machine-types)”。
+
+您也可以通过更新其 `machine` 属性来更改现有代码空间的计算机时使用此信息。 计算机更新将在下次重新启动代码空间时进行。 更多信息请参阅“[更改代码空间的计算机类型](/codespaces/developing-in-codespaces/changing-the-machine-type-for-your-codespace)”。
diff --git a/translations/zh-CN/content/rest/codespaces/repository-secrets.md b/translations/zh-CN/content/rest/codespaces/repository-secrets.md
index a4f9bde130..299d61d4ed 100644
--- a/translations/zh-CN/content/rest/codespaces/repository-secrets.md
+++ b/translations/zh-CN/content/rest/codespaces/repository-secrets.md
@@ -1,6 +1,8 @@
---
-title: Repository Secrets
-intro: 'The Repository Secrets API allows a user to create, list, and delete secrets (such as access tokens for cloud services) for repositories that the user has access to.'
+title: 代码空间存储库机密
+allowTitleToDifferFromFilename: true
+shortTitle: 存储库机密
+intro: 代码空间存储库机密 API 允许用户为用户在代码空间中有权访问的存储库创建、列出和删除机密(如云服务的访问令牌)。
versions:
fpt: '*'
ghec: '*'
@@ -9,6 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## Repository Secrets
+## 关于代码空间存储库机密 API
-The Repository Secrets API allows a user to create, list, and delete secrets (such as access tokens for cloud services) for repositories that the user has access to. These secrets are made available to the codespace at runtime. For more information, see "[Managing encrypted secrets for your codespaces](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)."
+代码空间存储库机密 API 允许用户为用户有权访问的存储库创建、列出和删除机密(如云服务的访问令牌)。 这些机密在运行时可供代码空间使用。 更多信息请参阅“[管理代码空间的加密机密](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)。。
diff --git a/translations/zh-CN/content/rest/codespaces/secrets.md b/translations/zh-CN/content/rest/codespaces/secrets.md
index fb315dc8ce..bbe48e3beb 100644
--- a/translations/zh-CN/content/rest/codespaces/secrets.md
+++ b/translations/zh-CN/content/rest/codespaces/secrets.md
@@ -1,15 +1,16 @@
---
-title: User Secrets
-intro: 'The User Secrets API allows a user to create, list, and delete secrets (such as access tokens for cloud services) as well as assign secrets to repositories that the user has access to.'
+title: 代码空间用户机密
+allowTitleToDifferFromFilename: true
+shortTitle: 用户机密
+intro: 代码空间用户机密 API 允许用户创建、列出和删除机密(如云服务的访问令牌),以及将机密分配给用户在代码空间中有权访问的存储库。
versions:
fpt: '*'
ghec: '*'
topics:
- API
miniTocMaxHeadingLevel: 3
-allowTitleToDifferFromFilename: true
---
-## User Secrets
+## 关于代码空间用户机密 API
-The User Secrets API allows a user to create, list, and delete secrets (such as access tokens for cloud services) as well as assign secrets to repositories that the user has access to. These secrets are made available to the codespace at runtime. For more information, see "[Managing encrypted secrets for your codespaces](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)."
\ No newline at end of file
+Codespaces 用户机密 API 允许用户创建、列出和删除机密(如云服务的访问令牌),以及将机密分配给用户有权访问的存储库。 这些机密在运行时可供代码空间使用。 更多信息请参阅“[管理代码空间的加密机密](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)。。
diff --git a/translations/zh-CN/content/rest/collaborators/collaborators.md b/translations/zh-CN/content/rest/collaborators/collaborators.md
index 16088b22c7..803b612a54 100644
--- a/translations/zh-CN/content/rest/collaborators/collaborators.md
+++ b/translations/zh-CN/content/rest/collaborators/collaborators.md
@@ -1,6 +1,6 @@
---
title: 协作者
-intro: The Collaborators API allows you manage collaborators for a repository.
+intro: 协作者 API 允许您管理存储库的协作者。
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/rest/collaborators/index.md b/translations/zh-CN/content/rest/collaborators/index.md
index 8b8369614b..5a09497dc9 100644
--- a/translations/zh-CN/content/rest/collaborators/index.md
+++ b/translations/zh-CN/content/rest/collaborators/index.md
@@ -1,6 +1,6 @@
---
title: 协作者
-intro: 'The Collaborators API allows you to add, invite, and remove collaborators from a repository.'
+intro: 协作者 API 允许您在存储库中添加、邀请和删除协作者。
allowTitleToDifferFromFilename: true
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/collaborators/invitations.md b/translations/zh-CN/content/rest/collaborators/invitations.md
index 39960a59bc..dd1488add1 100644
--- a/translations/zh-CN/content/rest/collaborators/invitations.md
+++ b/translations/zh-CN/content/rest/collaborators/invitations.md
@@ -1,8 +1,8 @@
---
-title: Repository invitations
+title: 仓库邀请
allowTitleToDifferFromFilename: true
shortTitle: 邀请
-intro: The Repository invitations API allows you to view and manage invitations to collaborate on a repository.
+intro: 存储库邀请 API 允许您查看和管理在存储库上进行协作的邀请。
versions:
fpt: '*'
ghes: '*'
@@ -13,10 +13,10 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Repository invitations API
+## 关于存储库邀请 API
-The Repository invitations API allows you to view and manage invitations to collaborate on a repository. 受邀用户(或代表受邀用户的外部服务)可以选择接受或拒绝邀请。
+存储库邀请 API 允许您查看和管理在存储库上进行协作的邀请。 受邀用户(或代表受邀用户的外部服务)可以选择接受或拒绝邀请。
-To add a user as a collaborator, use the Collaborators API instead. 更多信息请参阅“[添加仓库协作者](/rest/collaborators/collaborators#add-a-repository-collaborator)”。
+要将用户添加为协作者,请改用协作者 API。 更多信息请参阅“[添加仓库协作者](/rest/collaborators/collaborators#add-a-repository-collaborator)”。
请注意,`repo:invite` [OAuth 作用域](/developers/apps/scopes-for-oauth-apps)授予对邀请的定向访问权限,但**不**授予对仓库代码的访问权限,而 `repo` 作用域同时授予对代码和邀请的权限。
diff --git a/translations/zh-CN/content/rest/commits/comments.md b/translations/zh-CN/content/rest/commits/comments.md
index 3e5183e616..589c647ea1 100644
--- a/translations/zh-CN/content/rest/commits/comments.md
+++ b/translations/zh-CN/content/rest/commits/comments.md
@@ -1,6 +1,6 @@
---
title: 提交注释
-intro: The Commit comments API lets you create and edit comments that relate to specific commits.
+intro: 提交评论 API 允许您创建和编辑与特定提交相关的评论。
versions:
fpt: '*'
ghes: '*'
@@ -12,9 +12,9 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-## About the commit comments API
+## 关于提交评论 API
-The Commit comments API lets you create and edit comments that relate to specific commits.
+提交评论 API 允许您创建和编辑与特定提交相关的评论。
### 提交评论的自定义媒体类型
diff --git a/translations/zh-CN/content/rest/commits/commits.md b/translations/zh-CN/content/rest/commits/commits.md
index f39be0411e..9f8c5595f8 100644
--- a/translations/zh-CN/content/rest/commits/commits.md
+++ b/translations/zh-CN/content/rest/commits/commits.md
@@ -1,6 +1,6 @@
---
title: 提交
-intro: 'The Commits API allows you to list, view, and compare commits in a repository. 您还可以与提交注释和提交状态进行交互。'
+intro: 提交 API 允许您列出、查看和比较存储库中的提交。 您还可以与提交注释和提交状态进行交互。
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/rest/commits/statuses.md b/translations/zh-CN/content/rest/commits/statuses.md
index 06eab3f1c7..aeba90457d 100644
--- a/translations/zh-CN/content/rest/commits/statuses.md
+++ b/translations/zh-CN/content/rest/commits/statuses.md
@@ -1,6 +1,6 @@
---
title: 提交状态
-intro: 'The Commit status API allows external services to mark commits with a status, which is then reflected in pull requests involving those commits.'
+intro: 提交状态 API 允许外部服务使用状态标记提交,然后该状态将反映在涉及这些提交的拉取请求中。
versions:
fpt: '*'
ghes: '*'
@@ -12,14 +12,14 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-## About the Commit statuses API
+## 关于提交状态 API
-The Commit status API allows external services to mark commits with an `error`, `failure`, `pending`, or `success` state, which is then reflected in pull requests involving those commits. Statuses can also include an optional `description` and `target_url`, and we highly recommend providing them as they make statuses much more useful in the GitHub UI.
+提交状态 API 允许外部服务使用 `error`、`failure`、`pending` 或 `success` 状态来标记提交,然后这些状态反映在涉及这些提交的拉取请求中。 状态还可以包括可选的 `description` 和 `target_url`,我们强烈建议提供它们,因为它们使状态在 GitHub UI 中更有用。
-As an example, one common use is for continuous integration services to mark commits as passing or failing builds using status. The `target_url` would be the full URL to the build output, and the `description` would be the high level summary of what happened with the build.
+一种常见用例是持续集成服务使用状态将提交标记为构建成功或失败。 `target_url` 将是构建输出的完整 URL,`description` 将是构建所发生情况的高级摘要。
-状态可以包括 `context` 以指示提供该状态的服务是什么。 例如,您可以让持续集成服务推送上下文为 `ci` 的状态,让安全审核工具推送上下文为 `security` 的状态。 You can then use the [Get the combined status for a specific reference](/rest/reference/commits#get-the-combined-status-for-a-specific-reference) to retrieve the whole status for a commit.
+状态可以包括 `context` 以指示提供该状态的服务是什么。 例如,您可以让持续集成服务推送上下文为 `ci` 的状态,让安全审核工具推送上下文为 `security` 的状态。 然后,您可以使用[获取特定引用的组合状态](/rest/reference/commits#get-the-combined-status-for-a-specific-reference)来检索提交的整个状态。
-Note that the `repo:status` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted access to statuses **without** also granting access to repository code, while the `repo` scope grants permission to code as well as statuses.
+请注意,`repo:status` [OAuth 作用域](/developers/apps/scopes-for-oauth-apps)授予对状态的定向访问权限,但**不**授予对仓库代码的访问权限,而 `repo` 作用域同时授予对代码和状态的权限。
如果您正在开发 GitHub 应用程序,希望提供有关外部服务的更多信息,则可能需要使用[检查 API](/rest/reference/checks)。
diff --git a/translations/zh-CN/content/rest/dependabot/index.md b/translations/zh-CN/content/rest/dependabot/index.md
index c82be888af..b94f68c96d 100644
--- a/translations/zh-CN/content/rest/dependabot/index.md
+++ b/translations/zh-CN/content/rest/dependabot/index.md
@@ -1,6 +1,6 @@
---
title: Dependabot
-intro: 'With the Dependabot Secrets API, you can manage and control Dependabot secrets for an organization or repository.'
+intro: 借助 Dependabot Secrets API,您可以管理和控制组织或存储库的 Dependabot 密钥。
allowTitleToDifferFromFilename: true
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/dependabot/secrets.md b/translations/zh-CN/content/rest/dependabot/secrets.md
index 12a82396d6..5f616996fd 100644
--- a/translations/zh-CN/content/rest/dependabot/secrets.md
+++ b/translations/zh-CN/content/rest/dependabot/secrets.md
@@ -1,7 +1,7 @@
---
-title: Dependabot secrets
+title: Dependabot 机密
shortTitle: 密码
-intro: 'With the {% data variables.product.prodname_dependabot %} secrets API, you can manage and control {% data variables.product.prodname_dependabot %} secrets for an organization or repository.'
+intro: '使用 {% data variables.product.prodname_dependabot %} 机密 API,您可以管理和控制组织或存储库的 {% data variables.product.prodname_dependabot %} 机密。'
topics:
- API
versions:
@@ -11,8 +11,8 @@ versions:
allowTitleToDifferFromFilename: true
---
-## About the {% data variables.product.prodname_dependabot %} secrets API
+## 关于 {% data variables.product.prodname_dependabot %} 机密 API
-The {% data variables.product.prodname_dependabot %} secrets API lets you create, update, delete, and retrieve information about encrypted secrets. {% data reusables.actions.about-secrets %} For more information, see "[Managing encrypted secrets for Dependabot](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot)."
+{% data variables.product.prodname_dependabot %} 机密 API 允许您创建、更新、删除和检索有关加密密钥的信息。 {% data reusables.actions.about-secrets %}更多信息请参阅“[管理 Dependabot 的加密密码](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot)”。
-{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} must have the `dependabot_secrets` permission to use this API. 经过身份验证的用户必须对仓库具有协作者权限才可创建、更新或读取密码。
+{% data reusables.actions.actions-authentication %} {% data variables.product.prodname_github_apps %} 必须具有 `dependabot_secrets` 权限才可使用此 API。 经过身份验证的用户必须对仓库具有协作者权限才可创建、更新或读取密码。
diff --git a/translations/zh-CN/content/rest/dependency-graph/dependency-review.md b/translations/zh-CN/content/rest/dependency-graph/dependency-review.md
index 2d3bd59d5e..87deb47910 100644
--- a/translations/zh-CN/content/rest/dependency-graph/dependency-review.md
+++ b/translations/zh-CN/content/rest/dependency-graph/dependency-review.md
@@ -1,6 +1,6 @@
---
title: 依赖项审查
-intro: 'The Dependency review API allows you to understand dependency changes, and the security impact of these changes, before you add them to your environment.'
+intro: 通过依赖项审查 API,您可以在将这些更改添加到环境之前了解依赖项更改以及这些更改的安全影响。
versions:
fpt: '*'
ghes: '>=3.6'
@@ -12,8 +12,8 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-## About the Dependency review API
+## 关于依赖项审查 API
{% data reusables.dependency-review.dependency-review-api-beta-note %}
-The Dependency Review API allows you to understand dependency changes, and the security impact of these changes, before you add them to your environment. You can view the diff of dependencies between two commits of a repository, including vulnerability data for any version updates with known vulnerabilities. 有关依赖项审查的详细信息,请参阅“[关于依赖项审查](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)”。
+通过依赖项审查 API,您可以在将这些更改添加到环境之前了解依赖项更改以及这些更改的安全影响。 您可以查看存储库的两次提交之间的依赖项差异,包括具有已知漏洞的任何版本更新的漏洞数据。 有关依赖项审查的详细信息,请参阅“[关于依赖项审查](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)”。
diff --git a/translations/zh-CN/content/rest/dependency-graph/index.md b/translations/zh-CN/content/rest/dependency-graph/index.md
index 221ed41cff..89fe4e167b 100644
--- a/translations/zh-CN/content/rest/dependency-graph/index.md
+++ b/translations/zh-CN/content/rest/dependency-graph/index.md
@@ -1,6 +1,6 @@
---
title: 依赖关系图
-intro: 'With the Dependency Graph API, you can view dependency changes and their security impact on your repository.'
+intro: 借助依赖关系图 API,您可以查看依赖项更改及其对存储库的安全影响。
versions:
fpt: '*'
ghes: '>=3.6'
diff --git a/translations/zh-CN/content/rest/deploy-keys.md b/translations/zh-CN/content/rest/deploy-keys.md
index 08999db85a..814b1ec9d1 100644
--- a/translations/zh-CN/content/rest/deploy-keys.md
+++ b/translations/zh-CN/content/rest/deploy-keys.md
@@ -1,6 +1,6 @@
---
title: 部署密钥
-intro: The Deploy keys API lets you create and manage deploy keys.
+intro: 部署密钥 API 允许您创建和管理部署密钥。
versions:
fpt: '*'
ghes: '*'
@@ -14,7 +14,7 @@ redirect_from:
- /rest/reference/deploy_keys
---
-## About the Deploy keys API
+## 关于部署密钥 API
{% data reusables.repositories.deploy-keys %}
diff --git a/translations/zh-CN/content/rest/deployments/deployments.md b/translations/zh-CN/content/rest/deployments/deployments.md
index 004726d70d..d129c2157d 100644
--- a/translations/zh-CN/content/rest/deployments/deployments.md
+++ b/translations/zh-CN/content/rest/deployments/deployments.md
@@ -1,6 +1,6 @@
---
title: 部署
-intro: The Deployments API allows you to create and delete deployments and deployment environments.
+intro: 部署 API 允许您创建和删除部署和部署环境。
versions:
fpt: '*'
ghes: '*'
@@ -11,6 +11,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于部署 API
+
部署是部署特定引用(分支、SHA、标记)的请求。 GitHub 分发一个 [`deployment` 事件](/developers/webhooks-and-events/webhook-events-and-payloads#deployment),使外部服务可以在创建新部署时侦听并采取行动。 部署使开发者和组织能够围绕部署构建松散耦合的工具,而不必担心交付不同类型的应用程序(例如 Web 和本地应用程序)的实现细节。
部署状态允许外部服务将部署标记为 `error`、`failure`、`pending`、`in_progress`、`queued` 或 `success` 状态,以供侦听 [`deployment_status` 事件](/developers/webhooks-and-events/webhook-events-and-payloads#deployment_status)的系统使用。
diff --git a/translations/zh-CN/content/rest/deployments/environments.md b/translations/zh-CN/content/rest/deployments/environments.md
index 0433cc6c9b..c00bd48147 100644
--- a/translations/zh-CN/content/rest/deployments/environments.md
+++ b/translations/zh-CN/content/rest/deployments/environments.md
@@ -1,6 +1,8 @@
---
-title: 环境
-intro: 环境 API 允许您创建、配置和删除环境。
+title: 部署环境
+allowTitleToDifferFromFilename: true
+shortTitle: 环境
+intro: 部署环境 API 允许您创建、配置和删除部署环境。
versions:
fpt: '*'
ghes: '>=3.2'
@@ -11,6 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于部署环境 API
+
有关环境的更多信息,请参阅“[使用环境进行部署](/actions/deployment/using-environments-for-deployment)”。 要管理环境密码,请参阅“[密码](/rest/reference/actions#secrets)”。
{% data reusables.gated-features.environments %}
diff --git a/translations/zh-CN/content/rest/deployments/index.md b/translations/zh-CN/content/rest/deployments/index.md
index dc3206c250..b008253791 100644
--- a/translations/zh-CN/content/rest/deployments/index.md
+++ b/translations/zh-CN/content/rest/deployments/index.md
@@ -1,6 +1,6 @@
---
title: 部署
-intro: 'The deployments API allows you to create and delete deploy keys, deployments, and deployment environments.'
+intro: 部署 API 允许您创建和删除部署密钥、部署和部署环境。
allowTitleToDifferFromFilename: true
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/enterprise-admin/admin-stats.md b/translations/zh-CN/content/rest/enterprise-admin/admin-stats.md
index 4dd22df275..7ae37becfc 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/admin-stats.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/admin-stats.md
@@ -4,6 +4,8 @@ intro: 管理统计 API 提供有关安装设施的各种指标。
versions:
ghes: '*'
ghae: '*'
+ ghec: '*'
+ fpt: '*'
topics:
- API
miniTocMaxHeadingLevel: 3
diff --git a/translations/zh-CN/content/rest/enterprise-admin/announcement.md b/translations/zh-CN/content/rest/enterprise-admin/announcement.md
index 2e073458c9..c757d56106 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/announcement.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/announcement.md
@@ -1,6 +1,6 @@
---
title: 公告
-intro: The Announcement API allows you to manage the global announcement banner in your enterprise.
+intro: 公告 API 允许您管理企业中的全局公告横幅。
versions:
ghes: '*'
ghae: '*'
diff --git a/translations/zh-CN/content/rest/enterprise-admin/global-webhooks.md b/translations/zh-CN/content/rest/enterprise-admin/global-webhooks.md
index 6dc6517c25..08f5bf6afc 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/global-webhooks.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/global-webhooks.md
@@ -1,6 +1,6 @@
---
-title: Global Webhooks
-intro: Global Webhooks are installed on your enterprise. 您可以使用全局 web 挂钩来自动监视、响应或实施针对企业上的用户、组织、团队和仓库的规则。
+title: 全局 web 挂钩
+intro: 全局 web 挂钩安装在企业上。 您可以使用全局 web 挂钩来自动监视、响应或实施针对企业上的用户、组织、团队和仓库的规则。
versions:
ghes: '*'
ghae: '*'
diff --git a/translations/zh-CN/content/rest/enterprise-admin/org-pre-receive-hooks.md b/translations/zh-CN/content/rest/enterprise-admin/org-pre-receive-hooks.md
index 8e68c27062..c937d35a63 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/org-pre-receive-hooks.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/org-pre-receive-hooks.md
@@ -1,6 +1,6 @@
---
-title: Organization Pre-receive Hooks
-intro: The Organization Pre-receive Hooks API allows you to view and modify enforcement of the pre-receive hooks that are available to an organization.
+title: 组织预接收挂钩
+intro: 组织预接收挂钩 API 允许您查看和修改组织可用的预接收挂钩的实施。
versions:
ghes: '*'
topics:
@@ -20,4 +20,4 @@ allowTitleToDifferFromFilename: true
*enforcement* 的可能值包括 `enabled`、`disabled` 和 `testing`。 `disabled` 表示预接收挂钩不会运行。 `enabled` 表示它将运行并拒绝会导致非零状态的任何推送。 `testing` 表示脚本将运行,但不会导致任何推送被拒绝。
-`configuration_url` may be a link to this endpoint or this hook's global configuration. 只有站点管理员才能访问全局配置。
+`configuration_url` 可能是此端点或此挂钩的全局配置的链接。 只有站点管理员才能访问全局配置。
diff --git a/translations/zh-CN/content/rest/enterprise-admin/pre-receive-environments.md b/translations/zh-CN/content/rest/enterprise-admin/pre-receive-environments.md
index ee52479b1e..f5cc0532f3 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/pre-receive-environments.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/pre-receive-environments.md
@@ -1,5 +1,5 @@
---
-title: Pre-receive Environments
+title: 预接收环境
intro: 预接收环境 API 允许您创建、列出、更新和删除预接收挂钩的环境。
versions:
ghes: '*'
diff --git a/translations/zh-CN/content/rest/enterprise-admin/pre-receive-hooks.md b/translations/zh-CN/content/rest/enterprise-admin/pre-receive-hooks.md
index e9a00724ab..a578bb8fe3 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/pre-receive-hooks.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/pre-receive-hooks.md
@@ -1,5 +1,5 @@
---
-title: Pre-receive Hooks
+title: 预接收挂钩
intro: 预接收挂钩 API 允许您创建、列出、更新和删除预接收挂钩。
versions:
ghes: '*'
diff --git a/translations/zh-CN/content/rest/enterprise-admin/repo-pre-receive-hooks.md b/translations/zh-CN/content/rest/enterprise-admin/repo-pre-receive-hooks.md
index 09f7cc4bca..3ba9aaab61 100644
--- a/translations/zh-CN/content/rest/enterprise-admin/repo-pre-receive-hooks.md
+++ b/translations/zh-CN/content/rest/enterprise-admin/repo-pre-receive-hooks.md
@@ -1,6 +1,6 @@
---
-title: Repository Pre-receive Hooks
-intro: The Repository Pre-receive Hooks API allows you to view and modify enforcement of the pre-receive hooks that are available to a repository.
+title: 存储库预接收挂钩
+intro: 存储库预接收挂钩 API 允许您查看和修改可用于存储库的预接收挂钩的实施。
versions:
ghes: '*'
topics:
diff --git a/translations/zh-CN/content/rest/gists/comments.md b/translations/zh-CN/content/rest/gists/comments.md
index 4e566344c9..6a488ec08b 100644
--- a/translations/zh-CN/content/rest/gists/comments.md
+++ b/translations/zh-CN/content/rest/gists/comments.md
@@ -1,8 +1,8 @@
---
-title: Gist comments
+title: Gist 评论
allowTitleToDifferFromFilename: true
shortTitle: 评论
-intro: The Gist comments API lets you view and modify comments on a gist.
+intro: 通过 Gist 评论 API,您可以查看和修改对 Gist 的评论。
versions:
fpt: '*'
ghes: '*'
@@ -13,9 +13,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Gist comments API
+## 关于 Gist 评论 API
-The Gist comments API lets you view and modify comments on a gist. For more information about gists, see "[Editing and sharing content with gists](/get-started/writing-on-github/editing-and-sharing-content-with-gists)."
+通过 Gist 评论 API,您可以查看和修改对 Gist 的评论。 有关 Gist 的详细信息,请参阅“[编辑和共享内容与 Gist](/get-started/writing-on-github/editing-and-sharing-content-with-gists)”。
### Gist 评论的自定义媒体类型
diff --git a/translations/zh-CN/content/rest/gists/gists.md b/translations/zh-CN/content/rest/gists/gists.md
index dd848b1439..b00d6d22e1 100644
--- a/translations/zh-CN/content/rest/gists/gists.md
+++ b/translations/zh-CN/content/rest/gists/gists.md
@@ -1,6 +1,6 @@
---
title: Gist
-intro: 'The Gists API enables the authorized user to list, create, update and delete the public gists on GitHub.'
+intro: Gists API 允许授权用户在 GitHub 上列出、创建、更新和删除公共 gist。
versions:
fpt: '*'
ghes: '*'
@@ -11,9 +11,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Gists API
+## 关于 Gist API
-The Gist API lets you view and modify gists. For more information about gists, see "[Editing and sharing content with gists](/get-started/writing-on-github/editing-and-sharing-content-with-gists)."
+Gist API 允许您查看和修改 Gist。 有关 Gist 的详细信息,请参阅“[编辑和共享内容与 Gist](/get-started/writing-on-github/editing-and-sharing-content-with-gists)”。
### 身份验证
diff --git a/translations/zh-CN/content/rest/git/blobs.md b/translations/zh-CN/content/rest/git/blobs.md
index b5afa5668e..28a9a758bb 100644
--- a/translations/zh-CN/content/rest/git/blobs.md
+++ b/translations/zh-CN/content/rest/git/blobs.md
@@ -1,8 +1,8 @@
---
-title: Git blobs
+title: Git Blob
shortTitle: Blob
allowTitleToDifferFromFilename: true
-intro: 'The Git blob API lets you create and get a Git blob (binary large object), the object type used to store the contents of each file in a repository.'
+intro: Git blob API 允许你创建和获取 Git blob(二进制大型对象),该对象类型用于将每个文件的内容存储在存储库中。
versions:
fpt: '*'
ghes: '*'
@@ -13,7 +13,7 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Git blob API
+## 关于 Git blob API
Git Blob(二进制大对象)是用于将每个文件的内容存储在仓库中的对象类型。 文件的 SHA-1 哈希在 Blob 对象中计算和存储。 这些端点允许您在 {% data variables.product.product_name %} 上的 Git 数据库中读取和写入 [blob 对象](https://git-scm.com/book/en/v1/Git-Internals-Git-Objects)。 Blob 使用[这些自定义媒体类型](#custom-media-types-for-blobs)。 您可以在[此处](/rest/overview/media-types)阅读有关 API 中媒体类型使用情况的更多信息。
diff --git a/translations/zh-CN/content/rest/git/commits.md b/translations/zh-CN/content/rest/git/commits.md
index affa2ba246..cb9619a61e 100644
--- a/translations/zh-CN/content/rest/git/commits.md
+++ b/translations/zh-CN/content/rest/git/commits.md
@@ -1,8 +1,8 @@
---
-title: Git commits
+title: Git 提交
shortTitle: 提交
allowTitleToDifferFromFilename: true
-intro: 'The Git commits API lets you read and write commit objects to your Git database on {% data variables.product.product_name %}.'
+intro: 'Git 提交 API 允许您对 {% data variables.product.product_name %} 上的 Git 数据库读取和写入提交对象。'
versions:
fpt: '*'
ghes: '*'
@@ -13,6 +13,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Git commits API
+## 关于 Git 提交 API
-A Git commit is a snapshot of the hierarchy ([Git tree](/rest/reference/git#trees)) and the contents of the files ([Git blob](/rest/reference/git#blobs)) in a Git repository. These endpoints allow you to read and write [commit objects](https://git-scm.com/book/en/v1/Git-Internals-Git-Objects#Commit-Objects) to your Git database on {% data variables.product.product_name %}.
+Git 提交是 Git 仓库中层次结构([Git 树](/rest/reference/git#trees))和文件内容 ([Git blob](/rest/reference/git#blobs)) 的快照。 这些端点允许您在 {% data variables.product.product_name %} 上的 Git 数据库中读取和写入[提交对象](https://git-scm.com/book/en/v1/Git-Internals-Git-Objects#Commit-Objects)。
diff --git a/translations/zh-CN/content/rest/git/refs.md b/translations/zh-CN/content/rest/git/refs.md
index 9be59d2be6..18bfb53211 100644
--- a/translations/zh-CN/content/rest/git/refs.md
+++ b/translations/zh-CN/content/rest/git/refs.md
@@ -1,7 +1,7 @@
---
-title: Git references
+title: Git 引用
shortTitle: 引用
-intro: 'The Git references API lets you read and write references to your Git database on {% data variables.product.product_name %}'
+intro: 'Git 引用 API 允许您在 {% data variables.product.product_name %} 上读取和写入对 Git 数据库的引用'
versions:
fpt: '*'
ghes: '*'
@@ -13,6 +13,6 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-## About the Git references API
+## 关于 Git 引用 API
-A Git reference (`git ref`) is a file that contains a Git commit SHA-1 hash. When referring to a Git commit, you can use the Git reference, which is an easy-to-remember name, rather than the hash. The Git reference can be rewritten to point to a new commit. A branch is a Git reference that stores the new Git commit hash. These endpoints allow you to read and write [references](https://git-scm.com/book/en/v1/Git-Internals-Git-References) to your Git database on {% data variables.product.product_name %}.
+Git 引用 (`git ref`)是一个包含 Git 提交 SHA-1 哈希的文件。 当引用 Git 提交时,您可以使用 Git 引用,这是一个易于记住的名称,而不是哈希。 可以重写 Git 引用指向新的提交。 分支是存储新 Git 提交哈希的 Git 引用。 这些端点允许您在 {% data variables.product.product_name %} 上的 Git 数据库中读取和写入[引用](https://git-scm.com/book/en/v1/Git-Internals-Git-References)。
diff --git a/translations/zh-CN/content/rest/git/tags.md b/translations/zh-CN/content/rest/git/tags.md
index c58efcb9db..d966f1f42b 100644
--- a/translations/zh-CN/content/rest/git/tags.md
+++ b/translations/zh-CN/content/rest/git/tags.md
@@ -1,8 +1,8 @@
---
-title: Git tags
+title: Git 标签
shortTitle: 标记
allowTitleToDifferFromFilename: true
-intro: 'The Git tags API lets you read and write tag objects to your Git database on {% data variables.product.product_name %}.'
+intro: 'Git 标签 API 允许您对 {% data variables.product.product_name %} 上的 Git 数据库读取和写入标签对象。'
versions:
fpt: '*'
ghes: '*'
@@ -13,6 +13,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Git tags API
+## 关于 Git 标签 API
Git 标记类似于 [Git 引用](/rest/reference/git#refs),但它指向的 Git 提交永远不变。 当您想要指向特定发行版时,Git 标记非常有用。 这些端点允许您在 {% data variables.product.product_name %} 上的 Git 数据库中读取和写入[标记对象](https://git-scm.com/book/en/v1/Git-Internals-Git-References#Tags)。 Git 标记 API 只支持[标注的标记对象](https://git-scm.com/book/en/v1/Git-Internals-Git-References#Tags),而不支持轻量级标记。
diff --git a/translations/zh-CN/content/rest/git/trees.md b/translations/zh-CN/content/rest/git/trees.md
index b5561a7e83..3e99d79f0a 100644
--- a/translations/zh-CN/content/rest/git/trees.md
+++ b/translations/zh-CN/content/rest/git/trees.md
@@ -1,8 +1,8 @@
---
-title: Git trees
+title: Git 树
shortTitle: 树
allowTitleToDifferFromFilename: true
-intro: 'The Git trees API lets you read and write tree objects to your Git database on {% data variables.product.product_name %}.'
+intro: 'Git 树 API 允许您对 {% data variables.product.product_name %} 上的 Git 数据库读取和写入树对象。'
versions:
fpt: '*'
ghes: '*'
@@ -13,6 +13,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Git trees API
+## 关于 Git 树 API
Git 树对象在 Git 仓库中的文件之间创建层次结构。 您可以使用 Git 树对象创建目录与其包含的文件之间的关系。 这些端点允许您在 {% data variables.product.product_name %} 上的 Git 数据库中读取和写入[树对象](https://git-scm.com/book/en/v1/Git-Internals-Git-Objects#Tree-Objects)。
diff --git a/translations/zh-CN/content/rest/gitignore.md b/translations/zh-CN/content/rest/gitignore.md
index 5ad1999b15..3004a2d1cf 100644
--- a/translations/zh-CN/content/rest/gitignore.md
+++ b/translations/zh-CN/content/rest/gitignore.md
@@ -13,7 +13,7 @@ redirect_from:
- /rest/reference/gitignore
---
-## About the Gitignore API
+## 关于 Gitignore API
当您通过 API 在 {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} 上创建新仓库时,您可以指定一个 [.gitignore 模板](/github/getting-started-with-github/ignoring-files) 在创建时应用于仓库。 .gitignore 模板 API 可列出 {% data variables.product.product_name %} [.gitignore 仓库](https://github.com/github/gitignore)并从中获取模板。
diff --git a/translations/zh-CN/content/rest/interactions/orgs.md b/translations/zh-CN/content/rest/interactions/orgs.md
index 7ea0a70e22..5f323340aa 100644
--- a/translations/zh-CN/content/rest/interactions/orgs.md
+++ b/translations/zh-CN/content/rest/interactions/orgs.md
@@ -1,5 +1,6 @@
---
-title: 组织
+title: 组织交互
+shortTitle: 组织
intro: 组织交互 API 允许组织所有者临时限制哪类用户可以在组织的公共仓库中发表评论、开设议题或创建拉取请求。
versions:
fpt: '*'
@@ -10,7 +11,9 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-{% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
+## 关于组织交互 API
+
+组织交互 API 允许组织所有者临时限制哪类用户可以在组织的公共仓库中发表评论、开设议题或创建拉取请求。 {% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
* 组织中的 {% data reusables.interactions.existing-user-limit-definition %}。
* 组织中的 {% data reusables.interactions.contributor-user-limit-definition %}。
diff --git a/translations/zh-CN/content/rest/interactions/repos.md b/translations/zh-CN/content/rest/interactions/repos.md
index 039a1944fe..bce76422e7 100644
--- a/translations/zh-CN/content/rest/interactions/repos.md
+++ b/translations/zh-CN/content/rest/interactions/repos.md
@@ -1,6 +1,7 @@
---
-title: 仓库
-intro: 仓库交互 API 允许具有所有者或管理员权限的用户临时限制哪类用户可以在公共仓库中发表评论、开设议题或创建拉取请求。
+title: 存储库交互
+shortTitle: 仓库
+intro: 存储库交互 API 允许具有所有者或管理员权限的用户临时限制哪类用户可以在公共存储库中发表评论、开设议题或创建拉取请求。
versions:
fpt: '*'
ghec: '*'
@@ -10,7 +11,9 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-{% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
+## 关于存储库交互 API
+
+存储库交互 API 允许具有所有者或管理员权限的用户临时限制哪类用户可以在公共存储库中发表评论、开设议题或创建拉取请求。 {% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
* 仓库中的 {% data reusables.interactions.existing-user-limit-definition %}。
* 仓库中的 {% data reusables.interactions.contributor-user-limit-definition %}。
diff --git a/translations/zh-CN/content/rest/interactions/user.md b/translations/zh-CN/content/rest/interactions/user.md
index 9f0a558f77..390e207c4e 100644
--- a/translations/zh-CN/content/rest/interactions/user.md
+++ b/translations/zh-CN/content/rest/interactions/user.md
@@ -1,6 +1,8 @@
---
-title: 用户
-intro: 'The User Interactions API allows you to temporarily restrict which type of user can comment, open issues, or create pull requests on your public repositories.'
+title: 用户交互
+shortTitle: 用户
+allowTitleToDifferFromFilename: true
+intro: 用户交互 API 允许您临时限制哪类用户可以在公共仓库上发表评论、开设问题或创建拉取请求。
versions:
fpt: '*'
ghec: '*'
@@ -9,10 +11,12 @@ topics:
miniTocMaxHeadingLevel: 3
---
-{% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
+## 关于用户交互 API
-* {% data reusables.interactions.existing-user-limit-definition %} from interacting with your repositories.
-* {% data reusables.interactions.contributor-user-limit-definition %} from interacting with your repositories.
-* {% data reusables.interactions.collaborator-user-limit-definition %} from interacting with your repositories.
+用户交互 API 允许您临时限制哪类用户可以在公共仓库上发表评论、开设问题或创建拉取请求。 {% data reusables.interactions.interactions-detail %} 以下是有关 {% data variables.product.product_name %} 用户类型的更多信息:
-Setting the interaction limit at the user level will overwrite any interaction limits that are set for individual repositories owned by the user. To set different interaction limits for individual repositories owned by the user, use the [Repository](#repository) interactions endpoints instead.
+* 与仓库交互产生的 {% data reusables.interactions.existing-user-limit-definition %}。
+* 与仓库交互产生的 {% data reusables.interactions.contributor-user-limit-definition %}。
+* 与仓库交互产生的 {% data reusables.interactions.collaborator-user-limit-definition %}。
+
+在用户级别设置交互限制将覆盖为用户拥有的各个仓库设置的任何交互限制。 要为用户拥有的个别仓库设置不同的交互限制,请使用[仓库](#repository)交互端点。
diff --git a/translations/zh-CN/content/rest/issues/assignees.md b/translations/zh-CN/content/rest/issues/assignees.md
index c82eced88a..983aada14e 100644
--- a/translations/zh-CN/content/rest/issues/assignees.md
+++ b/translations/zh-CN/content/rest/issues/assignees.md
@@ -1,5 +1,7 @@
---
-title: 受理人
+title: 议题受理人
+allowTitleToDifferFromFilename: true
+shortTitle: 受理人
intro: ''
versions:
fpt: '*'
@@ -11,3 +13,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于议题受理人 API
+
+议题受理人 API 支持管理议题和拉取请求的受理人。 {% data reusables.pull_requests.issues-pr-shared-api %}
diff --git a/translations/zh-CN/content/rest/issues/comments.md b/translations/zh-CN/content/rest/issues/comments.md
index eb21c7b550..b7e2499a59 100644
--- a/translations/zh-CN/content/rest/issues/comments.md
+++ b/translations/zh-CN/content/rest/issues/comments.md
@@ -1,6 +1,8 @@
---
-title: 评论
-intro: 'The Issue Comments API supports listing, viewing, editing, and creating comments on issues and pull requests.'
+title: 问题评论
+allowTitleToDifferFromFilename: true
+shortTitle: 评论
+intro: 议题评论 API 支持管理对议题和拉取请求的评论。
versions:
fpt: '*'
ghes: '*'
@@ -11,4 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
-议题评论使用[这些自定义媒体类型](#custom-media-types)。 您可以在[此处](/rest/overview/media-types)阅读有关 API 中媒体类型使用情况的更多信息。
+## 关于议题评论 API
+
+议题评论 API 支持管理对议题和拉取请求的评论。 {% data reusables.pull_requests.issues-pr-shared-api %} 若要管理拉取请求审查评论,请改用[拉取请求审查评论 API](/rest/pulls/comments)。
+
+{% data reusables.pull_requests.issues-media-types %}
diff --git a/translations/zh-CN/content/rest/issues/events.md b/translations/zh-CN/content/rest/issues/events.md
index cab54356df..ffec128f07 100644
--- a/translations/zh-CN/content/rest/issues/events.md
+++ b/translations/zh-CN/content/rest/issues/events.md
@@ -1,6 +1,8 @@
---
-title: 事件
-intro: The Issue Events API can return different types of events triggered by activity in issues and pull requests.
+title: 议题事件
+allowTitleToDifferFromFilename: true
+shortTitle: 事件
+intro: 议题事件 API 可以返回由议题和拉取请求中的活动触发的不同类型的事件。
versions:
fpt: '*'
ghes: '*'
@@ -11,4 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
-For more information about the specific events that you can receive from the Issue Events API, see "[Issue event types](/developers/webhooks-and-events/issue-event-types)." 有关可以从议题事件 API 接收的特定事件的更多信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 For more information, see the "[Events API](/developers/webhooks-and-events/github-event-types)."
+## 关于议题事件 API
+
+议题事件 API 可以返回由议题和拉取请求中的活动触发的不同类型的事件。 有关可以从议题事件 API 接收的特定事件的详细信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 有关可以从议题事件 API 接收的特定事件的更多信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 更多信息请参阅“[事件 API](/developers/webhooks-and-events/github-event-types)”。
+
+{% data reusables.pull_requests.issues-pr-shared-api %}
diff --git a/translations/zh-CN/content/rest/issues/issues.md b/translations/zh-CN/content/rest/issues/issues.md
index 9bb7905218..3e317ba3ee 100644
--- a/translations/zh-CN/content/rest/issues/issues.md
+++ b/translations/zh-CN/content/rest/issues/issues.md
@@ -1,6 +1,6 @@
---
title: 议题
-intro: Issues API 使您能够查看和管理议题,包括议题受理人、评论、标签和里程碑。
+intro: ''
versions:
fpt: '*'
ghes: '*'
@@ -11,13 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-### 议题的自定义媒体类型
+## 关于议题 API
-以下是议题支持的媒体类型。
-
- application/vnd.github.VERSION.raw+json
- application/vnd.github.VERSION.text+json
- application/vnd.github.VERSION.html+json
- application/vnd.github.VERSION.full+json
-
-有关媒体类型的更多信息,请参阅“[自定义媒体类型](/rest/overview/media-types)”。
+{% data reusables.pull_requests.issues-media-types %}
diff --git a/translations/zh-CN/content/rest/issues/labels.md b/translations/zh-CN/content/rest/issues/labels.md
index 76db81db9e..453441d81c 100644
--- a/translations/zh-CN/content/rest/issues/labels.md
+++ b/translations/zh-CN/content/rest/issues/labels.md
@@ -11,3 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于标签 API
+
+标签 API 支持管理存储库的标签,以及为议题和拉取请求添加或删除标签。 {% data reusables.pull_requests.issues-pr-shared-api %}
diff --git a/translations/zh-CN/content/rest/issues/timeline.md b/translations/zh-CN/content/rest/issues/timeline.md
index fa4634b63b..b2080321e5 100644
--- a/translations/zh-CN/content/rest/issues/timeline.md
+++ b/translations/zh-CN/content/rest/issues/timeline.md
@@ -1,6 +1,8 @@
---
-title: 时间表
-intro: 时间表事件 API 可以返回议题和拉取请求中的时间表活动所触发的不同类型的事件。
+title: 时间线事件
+allowTitleToDifferFromFilename: true
+shortTitle: 时间表
+intro: 时间线事件 API 可以返回由议题和拉取请求中的时间线活动触发的不同类型的事件。
versions:
fpt: '*'
ghes: '*'
@@ -11,6 +13,10 @@ topics:
miniTocMaxHeadingLevel: 3
---
-For more information about the specific events that you can receive from the Issue Events API, see "[Issue event types](/developers/webhooks-and-events/issue-event-types)." 有关可以从议题事件 API 接收的特定事件的更多信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 更多信息请参阅“[GitHub 事件 API](/developers/webhooks-and-events/github-event-types)”。
+## 关于时间线事件 API
+
+时间线事件 API 可以返回由议题和拉取请求中的时间线活动触发的不同类型的事件。 有关可以从议题事件 API 接收的特定事件的详细信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 有关可以从议题事件 API 接收的特定事件的更多信息,请参阅“[议题事件类型](/developers/webhooks-and-events/issue-event-types)”。 更多信息请参阅“[GitHub 事件 API](/developers/webhooks-and-events/github-event-types)”。
您可以使用此 API 显示有关议题和拉取请求的信息,或确定应向谁通知议题评论。
+
+{% data reusables.pull_requests.issues-pr-shared-api %}
diff --git a/translations/zh-CN/content/rest/licenses.md b/translations/zh-CN/content/rest/licenses.md
index d2216d7cf8..9ca7297531 100644
--- a/translations/zh-CN/content/rest/licenses.md
+++ b/translations/zh-CN/content/rest/licenses.md
@@ -13,7 +13,7 @@ redirect_from:
- /rest/reference/licenses
---
-## About the Licenses API
+## 关于许可证 API
许可证 API 使用[开源 Ruby Gem 许可](https://github.com/benbalter/licensee)来尝试识别项目的许可。 被许可人将项目 `LICENSE` 文件(如果有)的内容与已知许可的简短列表相匹配。 因此,API 不考虑项目依赖项的许可或其他记录项目许可的方式,例如对文档中许可名称的引用。
diff --git a/translations/zh-CN/content/rest/metrics/community.md b/translations/zh-CN/content/rest/metrics/community.md
index 30cd3c86c3..7889848d0f 100644
--- a/translations/zh-CN/content/rest/metrics/community.md
+++ b/translations/zh-CN/content/rest/metrics/community.md
@@ -1,8 +1,8 @@
---
-title: Community metrics
+title: 社区指标
shortTitle: 社区
allowTitleToDifferFromFilename: true
-intro: The Community metrics API lets you get data about your community profile.
+intro: 通过社区指标 API,您可以获取有关社区个人资料的数据。
versions:
fpt: '*'
ghec: '*'
diff --git a/translations/zh-CN/content/rest/metrics/statistics.md b/translations/zh-CN/content/rest/metrics/statistics.md
index 5167c2fa2e..c1d4394ad2 100644
--- a/translations/zh-CN/content/rest/metrics/statistics.md
+++ b/translations/zh-CN/content/rest/metrics/statistics.md
@@ -1,8 +1,8 @@
---
-title: Repository statistics
+title: 存储库统计信息
shortTitle: 统计
allowTitleToDifferFromFilename: true
-intro: 'The Repository statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different types of repository activity.'
+intro: '存储库统计信息 API 允许您获取 {% data variables.product.product_name %} 用于可视化不同类型的存储库活动的数据。'
versions:
fpt: '*'
ghes: '*'
@@ -13,9 +13,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Repository statistics API
+## 关于存储库统计信息 API
-The Repository statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different types of repository activity.
+存储库统计信息 API 允许您获取 {% data variables.product.product_name %} 用于可视化不同类型的存储库活动的数据。
### 谈一谈缓存
diff --git a/translations/zh-CN/content/rest/metrics/traffic.md b/translations/zh-CN/content/rest/metrics/traffic.md
index b8888aa28c..76ecadb8dd 100644
--- a/translations/zh-CN/content/rest/metrics/traffic.md
+++ b/translations/zh-CN/content/rest/metrics/traffic.md
@@ -1,8 +1,8 @@
---
-title: Repository traffic
+title: 存储库流量
shortTitle: 流量
allowTitleToDifferFromFilename: true
-intro: The Repository traffic API provides access to the information provided in your repository graph.
+intro: 存储库流量 API 提供对存储库图中提供的信息的访问。
versions:
fpt: '*'
ghec: '*'
@@ -11,6 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-## About the Repository traffic API
+## 关于存储库流量 API
-For repositories that you have push access to, the Repository traffic API provides access to the information provided in your repository graph. 更多信息请参阅“[查看仓库的流量](/repositories/viewing-activity-and-data-for-your-repository/viewing-traffic-to-a-repository)”。
+对于您具有推送权限的仓库,仓库流量 API 提供对仓库图中所示信息的访问权限。 更多信息请参阅“[查看仓库的流量](/repositories/viewing-activity-and-data-for-your-repository/viewing-traffic-to-a-repository)”。
diff --git a/translations/zh-CN/content/rest/migrations/orgs.md b/translations/zh-CN/content/rest/migrations/orgs.md
index ab4cd9b8ad..61b2d247ed 100644
--- a/translations/zh-CN/content/rest/migrations/orgs.md
+++ b/translations/zh-CN/content/rest/migrations/orgs.md
@@ -1,6 +1,8 @@
---
-title: 组织
-intro: 迁移 API 仅适用于经过身份验证的组织所有者。
+title: 组织迁移
+allowTitleToDifferFromFilename: true
+shortTitle: 组织
+intro: ''
versions:
fpt: '*'
ghec: '*'
@@ -9,9 +11,10 @@ versions:
topics:
- API
miniTocMaxHeadingLevel: 3
-allowTitleToDifferFromFilename: true
---
-更多信息请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#permission-levels-for-an-organization)”和“[其他身份验证方法](/rest/overview/other-authentication-methods)”。
+## 关于组织迁移 API
+
+迁移 API 仅适用于经过身份验证的组织所有者。 更多信息请参阅“[组织中的角色](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#permission-levels-for-an-organization)”和“[其他身份验证方法](/rest/overview/other-authentication-methods)”。
{% data variables.migrations.organization_migrations_intro %}
diff --git a/translations/zh-CN/content/rest/migrations/source-imports.md b/translations/zh-CN/content/rest/migrations/source-imports.md
index e99bda0119..ae1afe56ce 100644
--- a/translations/zh-CN/content/rest/migrations/source-imports.md
+++ b/translations/zh-CN/content/rest/migrations/source-imports.md
@@ -1,6 +1,6 @@
---
title: 源导入
-intro: '{% data variables.migrations.source_imports_intro %}'
+intro: ''
versions:
fpt: '*'
ghec: '*'
@@ -9,7 +9,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-如果导入中存在大型文件,则典型的源导入将开始导入,然后(可选)更新作者和/或更新使用 Git LFS 的首选项。 您也可以创建侦听 [`RepositoryImportEvent`](/developers/webhooks-and-events/webhook-events-and-payloads#repository_import) 的 web 挂钩来了解导入的状态。
+## 关于源导入 API
+
+{% data variables.migrations.source_imports_intro %}如果导入中存在大型文件,则典型的源导入将开始导入,然后(可选)更新作者和/或更新使用 Git LFS 的首选项。 您也可以创建侦听 [`RepositoryImportEvent`](/developers/webhooks-and-events/webhook-events-and-payloads#repository_import) 的 web 挂钩来了解导入的状态。
在此图中可以看到更详细的示例:
diff --git a/translations/zh-CN/content/rest/migrations/users.md b/translations/zh-CN/content/rest/migrations/users.md
index 65cca1b207..c01c3b3d79 100644
--- a/translations/zh-CN/content/rest/migrations/users.md
+++ b/translations/zh-CN/content/rest/migrations/users.md
@@ -1,6 +1,8 @@
---
-title: 用户
-intro: The Users migrations API is only available to authenticated account owners.
+title: 用户迁移
+allowTitleToDifferFromFilename: true
+shortTitle: 用户
+intro: ''
versions:
fpt: '*'
ghec: '*'
@@ -11,7 +13,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-更多信息请参阅“[其他身份验证方法](/rest/overview/other-authentication-methods)”。
+## 关于用户迁移 API
+
+用户迁移 API 仅适用于经过身份验证的帐户所有者。 更多信息请参阅“[其他身份验证方法](/rest/overview/other-authentication-methods)”。
{% data variables.migrations.user_migrations_intro %} 有关可下载的迁移数据列表,请参阅“[下载用户迁移存档](#download-a-user-migration-archive)”。
diff --git a/translations/zh-CN/content/rest/oauth-authorizations.md b/translations/zh-CN/content/rest/oauth-authorizations.md
index f1c58dc7fc..d819833946 100644
--- a/translations/zh-CN/content/rest/oauth-authorizations.md
+++ b/translations/zh-CN/content/rest/oauth-authorizations.md
@@ -1,6 +1,6 @@
---
-title: OAuth authorizations
-intro: The OAuth authorizations lets you manage the access OAuth applications have to your account.
+title: OAuth 授权
+intro: 通过 OAuth 授权,您可以管理 OAuth 应用程序对您的帐户的访问权限。
versions:
fpt: '*'
ghec: '*'
@@ -12,7 +12,7 @@ redirect_from:
- /rest/reference/oauth-authorizations
---
-## About the OAuth authorizations API
+## 关于 OAuth 授权 API
您可以使用此 API 来管理 OAuth 应用程序对您帐户的访问权限。 您只能使用您的用户名和密码(而不是令牌),通过[基本身份验证](/rest/overview/other-authentication-methods#basic-authentication)访问此 API。
diff --git a/translations/zh-CN/content/rest/orgs/custom-roles.md b/translations/zh-CN/content/rest/orgs/custom-roles.md
index 748da0f6cc..5dd362a98b 100644
--- a/translations/zh-CN/content/rest/orgs/custom-roles.md
+++ b/translations/zh-CN/content/rest/orgs/custom-roles.md
@@ -1,5 +1,5 @@
---
-title: Custom Repository Roles
+title: 自定义存储库角色
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/orgs/members.md b/translations/zh-CN/content/rest/orgs/members.md
index 62d19fba31..b2e3f298ce 100644
--- a/translations/zh-CN/content/rest/orgs/members.md
+++ b/translations/zh-CN/content/rest/orgs/members.md
@@ -1,5 +1,7 @@
---
-title: 成员
+title: 组织成员
+allowTitleToDifferFromFilename: true
+shortTitle: 成员
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/orgs/outside-collaborators.md b/translations/zh-CN/content/rest/orgs/outside-collaborators.md
index 42c4707e72..928ee08395 100644
--- a/translations/zh-CN/content/rest/orgs/outside-collaborators.md
+++ b/translations/zh-CN/content/rest/orgs/outside-collaborators.md
@@ -1,5 +1,5 @@
---
-title: Outside Collaborators
+title: 外部协作者
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/orgs/webhooks.md b/translations/zh-CN/content/rest/orgs/webhooks.md
index 52c61793a3..73044b81d4 100644
--- a/translations/zh-CN/content/rest/orgs/webhooks.md
+++ b/translations/zh-CN/content/rest/orgs/webhooks.md
@@ -1,5 +1,7 @@
---
-title: Web 挂钩
+title: 组织 web 挂钩
+allowTitleToDifferFromFilename: true
+shortTitle: Web 挂钩
intro: ''
versions:
fpt: '*'
@@ -11,6 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于组织 web 挂钩 API
+
组织 web 挂钩允许您在组织内发生特定事件时接收 HTTP `POST` 有效负载。 {% data reusables.webhooks.webhooks-rest-api-links %}
有关您可以订阅的操作的更多信息,请参阅“[{% data variables.product.prodname_dotcom %} 事件类型](/developers/webhooks-and-events/github-event-types)”。
diff --git a/translations/zh-CN/content/rest/projects/cards.md b/translations/zh-CN/content/rest/projects/cards.md
index 743bc7ed64..2858e555c0 100644
--- a/translations/zh-CN/content/rest/projects/cards.md
+++ b/translations/zh-CN/content/rest/projects/cards.md
@@ -1,6 +1,8 @@
---
-title: 卡
-intro: ''
+title: 项目板卡
+shortTitle: 卡
+allowTitleToDifferFromFilename: true
+intro: 项目板卡 API 允许您在项目板上创建和管理卡。
versions:
fpt: '*'
ghes: '*'
@@ -11,3 +13,4 @@ topics:
miniTocMaxHeadingLevel: 3
---
+{% data reusables.projects.projects-api %}
diff --git a/translations/zh-CN/content/rest/projects/collaborators.md b/translations/zh-CN/content/rest/projects/collaborators.md
index 1c484a9650..ef37bab59f 100644
--- a/translations/zh-CN/content/rest/projects/collaborators.md
+++ b/translations/zh-CN/content/rest/projects/collaborators.md
@@ -1,6 +1,8 @@
---
-title: 协作者
-intro: 此 API 允许您与组织的项目进行交互。
+title: 项目板协作者
+shortTitle: 协作者
+allowTitleToDifferFromFilename: true
+intro: 项目板协作者 API 允许您管理项目板上的协作者。
versions:
fpt: '*'
ghes: '*'
@@ -11,3 +13,4 @@ topics:
miniTocMaxHeadingLevel: 3
---
+{% data reusables.projects.projects-api %}
diff --git a/translations/zh-CN/content/rest/projects/columns.md b/translations/zh-CN/content/rest/projects/columns.md
index 62ab6674c7..c0ea4b5e0c 100644
--- a/translations/zh-CN/content/rest/projects/columns.md
+++ b/translations/zh-CN/content/rest/projects/columns.md
@@ -1,6 +1,8 @@
---
-title: 列
-intro: ''
+title: 项目板列
+shortTitle: 列
+allowTitleToDifferFromFilename: true
+intro: 项目板列 API 允许您在项目板上创建和管理列。
versions:
fpt: '*'
ghes: '*'
@@ -11,3 +13,4 @@ topics:
miniTocMaxHeadingLevel: 3
---
+{% data reusables.projects.projects-api %}
diff --git a/translations/zh-CN/content/rest/projects/projects.md b/translations/zh-CN/content/rest/projects/projects.md
index 7367dd5a72..afb123e116 100644
--- a/translations/zh-CN/content/rest/projects/projects.md
+++ b/translations/zh-CN/content/rest/projects/projects.md
@@ -1,6 +1,8 @@
---
-title: 项目
-intro: Projects API 允许您在仓库中创建、列出、更新、删除和自定义项目。
+title: 项目板
+shortTitle: 板
+allowTitleToDifferFromFilename: true
+intro: 项目板 API 允许您在存储库中创建和管理项目。
versions:
fpt: '*'
ghes: '*'
@@ -11,3 +13,4 @@ topics:
miniTocMaxHeadingLevel: 3
---
+{% data reusables.projects.projects-api %}
diff --git a/translations/zh-CN/content/rest/pulls/comments.md b/translations/zh-CN/content/rest/pulls/comments.md
index bce6dd2b38..8f88ed34ec 100644
--- a/translations/zh-CN/content/rest/pulls/comments.md
+++ b/translations/zh-CN/content/rest/pulls/comments.md
@@ -1,6 +1,7 @@
---
-title: Review Comments
-intro: 拉取请求审查评论是在拉取请求审查期间对统一差异的一部分所发表的评论。
+title: 拉取请求审查评论
+shortTitle: 审查评论
+intro: ''
versions:
fpt: '*'
ghes: '*'
@@ -12,7 +13,9 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
-提交评论和议题评论不同于拉取请求审查评论。 将提交评论直接应用于提交,然后应用议题评论而不引用统一差异的一部分。 更多信息请参阅“[创建提交评论](/rest/reference/commits#create-a-commit-comment)”和“[创建议题评论](/rest/reference/issues#create-an-issue-comment)”。
+## 关于拉取请求审查评论 API
+
+拉取请求审查评论是在拉取请求审查期间对统一差异的一部分所发表的评论。 提交评论和议题评论不同于拉取请求审查评论。 将提交评论直接应用于提交,然后应用议题评论而不引用统一差异的一部分。 更多信息请参阅“[创建提交评论](/rest/reference/commits#create-a-commit-comment)”和“[创建议题评论](/rest/reference/issues#create-an-issue-comment)”。
### 拉取请求审查评论的自定义媒体类型
diff --git a/translations/zh-CN/content/rest/pulls/pulls.md b/translations/zh-CN/content/rest/pulls/pulls.md
index 7c1ec98630..9c47735563 100644
--- a/translations/zh-CN/content/rest/pulls/pulls.md
+++ b/translations/zh-CN/content/rest/pulls/pulls.md
@@ -11,6 +11,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于拉取 API
+
拉取请求 API 允许您列出、查看、编辑、创建甚至合并拉取请求。 可以通过[议题评论 API](/rest/reference/issues#comments) 管理对拉取请求的评论。
每个拉取请求都是一个议题,但并非每个议题都是拉取请求。 因此,在[议题 API](/rest/reference/issues) 中为这两项功能提供了“共享”操作,如操作受理人、标签和里程碑。
diff --git a/translations/zh-CN/content/rest/pulls/review-requests.md b/translations/zh-CN/content/rest/pulls/review-requests.md
index a0f3c301f8..6b74f87f55 100644
--- a/translations/zh-CN/content/rest/pulls/review-requests.md
+++ b/translations/zh-CN/content/rest/pulls/review-requests.md
@@ -1,5 +1,5 @@
---
-title: Review Requests
+title: 审查请求
intro: ''
versions:
fpt: '*'
@@ -11,4 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于审查请求 API
+
拉取请求作者以及仓库所有者和协作者可以向具有仓库写入权限的任何人请求拉取请求审查。 每个被请求的审查者将收到您要求他们审查拉取请求的通知。
diff --git a/translations/zh-CN/content/rest/pulls/reviews.md b/translations/zh-CN/content/rest/pulls/reviews.md
index 56bfad71f6..193b97d201 100644
--- a/translations/zh-CN/content/rest/pulls/reviews.md
+++ b/translations/zh-CN/content/rest/pulls/reviews.md
@@ -1,6 +1,8 @@
---
-title: 审查
-intro: 'Pull Request Reviews are groups of Pull Request Review Comments on the Pull Request, grouped together with a state and optional body comment.'
+title: 拉取请求审查
+shortTitle: 审查
+allowTitleToDifferFromFilename: true
+intro: ''
versions:
fpt: '*'
ghes: '*'
@@ -11,3 +13,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于拉取请求审查 API
+
+拉取请求审查是拉取拉取请求审查评论组,与状态和可选正文评论组合在一起。
diff --git a/translations/zh-CN/content/rest/rate-limit.md b/translations/zh-CN/content/rest/rate-limit.md
index 2b666b6311..10911ff3c7 100644
--- a/translations/zh-CN/content/rest/rate-limit.md
+++ b/translations/zh-CN/content/rest/rate-limit.md
@@ -1,6 +1,6 @@
---
title: 速率限制
-intro: 'With the Rate limit API, you can check the current rate limit status of various REST APIs.'
+intro: 使用速率限制 API,您可以检查各种 REST API 的当前速率限制状态。
versions:
fpt: '*'
ghes: '*'
@@ -13,7 +13,7 @@ redirect_from:
- /rest/reference/rate-limit
---
-## About the Rate limit API
+## 关于速率限制 API
REST API 概述文档描述了[速率限制规则](/rest/overview/resources-in-the-rest-api#rate-limiting)。 您可以随时使用下面描述的速率限制 API 来检查您当前的速率限制状态。
diff --git a/translations/zh-CN/content/rest/reactions.md b/translations/zh-CN/content/rest/reactions.md
index 5e6faf37d7..3807c1fb54 100644
--- a/translations/zh-CN/content/rest/reactions.md
+++ b/translations/zh-CN/content/rest/reactions.md
@@ -13,8 +13,8 @@ redirect_from:
- /rest/reference/reactions
---
-## About the Reactions API
+## 关于反应 API
-You can create and manage reactions on comments using the Reactions API. 创建反应时,`content` 参数的允许值如下(带有相应的表情符号供参考):
+您可以使用反应 API 创建和管理对评论的反应。 创建反应时,`content` 参数的允许值如下(带有相应的表情符号供参考):
{% data reusables.repositories.reaction_list %}
diff --git a/translations/zh-CN/content/rest/releases/assets.md b/translations/zh-CN/content/rest/releases/assets.md
index 76e08e8eb4..af7e99d9d2 100644
--- a/translations/zh-CN/content/rest/releases/assets.md
+++ b/translations/zh-CN/content/rest/releases/assets.md
@@ -1,5 +1,5 @@
---
-title: Release Assets
+title: 发布资产
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/releases/releases.md b/translations/zh-CN/content/rest/releases/releases.md
index 523962c37c..1644c2dc48 100644
--- a/translations/zh-CN/content/rest/releases/releases.md
+++ b/translations/zh-CN/content/rest/releases/releases.md
@@ -1,6 +1,6 @@
---
title: 版本发布
-intro: 'The Releases API allows you to create, modify, and delete releases and release assets.'
+intro: 发行版 API 允许您创建、修改和删除版本以及发布资产。
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/rest/repos/autolinks.md b/translations/zh-CN/content/rest/repos/autolinks.md
index a4a5f5779c..5553a658a0 100644
--- a/translations/zh-CN/content/rest/repos/autolinks.md
+++ b/translations/zh-CN/content/rest/repos/autolinks.md
@@ -1,5 +1,7 @@
---
-title: 自动链接
+title: 存储库自动链接
+allowTitleToDifferFromFilename: true
+shortTitle: 自动链接
intro: 为了帮助简化您的工作流程,您可以使用 API 向外部资源(如 JIRA 问题和 Zendesk 事件单)添加自动链接。
versions:
fpt: '*'
@@ -11,6 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于存储库自动链接 API
+
更多信息请参阅“[配置自动链接以引用外部资源](/github/administering-a-repository/configuring-autolinks-to-reference-external-resources)”。
{% data variables.product.prodname_github_apps %} 需要有读写权限的仓库管理权限才能使用 Autolinks API。
diff --git a/translations/zh-CN/content/rest/repos/contents.md b/translations/zh-CN/content/rest/repos/contents.md
index 79aba138f0..41e3042a20 100644
--- a/translations/zh-CN/content/rest/repos/contents.md
+++ b/translations/zh-CN/content/rest/repos/contents.md
@@ -1,5 +1,7 @@
---
-title: 内容
+title: 仓库内容
+allowTitleToDifferFromFilename: true
+shortTitle: 内容
intro: 此 API 端点允许您在仓库中创建、修改和删除 Base64 编码的内容。
versions:
fpt: '*'
@@ -11,6 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于存储库内容 API
+
要请求原始格式或渲染的 HTML(如果支持),请对仓库内容使用自定义媒体类型。
### 仓库内容的自定义媒体类型
diff --git a/translations/zh-CN/content/rest/repos/repos.md b/translations/zh-CN/content/rest/repos/repos.md
index 38a63fe80d..43ceabb223 100644
--- a/translations/zh-CN/content/rest/repos/repos.md
+++ b/translations/zh-CN/content/rest/repos/repos.md
@@ -1,6 +1,6 @@
---
title: 仓库
-intro: 'The Repos API allows to create, manage and control the workflow of public and private GitHub Enterprise Server repositories.'
+intro: ''
versions:
fpt: '*'
ghes: '*'
diff --git a/translations/zh-CN/content/rest/repos/tags.md b/translations/zh-CN/content/rest/repos/tags.md
index ec6686fd5d..edc09bc6be 100644
--- a/translations/zh-CN/content/rest/repos/tags.md
+++ b/translations/zh-CN/content/rest/repos/tags.md
@@ -1,9 +1,12 @@
---
-title: 标记
+title: 存储库标签
+allowTitleToDifferFromFilename: true
+shortTitle: 标记
intro: ''
versions:
fpt: '*'
ghec: '*'
+ ghes: '>3.4'
topics:
- API
miniTocMaxHeadingLevel: 3
diff --git a/translations/zh-CN/content/rest/scim.md b/translations/zh-CN/content/rest/scim.md
index c065c452ac..31327cda08 100644
--- a/translations/zh-CN/content/rest/scim.md
+++ b/translations/zh-CN/content/rest/scim.md
@@ -1,6 +1,6 @@
---
title: SCIM
-intro: You can control and manage your GitHub organization members access using SCIM API.
+intro: 您可以使用 SCIM API 控制和管理您的 GitHub 组织成员访问。
versions:
fpt: '*'
ghec: '*'
@@ -11,7 +11,7 @@ redirect_from:
- /rest/reference/scim
---
-## About the SCIM API
+## 关于 SCIM API
### 组织的 SCIM 预配
@@ -20,8 +20,8 @@ SCIM API 由 SCIM 启用的身份提供程序 (IdP) 用来自动预配 {% data v
{% note %}
**注意:**
- - The SCIM API is available only for individual organizations that use [{% data variables.product.prodname_ghe_cloud %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. 有关 SCIM 的详细信息,请参阅“[关于组织的 SCIM](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)”。
- - The SCIM API cannot be used with an enterprise account or with an {% data variables.product.prodname_emu_org %}.
+ - SCIM API 仅适用于使用启用了 [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) 的 [{% data variables.product.prodname_ghe_cloud %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) 的单个组织。 有关 SCIM 的详细信息,请参阅“[关于组织的 SCIM](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)”。
+ - SCIM API 不能与企业帐户或 {% data variables.product.prodname_emu_org %} 一起使用。
{% endnote %}
diff --git a/translations/zh-CN/content/rest/search.md b/translations/zh-CN/content/rest/search.md
index 104fb8a84a..cb34d3dce3 100644
--- a/translations/zh-CN/content/rest/search.md
+++ b/translations/zh-CN/content/rest/search.md
@@ -1,6 +1,6 @@
---
title: 搜索
-intro: 'The Search API lets you to search for specific items on {% data variables.product.product_name %}.'
+intro: '搜索 API 允许您在 {% data variables.product.product_name %} 上搜索特定项。'
versions:
fpt: '*'
ghes: '*'
@@ -13,7 +13,7 @@ redirect_from:
- /rest/reference/search
---
-## About the Search API
+## 关于搜索 API
搜索 API 可帮助您搜索要查找的特定条目。 例如,您可以在仓库中找到用户或特定文件。 就像您在 Google 上执行搜索一样。 它旨在帮助您找到要查找的一个或几个结果。 就像在 Google 上搜索一样,有时您希望查看几页搜索结果,以便找到最能满足您需求的条目。 为了满足这一需求, {% data variables.product.product_name %} 搜索 API **为每个搜索提供最多 1,000 个结果**。
diff --git a/translations/zh-CN/content/rest/secret-scanning.md b/translations/zh-CN/content/rest/secret-scanning.md
index d176be5653..f04857471e 100644
--- a/translations/zh-CN/content/rest/secret-scanning.md
+++ b/translations/zh-CN/content/rest/secret-scanning.md
@@ -1,6 +1,6 @@
---
title: 秘密扫描
-intro: Use the Secret scanning API to retrieve and update secret alerts from a repository.
+intro: 使用机密扫描 API 从存储库中检索和更新机密警报。
versions:
ghes: '*'
ghae: '*'
@@ -14,12 +14,12 @@ redirect_from:
{% data reusables.secret-scanning.api-beta %}
-## About the Secret scanning API
+## 关于机密扫描 API
{% data variables.product.prodname_secret_scanning %} API 可让您{% ifversion fpt or ghec or ghes > 3.1 or ghae %}:
-- Enable or disable {% data variables.product.prodname_secret_scanning %}{% if secret-scanning-push-protection %} and push protection{% endif %} for a repository. 更多信息请参阅“[存储库](/rest/reference/repos#update-a-repository)”,并展开 REST API 文档中的“`security_and_analysis` 对象的属性”部分。
-- Retrieve and update {% data variables.product.prodname_secret_scanning_GHAS %} alerts from a repository. For further details, see the sections below.
-{%- else %} retrieve and update {% data variables.product.prodname_secret_scanning %} alerts from a repository.{% endif %}
+- 启用或禁用仓库的 {% data variables.product.prodname_secret_scanning %}{% if secret-scanning-push-protection %} 和推送保护{% endif %}。 更多信息请参阅“[存储库](/rest/reference/repos#update-a-repository)”,并展开 REST API 文档中的“`security_and_analysis` 对象的属性”部分。
+- 从仓库中检索和更新 {% data variables.product.prodname_secret_scanning_GHAS %} 警报。 有关更多详细信息,请参阅以下部分。
+{%- else %} 从仓库检索和更新 {% data variables.product.prodname_secret_scanning %} 警报。{% endif %}
有关 {% data variables.product.prodname_secret_scanning %} 的更多信息,请参阅“[关于 {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/about-secret-scanning)”。
diff --git a/translations/zh-CN/content/rest/teams/discussion-comments.md b/translations/zh-CN/content/rest/teams/discussion-comments.md
index b4f72f8482..75fc46a6f8 100644
--- a/translations/zh-CN/content/rest/teams/discussion-comments.md
+++ b/translations/zh-CN/content/rest/teams/discussion-comments.md
@@ -1,6 +1,8 @@
---
-title: Discussion Comments
-intro: 'The team discussion comments API allows you to get, create, edit, and delete discussion comments on a [team discussion](/rest/reference/teams#discussions) post.'
+title: 团队讨论评论
+allowTitleToDifferFromFilename: true
+shortTitle: 讨论评论
+intro: '团队讨论评论 API 允许您在 [团队讨论] (/rest/reference/teams#discussions) 帖子上获取、创建、编辑和删除讨论评论。'
versions:
fpt: '*'
ghes: '*'
@@ -11,4 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
-团队[组织](/rest/reference/orgs)的任何成员都可以创建和阅读公共讨论上的评论。 更多信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions/)”。 此 API 仅适用于团队组织中经过身份验证的成员。
+## 关于团队讨论评论 API
+
+团队[组织](/rest/reference/orgs)的任何成员都可以创建和阅读公共讨论上的评论。 更多信息请参阅“[关于团队讨论](/organizations/collaborating-with-your-team/about-team-discussions/)”。
+
+{% data reusables.organizations.team-api %}
diff --git a/translations/zh-CN/content/rest/teams/discussions.md b/translations/zh-CN/content/rest/teams/discussions.md
index da528b9d5f..741ff794b1 100644
--- a/translations/zh-CN/content/rest/teams/discussions.md
+++ b/translations/zh-CN/content/rest/teams/discussions.md
@@ -1,6 +1,8 @@
---
-title: Discussions
-intro: 'The Team Discussions API allows you to get, create, edit, and delete discussion posts on a team''s page.'
+title: 团队讨论
+allowTitleToDifferFromFilename: true
+shortTitle: Discussions
+intro: 团队讨论 API 允许您获取、创建、编辑和删除团队页面上的讨论帖子。
versions:
fpt: '*'
ghes: '*'
@@ -11,4 +13,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
-您可以使用团队讨论进行不特定于存储库或项目的对话。 团队[组织](/rest/reference/orgs)的任何成员都可以创建和阅读公共讨论帖子。 更多信息请参阅“[关于团队讨论](//organizations/collaborating-with-your-team/about-team-discussions/)”。 要详细了解对讨论帖子的评论,请参阅[团队讨论评论 API](/rest/reference/teams#discussion-comments)。 此 API 仅适用于团队组织中经过身份验证的成员。
+## 关于团队讨论 API
+
+您可以使用团队讨论进行不特定于存储库或项目的对话。 团队[组织](/rest/reference/orgs)的任何成员都可以创建和阅读公共讨论帖子。 更多信息请参阅“[关于团队讨论](//organizations/collaborating-with-your-team/about-team-discussions/)”。 要详细了解对讨论帖子的评论,请参阅[团队讨论评论 API](/rest/reference/teams#discussion-comments)。
+
+{% data reusables.organizations.team-api %}
diff --git a/translations/zh-CN/content/rest/teams/external-groups.md b/translations/zh-CN/content/rest/teams/external-groups.md
index 688a0ea320..0fa02a12f7 100644
--- a/translations/zh-CN/content/rest/teams/external-groups.md
+++ b/translations/zh-CN/content/rest/teams/external-groups.md
@@ -1,6 +1,6 @@
---
-title: External Groups
-intro: 外部组 API 允许您查看可用于组织的外部身份提供程序组,并管理组织中外部组和团队之间的连接。
+title: 外部组
+intro: 外部组 API 允许您查看可用于组织的外部标识提供者组,并管理组织中外部组和团队之间的连接。
versions:
fpt: '*'
ghae: '*'
@@ -10,6 +10,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于外部组 API
+
要使用此 API,经过身份验证的用户必须是团队维护员或与团队关联的组织的所有者。
{% ifversion ghec %}
diff --git a/translations/zh-CN/content/rest/teams/members.md b/translations/zh-CN/content/rest/teams/members.md
index 863d908d62..e362db7a03 100644
--- a/translations/zh-CN/content/rest/teams/members.md
+++ b/translations/zh-CN/content/rest/teams/members.md
@@ -1,5 +1,7 @@
---
-title: 成员
+title: 团队成员
+allowTitleToDifferFromFilename: true
+shortTitle: 成员
intro: ''
versions:
fpt: '*'
@@ -11,7 +13,9 @@ topics:
miniTocMaxHeadingLevel: 3
---
-此 API 仅适用于团队组织中经过身份验证的成员。 OAuth 访问令牌需要 `read:org` [scope](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/)。
+## 关于团队成员 API
+
+{% data reusables.organizations.team-api %}
{% ifversion fpt or ghes or ghec %}
{% note %}
diff --git a/translations/zh-CN/content/rest/teams/team-sync.md b/translations/zh-CN/content/rest/teams/team-sync.md
index 27c49b7350..e8c1b9597a 100644
--- a/translations/zh-CN/content/rest/teams/team-sync.md
+++ b/translations/zh-CN/content/rest/teams/team-sync.md
@@ -1,5 +1,5 @@
---
-title: Team Synchronization
+title: 团队同步
intro: '团队同步 API 允许您管理 {% data variables.product.product_name %} 团队与外部身份提供程序 (IdP) 组之间的连接。'
versions:
fpt: '*'
@@ -10,6 +10,8 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
+## 关于团队同步 API
+
要使用此 API,经过身份验证的用户必须是团队维护员或与团队关联的组织的所有者。 用于身份验证的令牌还需要获得授权才能与 IdP (SSO) 提供程序一起使用。 更多信息请参阅“授权个人访问令牌用于 SAML 单点登录组织”。
您可以通过 IdP 通过团队同步管理 GitHub 团队成员。 必须启用团队同步才能使用团队同步 API。 更多信息请参阅“在身份提供程序与 GitHub 之间同步团队”。
diff --git a/translations/zh-CN/content/rest/teams/teams.md b/translations/zh-CN/content/rest/teams/teams.md
index eda17a24e3..3fcd6b260c 100644
--- a/translations/zh-CN/content/rest/teams/teams.md
+++ b/translations/zh-CN/content/rest/teams/teams.md
@@ -1,6 +1,6 @@
---
title: 团队
-intro: 'With the Teams API, you can create and manage teams in your GitHub organization.'
+intro: 通过团队 API,您可以在您的 GitHub 组织中创建和管理团队。
versions:
fpt: '*'
ghes: '*'
@@ -11,4 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-此 API 仅适用于团队[组织](/rest/reference/orgs)中经过身份验证的成员。 OAuth 访问令牌需要 `read:org` [scope](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/)。 {% data variables.product.prodname_dotcom %} 从团队 `name` 生成团队的 `slug`。
+## 关于团队 API
+
+{% data reusables.organizations.team-api %}
diff --git a/translations/zh-CN/content/rest/users/blocking.md b/translations/zh-CN/content/rest/users/blocking.md
index 78f25ec240..5299082ff2 100644
--- a/translations/zh-CN/content/rest/users/blocking.md
+++ b/translations/zh-CN/content/rest/users/blocking.md
@@ -1,5 +1,5 @@
---
-title: Blocking Users
+title: 阻止用户
intro: ''
versions:
fpt: '*'
@@ -10,3 +10,6 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
+## 关于阻止用户 API
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/users/emails.md b/translations/zh-CN/content/rest/users/emails.md
index 0b117d7e08..ad983200bd 100644
--- a/translations/zh-CN/content/rest/users/emails.md
+++ b/translations/zh-CN/content/rest/users/emails.md
@@ -10,4 +10,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于电子邮件 API
+
通过 API 管理电子邮件地址要求您通过基本身份验证进行验证,或者使用端点的正确范围通过 OAuth 进行身份验证。
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/users/followers.md b/translations/zh-CN/content/rest/users/followers.md
index 27eac5e0c1..20728a35ce 100644
--- a/translations/zh-CN/content/rest/users/followers.md
+++ b/translations/zh-CN/content/rest/users/followers.md
@@ -11,3 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于关注者 API
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/users/gpg-keys.md b/translations/zh-CN/content/rest/users/gpg-keys.md
index b1297ddffa..0c870fd4ed 100644
--- a/translations/zh-CN/content/rest/users/gpg-keys.md
+++ b/translations/zh-CN/content/rest/users/gpg-keys.md
@@ -1,5 +1,5 @@
---
-title: GPG Keys
+title: GPG 密钥
intro: ''
versions:
fpt: '*'
@@ -11,4 +11,8 @@ topics:
miniTocMaxHeadingLevel: 3
---
+## 关于用户 GPG 密钥 API
+
在 `public_key` 响应字段中返回的数据不是 GPG 格式化的密钥。 当用户上传 GPG 密钥时,将对密钥进行剖析,然后提取并存储加密公钥。 此加密密钥是本页面上的 API 所返回的密钥。 此密钥不适合直接用于 GPG 等程序。
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/users/keys.md b/translations/zh-CN/content/rest/users/keys.md
index c0383ea886..ae3e0d3d20 100644
--- a/translations/zh-CN/content/rest/users/keys.md
+++ b/translations/zh-CN/content/rest/users/keys.md
@@ -1,5 +1,5 @@
---
-title: Git SSH Keys
+title: Git SSH 密钥
intro: ''
versions:
fpt: '*'
@@ -12,3 +12,6 @@ miniTocMaxHeadingLevel: 3
allowTitleToDifferFromFilename: true
---
+## 关于用户 Git SSH 密钥 API
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/users/users.md b/translations/zh-CN/content/rest/users/users.md
index 107e27c9bd..5df1790ead 100644
--- a/translations/zh-CN/content/rest/users/users.md
+++ b/translations/zh-CN/content/rest/users/users.md
@@ -11,4 +11,6 @@ topics:
miniTocMaxHeadingLevel: 3
---
-用户 API 上的许多资源提供了快捷方式,可用于获取有关当前经过身份验证的用户的信息。 如果请求 URL 不含 `{username}` 参数,则响应将是登录用户的响应(您必须随请求传递[身份验证信息](/rest/overview/resources-in-the-rest-api#authentication))。{% ifversion fpt or ghes or ghec %} 在通过基本身份验证或作用域为 `user` 的 OAuth 进行身份验证时,将包含其他私有信息,例如用户是否启用双重身份验证。{% endif %}
+## 关于用户 API
+
+{% data reusables.user-settings.user-api %}
diff --git a/translations/zh-CN/content/rest/webhooks/repo-config.md b/translations/zh-CN/content/rest/webhooks/repo-config.md
index 889e95cdb8..8a1eeb9ba0 100644
--- a/translations/zh-CN/content/rest/webhooks/repo-config.md
+++ b/translations/zh-CN/content/rest/webhooks/repo-config.md
@@ -1,5 +1,5 @@
---
-title: Repository Webhook Configuration
+title: 存储库 web 挂钩配置
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/webhooks/repo-deliveries.md b/translations/zh-CN/content/rest/webhooks/repo-deliveries.md
index ae159e14a5..a70802f2bf 100644
--- a/translations/zh-CN/content/rest/webhooks/repo-deliveries.md
+++ b/translations/zh-CN/content/rest/webhooks/repo-deliveries.md
@@ -1,5 +1,5 @@
---
-title: Repository Webhook Deliveries
+title: 存储库 web 挂钩交付
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/rest/webhooks/repos.md b/translations/zh-CN/content/rest/webhooks/repos.md
index 55bc892fc3..34d2390270 100644
--- a/translations/zh-CN/content/rest/webhooks/repos.md
+++ b/translations/zh-CN/content/rest/webhooks/repos.md
@@ -1,5 +1,5 @@
---
-title: Repository Webhooks
+title: 仓库 web 挂钩
intro: ''
versions:
fpt: '*'
diff --git a/translations/zh-CN/content/search-github/searching-on-github/searching-discussions.md b/translations/zh-CN/content/search-github/searching-on-github/searching-discussions.md
index 5fec6fc15f..4bef4d52be 100644
--- a/translations/zh-CN/content/search-github/searching-on-github/searching-discussions.md
+++ b/translations/zh-CN/content/search-github/searching-on-github/searching-discussions.md
@@ -78,24 +78,6 @@ redirect_from:
| comments:n | [**comments:>100**](https://github.com/search?q=comments%3A%3E100&type=Discussions) 匹配超过 100 条评论的讨论。 |
| | [**comments:500..1000**](https://github.com/search?q=comments%3A500..1000&type=Discussions) 匹配具有 500 到 1,000 条评论的讨论。 |
-## 按交互数量搜索
-
-您可以使用 `interactions` 限定符以及大于、小于和范围限定符按交互数量过滤讨论。 交互数量是对讨论的反应和评论数量。 更多信息请参阅“[了解搜索语法](/github/searching-for-information-on-github/understanding-the-search-syntax)”。
-
-| 限定符 | 示例 |
-|:------------------------- |:------------------------------------------------------------------------------------------------------------- |
-| interactions:n | [** interactions:>2000**](https://github.com/search?q=interactions%3A%3E2000) 匹配超过 2,000 个交互的讨论。 |
-| | [**interactions:500..1000**](https://github.com/search?q=interactions%3A500..1000) 匹配 500 至 1,000 个交互的讨论。 |
-
-## 按反应数量搜索
-
-您可以使用 `reactions` 限定符以及大于、小于和范围限定符按反应数量过滤讨论。 更多信息请参阅“[了解搜索语法](/github/searching-for-information-on-github/understanding-the-search-syntax)”。
-
-| 限定符 | 示例 |
-|:------------------------- |:---------------------------------------------------------------------------------------------------- |
-| reactions:n | [** reactions:>1000**](https://github.com/search?q=reactions%3A%3E500) 匹配超过 500 个反应的讨论。 |
-| | [**reactions:500..1000**](https://github.com/search?q=reactions%3A500..1000) 匹配 500 至 1,000 个反应的讨论。 |
-
## 按讨论创建或上次更新时间搜索
您可以基于创建时间或上次更新时间过滤讨论。 对于讨论创建,您可以使用 `created` 限定符;要了解讨论上次更新的时间,请使用 `updated` 限定符。
@@ -104,9 +86,9 @@ redirect_from:
{% data reusables.search.date_gt_lt %}
-| 限定符 | 示例 |
-|:-------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| created:YYYY-MM-DD | [**created:>2020-11-15**](https://github.com/search?q=created%3A%3E%3D2020-11-15&type=discussions) 匹配 2020 年 11 月 15 日之后创建的讨论。 |
+| 限定符 | 示例 |
+|:------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| created:YYYY-MM-DD | [**created:>2020-11-15**](https://github.com/search?q=created%3A%3E%3D2020-11-15&type=discussions) 匹配 2020 年 11 月 15 日之后创建的讨论。 |
| updated:YYYY-MM-DD | [**weird in:body updated:>=2020-02-01**](https://github.com/search?q=weird+in%3Abody+updated%3A%3E%3D2020-12-01&type=Discussions) 匹配 2020 年 12 月之后更新的正文中含有单词 "weird" 的讨论。 |
## 延伸阅读
diff --git a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization.md b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization.md
index 64c330553a..abdfe897f6 100644
--- a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization.md
+++ b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-organization.md
@@ -73,8 +73,6 @@ shortTitle: 为组织设置
{% data reusables.sponsors.tax-form-information-org %}
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
-{% data reusables.sponsors.settings-tab %}
-{% data reusables.sponsors.country-of-residence %}
{% data reusables.sponsors.overview-tab %}
{% data reusables.sponsors.tax-form-link %}
@@ -90,5 +88,6 @@ shortTitle: 为组织设置
{% data reusables.sponsors.github-review-app %}
## 延伸阅读
+
- "[关于 {% data variables.product.prodname_sponsors %}](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)"
- "[通过 {% data variables.product.prodname_sponsors %} 接受赞助](/sponsors/receiving-sponsorships-through-github-sponsors)"
diff --git a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-user-account.md b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-user-account.md
index 54bfe7712b..51bd1d836b 100644
--- a/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-user-account.md
+++ b/translations/zh-CN/content/sponsors/receiving-sponsorships-through-github-sponsors/setting-up-github-sponsors-for-your-user-account.md
@@ -70,8 +70,6 @@ shortTitle: 设置个人帐户
{% data reusables.sponsors.tax-form-information-dev %}
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
-{% data reusables.sponsors.settings-tab %}
-{% data reusables.sponsors.country-of-residence %}
{% data reusables.sponsors.overview-tab %}
{% data reusables.sponsors.tax-form-link %}
diff --git a/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md b/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
index b6d5e1071a..e1409be088 100644
--- a/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
+++ b/translations/zh-CN/content/support/learning-about-github-support/about-github-premium-support.md
@@ -49,7 +49,7 @@ There are two {% data variables.contact.premium_support %} plans: Premium and Pr
| Members with support entitlements | 10 | 25 |
| Resources | Priority ticket handling | - Priority ticket handling
- Named Customer Reliability Engineer
|
| Scheduled checks| Bi-annual health check and reporting | - Quarterly health check and reporting
- Quarterly account reviews
|
-| Administration assistance| | 4 hours per month |
+| Administration assistance| None | 4 hours per month |
{% note %}
diff --git a/translations/zh-CN/data/features/README.md b/translations/zh-CN/data/features/README.md
index 69b4ba1bc2..615195bd9d 100644
--- a/translations/zh-CN/data/features/README.md
+++ b/translations/zh-CN/data/features/README.md
@@ -45,7 +45,7 @@ versions:
## 架构执行
-The schema for validating the feature versioning lives in [`tests/helpers/schemas/feature-versions-schema.js`](/tests/helpers/schemas/feature-versions-schema.js) and is exercised by [`tests/linting/lint-files.js`](/tests/linting/lint-files.js).
+验证功能版本管理的架构位于 [`tests/helpers/schemas/feature-versions-schema.js`](/tests/helpers/schemas/feature-versions-schema.js) 中,通过 [`tests/linting/lint-files.js`](/tests/linting/lint-files.js) 执行。
## 删除功能标签的脚本
diff --git a/translations/zh-CN/data/features/actions-cache-policy-apis.yml b/translations/zh-CN/data/features/actions-cache-policy-apis.yml
new file mode 100644
index 0000000000..808618d84d
--- /dev/null
+++ b/translations/zh-CN/data/features/actions-cache-policy-apis.yml
@@ -0,0 +1,6 @@
+---
+#Reference: #6456
+#APIs to set default and max cache sizes. Only for GHES.
+versions:
+ ghes: '>=3.5'
+ ghae: 'issue-6456'
diff --git a/translations/zh-CN/data/features/actions-caching.yml b/translations/zh-CN/data/features/actions-caching.yml
new file mode 100644
index 0000000000..6b1eea54a7
--- /dev/null
+++ b/translations/zh-CN/data/features/actions-caching.yml
@@ -0,0 +1,8 @@
+---
+#Reference: #6456
+#General versioning for caching feature for Actions, newly added to GHES in 3.5
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>=3.5'
+ ghae: 'issue-6456'
diff --git a/translations/zh-CN/data/features/actions-inherit-secrets-reusable-workflows.yml b/translations/zh-CN/data/features/actions-inherit-secrets-reusable-workflows.yml
new file mode 100644
index 0000000000..1a80448cb4
--- /dev/null
+++ b/translations/zh-CN/data/features/actions-inherit-secrets-reusable-workflows.yml
@@ -0,0 +1,8 @@
+---
+#Reference: #6920
+#Documentation for inheriting secrets from the calling workflow
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>= 3.6'
+ ghae:
diff --git a/translations/zh-CN/data/features/actions-job-summaries.yml b/translations/zh-CN/data/features/actions-job-summaries.yml
new file mode 100644
index 0000000000..d2624aeafc
--- /dev/null
+++ b/translations/zh-CN/data/features/actions-job-summaries.yml
@@ -0,0 +1,8 @@
+---
+#Reference: #6405
+#Documentation for job summaries for jobs on the workflow run summary page.
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>3.5'
+ ghae: 'issue-6405'
diff --git a/translations/zh-CN/data/features/custom-repository-roles.yml b/translations/zh-CN/data/features/custom-repository-roles.yml
new file mode 100644
index 0000000000..c487dad981
--- /dev/null
+++ b/translations/zh-CN/data/features/custom-repository-roles.yml
@@ -0,0 +1,5 @@
+---
+versions:
+ ghec: '*'
+ ghes: '>=3.5'
+ ghae: 'issue-6271'
diff --git a/translations/zh-CN/data/features/for-you-feed.yml b/translations/zh-CN/data/features/for-you-feed.yml
index accb79a00c..aee851bee7 100644
--- a/translations/zh-CN/data/features/for-you-feed.yml
+++ b/translations/zh-CN/data/features/for-you-feed.yml
@@ -4,3 +4,4 @@
versions:
fpt: '*'
ghec: '*'
+ ghes: '>=3.5'
diff --git a/translations/zh-CN/data/features/ip-exception-list.yml b/translations/zh-CN/data/features/ip-exception-list.yml
new file mode 100644
index 0000000000..a6aacf815c
--- /dev/null
+++ b/translations/zh-CN/data/features/ip-exception-list.yml
@@ -0,0 +1,3 @@
+---
+versions:
+ ghes: '>=3.5'
diff --git a/translations/zh-CN/data/features/restrict-pushes-create-branch.yml b/translations/zh-CN/data/features/restrict-pushes-create-branch.yml
new file mode 100644
index 0000000000..2ddfa5adc3
--- /dev/null
+++ b/translations/zh-CN/data/features/restrict-pushes-create-branch.yml
@@ -0,0 +1,8 @@
+---
+#Issue 6045
+#Restrict pushes that create matching branches option, within branch restrictions
+versions:
+ fpt: '*'
+ ghec: '*'
+ ghes: '>=3.6'
+ ghae: 'issue-6045'
diff --git a/translations/zh-CN/data/features/server-statistics.yml b/translations/zh-CN/data/features/server-statistics.yml
new file mode 100644
index 0000000000..8b17527b8a
--- /dev/null
+++ b/translations/zh-CN/data/features/server-statistics.yml
@@ -0,0 +1,5 @@
+---
+#Reference #6677
+#Documentation for GitHub Enterprise Server Statistics
+versions:
+ ghes: '>=3.5'
diff --git a/translations/zh-CN/data/glossaries/README.md b/translations/zh-CN/data/glossaries/README.md
index f8be75a360..835f0fd509 100644
--- a/translations/zh-CN/data/glossaries/README.md
+++ b/translations/zh-CN/data/glossaries/README.md
@@ -3,6 +3,6 @@
下列文件包含我们的 [Crowdin 词汇表](https://support.crowdin.com/glossary/):
* `external.yml` 包含面向客户的词汇条目。
- * Strings within `external.yml` support Liquid conditionals. See [contributing/liquid-helpers.md](/contributing/liquid-helpers.md).
+ * `external.yml` 中的字符串支持 Liquid 条件。 请参阅 [contributing/liquid-helpers.md](/contributing/liquid-helpers.md)。
* `internal.yml` 包含仅供译员使用的条目。 这些术语显示在 Crowdin UI 中,为译员提供关于所翻译内容的附加上下文信息,以及相应术语的推荐本地化字符串。
* `candidates.yml` 包含可能位于内部或外部词汇表中但尚未定义的术语。
diff --git a/translations/zh-CN/data/glossaries/external.yml b/translations/zh-CN/data/glossaries/external.yml
index 427d554553..b3f79dca19 100644
--- a/translations/zh-CN/data/glossaries/external.yml
+++ b/translations/zh-CN/data/glossaries/external.yml
@@ -596,7 +596,7 @@
-
term: 存储库缓存
description: >-
- A read-only mirror of repositories for your GitHub Enterprise server instance, located near distributed teams and CI clients.
+ GitHub Enterprise 服务器实例的存储库只读镜像,位于分布式团队和 CI 客户端附近。
-
term: 仓库图
description: 仓库数据的可视表现形式。
diff --git a/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
index 9204af5e65..2f865df518 100644
--- a/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
+++ b/translations/zh-CN/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
@@ -58,22 +58,22 @@ upcoming_changes:
owner: synthead
-
location: Repository.defaultMergeQueue
- description: '`defaultMergeQueue` will be removed. Use `Repository.mergeQueue` instead.'
- reason: '`defaultMergeQueue` will be removed.'
+ description: '“defaultMergeQueue” 将被删除。请改用 “Repository.mergeQueue”。'
+ reason: '`defaultMergeQueue` 将被删除。'
date: '2022-04-01'
criticality: 重大
owner: colinshum
-
location: AddPullRequestToMergeQueueInput.branch
- description: '`branch` will be removed.'
- reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+ description: '`branch` 将被删除。'
+ reason: PR 被添加到基本分支的合并队列中,`branch` 参数现在是 no-op
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jhunschejones
-
location: Enterprise.userAccounts
- description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
- reason: The `Enterprise.userAccounts` field is being removed.
+ description: '`userAccounts` 将被删除。使用 `Enterprise.members` 字段代替。'
+ reason: '`Enterprise.userAccounts` 字段被删除。'
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jdennes
diff --git a/translations/zh-CN/data/graphql/ghec/graphql_previews.yml b/translations/zh-CN/data/graphql/ghec/graphql_previews.yml
index 79d4ea55fc..89116807ef 100644
--- a/translations/zh-CN/data/graphql/ghec/graphql_previews.yml
+++ b/translations/zh-CN/data/graphql/ghec/graphql_previews.yml
@@ -29,7 +29,7 @@
- '@github/c2c-actions-service'
-
title: >-
- >- MergeInfoPreview - More detailed information about a pull request's merge state.
+ >- MergeInfoPreview - 有关拉取请求合并状态的更多详细信息。
description: >-
此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
toggled_by: ':merge-info-preview'
diff --git a/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml b/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml
index 8a97d9adc7..e467482ea9 100644
--- a/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml
+++ b/translations/zh-CN/data/graphql/ghec/graphql_upcoming_changes.public.yml
@@ -72,36 +72,36 @@ upcoming_changes:
owner: synthead
-
location: Repository.defaultMergeQueue
- description: '`defaultMergeQueue` will be removed. Use `Repository.mergeQueue` instead.'
- reason: '`defaultMergeQueue` will be removed.'
+ description: '“defaultMergeQueue” 将被删除。请改用 “Repository.mergeQueue”。'
+ reason: '`defaultMergeQueue` 将被删除。'
date: '2022-04-01'
criticality: 重大
owner: colinshum
-
location: AddPullRequestToMergeQueueInput.branch
- description: '`branch` will be removed.'
- reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+ description: '`branch` 将被删除。'
+ reason: PR 被添加到基本分支的合并队列中,`branch` 参数现在是 no-op
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jhunschejones
-
location: Enterprise.userAccounts
- description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
- reason: The `Enterprise.userAccounts` field is being removed.
+ description: '`userAccounts` 将被删除。使用 `Enterprise.members` 字段代替。'
+ reason: '`Enterprise.userAccounts` 字段被删除。'
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jdennes
-
location: Query.sponsorables.dependencyEcosystem
- description: '`dependencyEcosystem` will be removed. Use the ecosystem argument instead.'
- reason: The type is switching from SecurityAdvisoryEcosystem to DependencyGraphEcosystem.
+ description: '`dependencyEcosystem` 将被删除。使用 ecosystem 参数代替。'
+ reason: 该类型是从 SecurityAdvisoryEcosystem 切换到 DependencyGraphEcosystem。
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: cheshire137
-
location: UpdateProjectNextItemFieldInput.fieldWithSettingId
- description: '`fieldWithSettingId` will be removed. Use `fieldConstraintId` instead'
- reason: Renamed to fieldConstraintId to improve naming consistency.
+ description: '`fieldWithSettingId` 将被删除。使用 `fieldConstraintId` 代替'
+ reason: 重命名为 fieldConstraintId 以提高命名一致性。
date: '2022-10-01T00:00:00+00:00'
criticality: 重大
owner: memex
diff --git a/translations/zh-CN/data/graphql/ghes-3.2/graphql_previews.enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.2/graphql_previews.enterprise.yml
index 852e9ed629..406a817bed 100644
--- a/translations/zh-CN/data/graphql/ghes-3.2/graphql_previews.enterprise.yml
+++ b/translations/zh-CN/data/graphql/ghes-3.2/graphql_previews.enterprise.yml
@@ -29,7 +29,7 @@
- '@github/c2c-actions-service'
-
title: >-
- >- MergeInfoPreview - More detailed information about a pull request's merge state.
+ >- MergeInfoPreview - 有关拉取请求合并状态的更多详细信息。
description: >-
此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
toggled_by: ':merge-info-preview'
diff --git a/translations/zh-CN/data/graphql/ghes-3.3/graphql_previews.enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.3/graphql_previews.enterprise.yml
index 852e9ed629..406a817bed 100644
--- a/translations/zh-CN/data/graphql/ghes-3.3/graphql_previews.enterprise.yml
+++ b/translations/zh-CN/data/graphql/ghes-3.3/graphql_previews.enterprise.yml
@@ -29,7 +29,7 @@
- '@github/c2c-actions-service'
-
title: >-
- >- MergeInfoPreview - More detailed information about a pull request's merge state.
+ >- MergeInfoPreview - 有关拉取请求合并状态的更多详细信息。
description: >-
此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
toggled_by: ':merge-info-preview'
diff --git a/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml
index a304950c11..ed8e6ac6b1 100644
--- a/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml
+++ b/translations/zh-CN/data/graphql/ghes-3.4/graphql_previews.enterprise.yml
@@ -29,7 +29,7 @@
- '@github/c2c-actions-service'
-
title: >-
- >- MergeInfoPreview - More detailed information about a pull request's merge state.
+ >- MergeInfoPreview - 有关拉取请求合并状态的更多详细信息。
description: >-
此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
toggled_by: ':merge-info-preview'
diff --git a/translations/zh-CN/data/graphql/ghes-3.5/graphql_previews.enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.5/graphql_previews.enterprise.yml
new file mode 100644
index 0000000000..ed8e6ac6b1
--- /dev/null
+++ b/translations/zh-CN/data/graphql/ghes-3.5/graphql_previews.enterprise.yml
@@ -0,0 +1,124 @@
+---
+-
+ title: 使用包版本删除
+ description: >-
+ 此预览支持允许删除私有包版本 DeletePackageVersion 突变。
+ toggled_by: ':package-deletes-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.deletePackageVersion
+ owning_teams:
+ - '@github/pe-package-registry'
+-
+ title: 部署
+ description: >-
+ 此预览支持部署突变和新部署功能。
+ toggled_by: ':flash-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - DeploymentStatus.environment
+ - Mutation.createDeploymentStatus
+ - CreateDeploymentStatusInput
+ - CreateDeploymentStatusPayload
+ - Mutation.createDeployment
+ - CreateDeploymentInput
+ - CreateDeploymentPayload
+ owning_teams:
+ - '@github/c2c-actions-service'
+-
+ title: >-
+ >- MergeInfoPreview - 有关拉取请求合并状态的更多详细信息。
+ description: >-
+ 此预览支持访问提供有关拉取请求合并状态的更多详细信息的字段。
+ toggled_by: ':merge-info-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - PullRequest.canBeRebased
+ - PullRequest.mergeStateStatus
+ owning_teams:
+ - '@github/pe-pull-requests'
+-
+ title: UpdateRefsPreview - 在单个操作中更新多个 ref。
+ description: 此预览支持在单个操作中更新多个 ref。
+ toggled_by: ':update-refs-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.updateRefs
+ - GitRefname
+ - RefUpdate
+ - UpdateRefsInput
+ - UpdateRefsPayload
+ owning_teams:
+ - '@github/reponauts'
+-
+ title: 项目事件详细信息
+ description: >-
+ 此预览将项目、项目卡和项目列详细信息添加到与项目相关的议题事件。
+ toggled_by: ':starfox-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - AddedToProjectEvent.project
+ - AddedToProjectEvent.projectCard
+ - AddedToProjectEvent.projectColumnName
+ - ConvertedNoteToIssueEvent.project
+ - ConvertedNoteToIssueEvent.projectCard
+ - ConvertedNoteToIssueEvent.projectColumnName
+ - MovedColumnsInProjectEvent.project
+ - MovedColumnsInProjectEvent.projectCard
+ - MovedColumnsInProjectEvent.projectColumnName
+ - MovedColumnsInProjectEvent.previousProjectColumnName
+ - RemovedFromProjectEvent.project
+ - RemovedFromProjectEvent.projectColumnName
+ owning_teams:
+ - '@github/github-projects'
+-
+ title: 标签预览
+ description: >-
+ 此预览支持添加、更新、创建和删除标签。
+ toggled_by: ':bane-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.createLabel
+ - CreateLabelPayload
+ - CreateLabelInput
+ - Mutation.deleteLabel
+ - DeleteLabelPayload
+ - DeleteLabelInput
+ - Mutation.updateLabel
+ - UpdateLabelPayload
+ - UpdateLabelInput
+ owning_teams:
+ - '@github/pe-pull-requests'
+-
+ title: 导入项目
+ description: 此预览增加了对导入项目的支持。
+ toggled_by: ':slothette-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.importProject
+ owning_teams:
+ - '@github/pe-issues-projects'
+-
+ title: 团队审查任务预览
+ description: >-
+ 此预览支持更新团队审查任务的设置。
+ toggled_by: ':stone-crop-preview'
+ announcement: null
+ updates: null
+ toggled_on:
+ - Mutation.updateTeamReviewAssignment
+ - UpdateTeamReviewAssignmentInput
+ - TeamReviewAssignmentAlgorithm
+ - Team.reviewRequestDelegationEnabled
+ - Team.reviewRequestDelegationAlgorithm
+ - Team.reviewRequestDelegationMemberCount
+ - Team.reviewRequestDelegationNotifyTeam
+ owning_teams:
+ - '@github/pe-pull-requests'
diff --git a/translations/zh-CN/data/graphql/ghes-3.5/graphql_upcoming_changes.public-enterprise.yml b/translations/zh-CN/data/graphql/ghes-3.5/graphql_upcoming_changes.public-enterprise.yml
new file mode 100644
index 0000000000..1956e409dd
--- /dev/null
+++ b/translations/zh-CN/data/graphql/ghes-3.5/graphql_upcoming_changes.public-enterprise.yml
@@ -0,0 +1,114 @@
+---
+upcoming_changes:
+ -
+ location: LegacyMigration.uploadUrlTemplate
+ description: '`uploadUrlTemplate` 将被删除。使用 `uploadUrl` 代替。'
+ reason: '`uploadUrlTemplate` 正在被删除,因为它不是标准的 URL,并且增加了一个额外的用户步骤。'
+ date: '2019-04-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: AssignedEvent.user
+ description: '`user` 将被删除。使用 `assignee` 字段代替。'
+ reason: 受理人现在可以作为人体模型。
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: EnterpriseBillingInfo.availableSeats
+ description: '`availableSeats` 将被删除。使用 EnterpriseBillingInfo.totalAvailableLicenses 代替。'
+ reason: '`availableSeats` 将被替换为 `totalAvailableLicenses`,以便更明确地表示要返回的值'
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BlakeWilliams
+ -
+ location: EnterpriseBillingInfo.seats
+ description: '`seats` 将被删除。使用 EnterpriseBillingInfo.totalLicenses 代替。'
+ reason: '`seats` 将被替换为 `totalLicenses`,以便更明确地表示要返回的值'
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BlakeWilliams
+ -
+ location: UnassignedEvent.user
+ description: '`user` 将被删除。使用 `assignee` 字段代替。'
+ reason: 受理人现在可以作为人体模型。
+ date: '2020-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: tambling
+ -
+ location: EnterprisePendingMemberInvitationEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有挂起的成员都会使用许可证
+ date: '2020-07-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: Issue.timeline
+ description: '`timeline` 将被删除。使用 Issue.timelineItems 代替。'
+ reason: '`timeline` 将被删除'
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: mikesea
+ -
+ location: PullRequest.timeline
+ description: '`timeline` 将被删除。使用 PullRequest.timelineItems 代替。'
+ reason: '`timeline` 将被删除'
+ date: '2020-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: mikesea
+ -
+ location: EnterpriseMemberEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有成员都会使用许可证
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: EnterpriseOutsideCollaboratorEdge.isUnlicensed
+ description: '`isUnlicensed` 将被删除。'
+ reason: 所有外部协作者使用许可证
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: BrentWheeldon
+ -
+ location: MergeStateStatus.DRAFT
+ description: '`DRAFT` 将被删除。改为使用 PullRequest.isDraft。'
+ reason: DRAFT 状态将从这个枚举中删除,应改用 `isDraft`
+ date: '2021-01-01T00:00:00+00:00'
+ criticality: 重大
+ owner: nplasterer
+ -
+ location: PackageType.DOCKER
+ description: '`DOCKER` 将被删除。'
+ reason: DOCKER 将从这个枚举中移除,因为这种类型将被迁移到仅供软件包 REST API 使用。
+ date: '2021-06-21'
+ criticality: 重大
+ owner: reybard
+ -
+ location: ReactionGroup.users
+ description: '`user` 将被删除。使用 `reactors` 字段代替。'
+ reason: 反应者现在可以是人体模特、自动程序和组织。
+ date: '2021-10-01T00:00:00+00:00'
+ criticality: 重大
+ owner: synthead
+ -
+ location: Repository.defaultMergeQueue
+ description: '“defaultMergeQueue” 将被删除。请改用 “Repository.mergeQueue”。'
+ reason: '`defaultMergeQueue` 将被删除。'
+ date: '2022-04-01'
+ criticality: 重大
+ owner: colinshum
+ -
+ location: AddPullRequestToMergeQueueInput.branch
+ description: '`branch` 将被删除。'
+ reason: PR 被添加到基本分支的合并队列中,`branch` 参数现在是 no-op
+ date: '2022-07-01T00:00:00+00:00'
+ criticality: 重大
+ owner: jhunschejones
+ -
+ location: Enterprise.userAccounts
+ description: '`userAccounts` 将被删除。使用 `Enterprise.members` 字段代替。'
+ reason: '`Enterprise.userAccounts` 字段被删除。'
+ date: '2022-07-01T00:00:00+00:00'
+ criticality: 重大
+ owner: jdennes
diff --git a/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml b/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml
index 8a97d9adc7..e467482ea9 100644
--- a/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml
+++ b/translations/zh-CN/data/graphql/graphql_upcoming_changes.public.yml
@@ -72,36 +72,36 @@ upcoming_changes:
owner: synthead
-
location: Repository.defaultMergeQueue
- description: '`defaultMergeQueue` will be removed. Use `Repository.mergeQueue` instead.'
- reason: '`defaultMergeQueue` will be removed.'
+ description: '“defaultMergeQueue” 将被删除。请改用 “Repository.mergeQueue”。'
+ reason: '`defaultMergeQueue` 将被删除。'
date: '2022-04-01'
criticality: 重大
owner: colinshum
-
location: AddPullRequestToMergeQueueInput.branch
- description: '`branch` will be removed.'
- reason: PRs are added to the merge queue for the base branch, the `branch` argument is now a no-op
+ description: '`branch` 将被删除。'
+ reason: PR 被添加到基本分支的合并队列中,`branch` 参数现在是 no-op
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jhunschejones
-
location: Enterprise.userAccounts
- description: '`userAccounts` will be removed. Use the `Enterprise.members` field instead.'
- reason: The `Enterprise.userAccounts` field is being removed.
+ description: '`userAccounts` 将被删除。使用 `Enterprise.members` 字段代替。'
+ reason: '`Enterprise.userAccounts` 字段被删除。'
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: jdennes
-
location: Query.sponsorables.dependencyEcosystem
- description: '`dependencyEcosystem` will be removed. Use the ecosystem argument instead.'
- reason: The type is switching from SecurityAdvisoryEcosystem to DependencyGraphEcosystem.
+ description: '`dependencyEcosystem` 将被删除。使用 ecosystem 参数代替。'
+ reason: 该类型是从 SecurityAdvisoryEcosystem 切换到 DependencyGraphEcosystem。
date: '2022-07-01T00:00:00+00:00'
criticality: 重大
owner: cheshire137
-
location: UpdateProjectNextItemFieldInput.fieldWithSettingId
- description: '`fieldWithSettingId` will be removed. Use `fieldConstraintId` instead'
- reason: Renamed to fieldConstraintId to improve naming consistency.
+ description: '`fieldWithSettingId` 将被删除。使用 `fieldConstraintId` 代替'
+ reason: 重命名为 fieldConstraintId 以提高命名一致性。
date: '2022-10-01T00:00:00+00:00'
criticality: 重大
owner: memex
diff --git a/translations/zh-CN/data/learning-tracks/README.md b/translations/zh-CN/data/learning-tracks/README.md
index 343e523b2b..f9f42e99d9 100644
--- a/translations/zh-CN/data/learning-tracks/README.md
+++ b/translations/zh-CN/data/learning-tracks/README.md
@@ -6,7 +6,7 @@
产品的学习轨迹数据在两个地方定义:
-1. A simple array of learning track names is defined in the product guides index page frontmatter.
+1. 简单的学习轨迹名称数组在产品指南分类索引页面前缀中定义。
例如,在 `content/actions/guides/index.md` 中:
```
@@ -23,13 +23,13 @@
例如,在 `data/learning-tracks/actions.yml` 中,内容文件的 `learningTracks` 数组中每个项都用 `title`、`description` 和 `guides` 链接数组等额外数据来表示。
- One learning track in this YAML **per version** must be designated as a "featured" learning track via `featured_track: true`, which will set it to appear at the top of the product guides page. 如果缺少此属性,测试将失败。
+ 在此 YAML **每个版本**中,必须通过 `featured_track: true` 指定一个学习轨迹为“特色”学习轨迹,这将设置它出现在产品指南页面的顶部。 如果缺少此属性,测试将失败。
`featured_track` 属性可以是简单的布尔值(例如 `featured_track: true`),也可以是包含版本控制语句的字符串(例如 `featured_track: '{% ifversion fpt %}true{% else %}false{% endif %}'`)。 如果您使用版本控制,每个 YML 文件将有多个 `featured_track`,但请确保每个当前支持的版本中只有一个版本会呈现。 如果每个版本的特色链接多于或少于一个,测试将失败。
## 版本
-学习轨迹的版本控制在页面渲染时进行处理。 代码位于 [`lib/learning-tracks.js`](lib/learning-tracks.js) 中,通过 `page.render()` 调用。 The processed learning tracks are then rendered by `components/guides`.
+学习轨迹的版本控制在页面渲染时进行处理。 代码位于 [`lib/learning-tracks.js`](lib/learning-tracks.js) 中,通过 `page.render()` 调用。 然后通过 `components/guides` 渲染处理后的学习轨迹。
Liquid 条件**不**需要用用于指南的 YAML 文件中的版本控制。 只有适用于当前版本的学习跟踪指南才会自动呈现。 如果没有任何属于当前版本的指南的跟踪,学习跟踪部分将不会呈现。
diff --git a/translations/zh-CN/data/learning-tracks/actions.yml b/translations/zh-CN/data/learning-tracks/actions.yml
index e25b96c5f6..fd3377590d 100644
--- a/translations/zh-CN/data/learning-tracks/actions.yml
+++ b/translations/zh-CN/data/learning-tracks/actions.yml
@@ -38,8 +38,8 @@ deploy_to_the_cloud:
- /actions/deployment/deploying-to-azure-app-service
- /actions/deployment/deploying-to-google-kubernetes-engine
adopting_github_actions_for_your_enterprise_ghec:
- title: 'Adopt GitHub Actions for your enterprise'
- description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.'
+ title: '为您的企业采用 GitHub Actions'
+ description: '了解如何在企业中规划和实施 {% data variables.product.prodname_actions %} 的部署。'
versions:
ghec: '*'
guides:
@@ -51,8 +51,8 @@ adopting_github_actions_for_your_enterprise_ghec:
- /actions/security-guides/security-hardening-for-github-actions
- /billing/managing-billing-for-github-actions/about-billing-for-github-actions
adopting_github_actions_for_your_enterprise_ghes_and_ghae:
- title: 'Adopt GitHub Actions for your enterprise'
- description: 'Learn how to plan and implement a rollout of {% data variables.product.prodname_actions %} in your enterprise.'
+ title: '为您的企业采用 GitHub Actions'
+ description: '了解如何在企业中规划和实施 {% data variables.product.prodname_actions %} 的部署。'
versions:
ghes: '*'
ghae: '*'
diff --git a/translations/zh-CN/data/learning-tracks/code-security.yml b/translations/zh-CN/data/learning-tracks/code-security.yml
index a30b570995..98bc1d433b 100644
--- a/translations/zh-CN/data/learning-tracks/code-security.yml
+++ b/translations/zh-CN/data/learning-tracks/code-security.yml
@@ -2,7 +2,7 @@
#Feature available only on dotcom
security_advisories:
title: '修复并披露安全漏洞'
- description: 'Using repository security advisories to privately fix a reported vulnerability and get a CVE.'
+ description: '使用存储库仓库私下修复报告的漏洞并获取 CVE。'
featured_track: '{% ifversion fpt or ghec %}true{% else %}false{% endif %}'
guides:
- /code-security/repository-security-advisories/about-coordinated-disclosure-of-security-vulnerabilities
@@ -106,7 +106,7 @@ code_security_ci:
#Feature available in all versions
end_to_end_supply_chain:
title: '端到端供应链'
- description: 'How to think about securing your user accounts, your code, and your build process.'
+ description: '如何考虑保护用户帐户、代码和构建过程。'
guides:
- /code-security/supply-chain-security/end-to-end-supply-chain/end-to-end-supply-chain-overview
- /code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts
diff --git a/translations/zh-CN/data/product-examples/README.md b/translations/zh-CN/data/product-examples/README.md
index f21daf87a5..5fa5931273 100644
--- a/translations/zh-CN/data/product-examples/README.md
+++ b/translations/zh-CN/data/product-examples/README.md
@@ -10,7 +10,7 @@
## 工作原理
-Example data for each product is defined in `data/product-landing-examples`, in a subdirectory named for the **product** and a YML file named for the **example type** (e.g., `data/product-examples/sponsors/user-examples.yml` or `data/product-examples/codespaces/code-examples.yml`). 我们目前只支持每个产品一种示例。
+每个产品的示例数据定义在 `data/product-landing-examples` 中,名为 **product** 的子目录中,以及名为 **example type** 的 YML 文件中(例如,`data/product-examples/sponsors/user-examples.yml` 或 `data/product-examples/codespaces/code-examples.yml`)。 我们目前只支持每个产品一种示例。
### 版本
@@ -35,7 +35,7 @@ Example data for each product is defined in `data/product-landing-examples`, in
产品示例数据添加到 `middleware/contextualizers/product-examples.js` 中的 `context` 对象。
-The data is then rendered by `components/landing`.
+然后由 `components/landing` 渲染数据。
## 架构执行
diff --git a/translations/zh-CN/data/product-examples/code-security/code-examples.yml b/translations/zh-CN/data/product-examples/code-security/code-examples.yml
index cd1da9f0ad..e0407bf67a 100644
--- a/translations/zh-CN/data/product-examples/code-security/code-examples.yml
+++ b/translations/zh-CN/data/product-examples/code-security/code-examples.yml
@@ -22,7 +22,7 @@
- GitHub Actions
-
#Security policies
- title: Microsoft security policy template
+ title: Microsoft 安全策略模板
description: 示例安全策略
href: /microsoft/repo-templates/blob/main/shared/SECURITY.md
tags:
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-20/13.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-20/13.yml
index c97c31e4b6..af31beb233 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-20/13.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-20/13.yml
@@ -2,8 +2,8 @@
date: '2020-08-11'
sections:
security_fixes:
- - '{% octicon "alert" aria-label="The alert icon" %} **Critical:** A remote code execution vulnerability was identified in GitHub Pages that could allow an attacker to execute commands as part building a GitHub Pages site. This issue was due to an outdated and vulnerable dependency used in the Pages build process. To exploit this vulnerability, an attacker would need permission to create and build a GitHub Pages site on the GitHub Enterprise Server instance. This vulnerability affected all versions of GitHub Enterprise Server. To mitigate this vulnerability, Kramdown has been updated to address CVE-2020-14001. {% comment %} https://github.com/github/pages/pull/2836, https://github.com/github/pages/pull/2827 {% endcomment %}'
- - '**High:** An attacker could inject a malicious argument into a Git sub-command when executed on GitHub Enterprise Server. This could allow an attacker to overwrite arbitrary files with partially user-controlled content and potentially execute arbitrary commands on the GitHub Enterprise Server instance. To exploit this vulnerability, an attacker would need permission to access repositories within the GitHub Enterprise Server instance. However, due to other protections in place, we could not identify a way to actively exploit this vulnerability. This vulnerability was reported through the GitHub Security Bug Bounty program. {% comment %} https://github.com/github/github/pull/151097 {% endcomment %}'
+ - '{% octicon "alert" aria-label="The alert icon" %}**关键:**在 GitHub 页面中发现了一个远程代码执行漏洞,允许攻击者执行命令,作为构建 GitHub Pages 网站的一部分。此问题源于在 Pages 构建过程中使用了过时和有漏洞的依赖项。要利用此漏洞,攻击者需要在 GitHub Enterprise Server 实例 上构建 GitHub Pages 站点的权限。此漏洞影响 GitHub Enterprise Server 的所有版本。为缓解此漏洞的影响,Kramdown 已更新以解决 CVE-2020-14001。{% comment %} https://github.com/github/pages/pull/2836, https://github.com/github/pages/pull/2827 {% endcomment %}'
+ - '**高:**攻击者在 GitHub Enterprise Server 上执行时可能会将恶意参数注入 Git 子命令。这可能允许攻击者用部分用户控制的内容覆盖任意文件,并可能在 GitHub Enterprise Server 实例上执行任意命令。要利用此漏洞,攻击者需要访问 GitHub Enterprise Server 实例中仓库的权限。但由于已实施其他保护措施,因此我们无法确定积极利用这一漏洞的方法。此漏洞是通过 GitHub Security Bug Bounty 计划报告的。 {% comment %} https://github.com/github/github/pull/151097 {% endcomment %}'
- '包已更新到最新的安全版本。{% comment %} https://github.com/github/enterprise2/pull/21811, https://github.com/github/enterprise2/pull/21700 {% endcomment %}'
bugs:
- 'Consul 配置错误阻止在独立实例中处理一些后台任务。 {% comment %} https://github.com/github/enterprise2/pull/21464 {% endcomment %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-21/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-21/17.yml
index 523dafb989..a4cfb3160c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-21/17.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-21/17.yml
@@ -18,8 +18,8 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 推送到命令行上的仓库时不报告安全警报。
- |
- Log rotation may fail to signal services to transition to new log files, leading to older log files continuing to be used, and eventual root disk space exhaustion.
- To remedy and/or prevent this issue, run the following commands in the [administrative shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH), or contact [GitHub Enterprise Support](https://support.github.com/contact) for assistance:
+ 日志旋转可能无法指示服务过渡到新日志文件,导致继续使用旧日志文件,最终根磁盘空间耗尽。
+ 为了补救和/或防止这个问题,请在 [管理 shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH) 中运行以下命令或联系 [GitHub Enterprise 支持](https://support.github.com/contact) 寻求协助:
```
printf "PATH=/usr/local/sbin:/usr/local/bin:/usr/local/share/enterprise:/usr/sbin:/usr/bin:/sbin:/bin\n29,59 * * * * root /usr/sbin/logrotate /etc/logrotate.conf\n" | sudo sponge /etc/cron.d/logrotate
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-21/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-21/4.yml
index bf65a175da..cfaca3121b 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-21/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-21/4.yml
@@ -2,8 +2,8 @@
date: '2020-08-11'
sections:
security_fixes:
- - '{% octicon "alert" aria-label="The alert icon" %} **Critical:** A remote code execution vulnerability was identified in GitHub Pages that could allow an attacker to execute commands as part building a GitHub Pages site. This issue was due to an outdated and vulnerable dependency used in the Pages build process. To exploit this vulnerability, an attacker would need permission to create and build a GitHub Pages site on the GitHub Enterprise Server instance. This vulnerability affected all versions of GitHub Enterprise Server. To mitigate this vulnerability, Kramdown has been updated to address CVE-2020-14001. {% comment %} https://github.com/github/pages/pull/2835, https://github.com/github/pages/pull/2827 {% endcomment %}'
- - '**High:** High: An attacker could inject a malicious argument into a Git sub-command when executed on GitHub Enterprise Server. This could allow an attacker to overwrite arbitrary files with partially user-controlled content and potentially execute arbitrary commands on the GitHub Enterprise Server instance. To exploit this vulnerability, an attacker would need permission to access repositories within the GHES instance. However, due to other protections in place, we could not identify a way to actively exploit this vulnerability. This vulnerability was reported through the GitHub Security Bug Bounty program. {% comment %} https://github.com/github/github/pull/150936, https://github.com/github/github/pull/150634 {% endcomment %}'
+ - '{% octicon "alert" aria-label="The alert icon" %}**关键:**在 GitHub 页面中发现了一个远程代码执行漏洞,允许攻击者执行命令,作为构建 GitHub Pages 网站的一部分。此问题源于在 Pages 构建过程中使用了过时和有漏洞的依赖项。要利用此漏洞,攻击者需要在 GitHub Enterprise Server 实例 上构建 GitHub Pages 站点的权限。此漏洞影响 GitHub Enterprise Server 的所有版本。为缓解此漏洞的影响,Kramdown 已更新以解决 CVE-2020-14001。 {% comment %} https://github.com/github/pages/pull/2835, https://github.com/github/pages/pull/2827 {% endcomment %}'
+ - '**高:**高:攻击者在 GitHub Enterprise Server 上执行时可能会将恶意参数注入 Git 子命令。这可能允许攻击者用部分用户控制的内容覆盖任意文件,并可能在 GitHub Enterprise Server 实例上执行任意命令。要利用此漏洞,攻击者需要访问 GHES 实例中仓库的权限。但由于已实施其他保护措施,因此我们无法确定积极利用这一漏洞的方法。此漏洞是通过 GitHub Security Bug Bounty 计划报告的。 {% comment %} https://github.com/github/github/pull/150936, https://github.com/github/github/pull/150634 {% endcomment %}'
- '包已更新到最新的安全版本。{% comment %} https://github.com/github/enterprise2/pull/21679, https://github.com/github/enterprise2/pull/21542, https://github.com/github/enterprise2/pull/21812, https://github.com/github/enterprise2/pull/21700 {% endcomment %}'
bugs:
- 'Consul 配置错误阻止在独立实例中处理一些后台任务。 {% comment %} https://github.com/github/enterprise2/pull/21463 {% endcomment %}'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/17.yml
index 915da23726..a4eac29001 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/17.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/17.yml
@@ -2,16 +2,16 @@
date: '2021-07-14'
sections:
security_fixes:
- - '**HIGH:** A path traversal vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. User-controlled configuration options used by GitHub Pages were not sufficiently restricted and made it possible to read files on the GitHub Enterprise Server instance. To exploit this vulnerability, an attacker would need permission to create and build a GitHub Pages site on the GitHub Enterprise Server instance. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.1.3 and has been assigned CVE-2021-22867. This vulnerability was reported via the GitHub Bug Bounty program.'
+ - '**高:** 在 GitHub Enterprise Server 中发现了路径遍历漏洞,该漏洞在构建 GitHub Pages 站点时可能被利用。GitHub Pages 使用的用户控制的配置选项没有受到充分的限制,因此可以读取 GitHub Enterprise Server 实例上的文件。要利用此漏洞,攻击者需要有权在 GitHub Enterprise Server 实例上创建和构建 GitHub Pages 站点。此漏洞影响了 3.1.3 之前的所有版本的 GitHub 企业服务器,并已分配 CVE-2021-22867。此漏洞是通过 GitHub Bug Bounty 计划报告的。'
- 包已更新到最新的安全版本。
bugs:
- - '`ghe-cluster-config-node-init` would fail during cluster setup if HTTP proxy is enabled.'
- - Collectd would not resolve the forwarding destination hostname after the initial startup.
- - The job that purged stale deleted repositories could fail to make progress if some of those repositories were protected from deletion by legal holds.
- - Git pushes could result in a 500 Internal Server Error during the user reconciliation process on instances using LDAP authentication mode.
- - A significant number of 503 errors were logged every time a user visited a repository's `/settings` page if the dependency graph was not enabled.
+ - '如果启用了 HTTP 代理,则在群集设置期间,`ghe-cluster-config-node-init` 将失败。'
+ - Collectd 不会在初始启动后解析转发目标主机名。
+ - 如果某些存储库因合法保留而不能被删除,则清除过时的已删除存储库的作业可能无法取得进展。
+ - 在使用 LDAP 身份验证模式的实例上的用户协调过程中,Git 推送可能会导致 500 内部服务器错误。
+ - 如果未启用依赖关系图,则每次用户访问存储库的 `/settings` 页面时,都会记录大量 503 错误。
changes:
- - Improved the efficiency of config apply by skipping IP allow firewall rules that had not changed, which saved significant time on large clusters.
+ - 通过跳过 IP 允许未更改的防火墙规则,提高了配置应用的效率,从而在大型群集上节省了大量时间。
known_issues:
- 在新建的没有任何用户的 GitHub Enterprise Server 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/18.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/18.yml
index c974388aef..47d63ada91 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/18.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/18.yml
@@ -4,10 +4,10 @@ sections:
security_fixes:
- 包已更新到最新的安全版本。
bugs:
- - A significant number of 503 errors were being created if the scheduled job to sync vulnerabilities with GitHub.com attempted to run when dependency graph was not enabled and content analysis was enabled.
- - Unauthenticated HTTP proxy for the pages containers build was not supported for any users that use HTTP proxies.
+ - 如果在未启用依赖关系图和启用内容分析时尝试运行将漏洞与 GitHub.com 同步的计划作业,则会产生大量 503 错误。
+ - 使用 HTTP 代理的任何用户都不支持页面容器生成的未经身份验证的 HTTP 代理。
changes:
- - The logs for `babeld` now include a `cmd` field for HTTP ref advertisement requests instead of only including it during the negotiation requests.
+ - '`babeld` 的日志现在包括 HTTP 引用通告请求的 `cmd` 字段,而不是仅在协商请求期间包含它。'
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/19.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/19.yml
index 2c00c8da82..c912773c3c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/19.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/19.yml
@@ -2,9 +2,9 @@
date: '2021-08-10'
sections:
bugs:
- - Audit log entries for changes made to "Repository creation" organization settings were inaccurate.
+ - 对“存储库创建”组织设置所做更改的审核日志条目不准确。
changes:
- - Abuse rate limits are now called Secondary rate limits, since the behavior they limit is not always abusive.
+ - 滥用速率限制现在称为次要速率限制,因为它们限制的行为并不总是滥用行为。
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/20.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/20.yml
index c789884131..5ed341485e 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/20.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/20.yml
@@ -4,8 +4,8 @@ sections:
security_fixes:
- 包已更新到最新的安全版本。
bugs:
- - Journald messages related to automatic updates (`Adding h/m/s random time.`) were logged to syslog.
- - Git hooks to the internal API that result in failing requests returned the exception `undefined method body for "success":String (NoMethodError)` instead of returning an explicit `nil`.
+ - 与自动更新相关的日志消息 (`Adding h/m/s random time.`) 被记录到 syslog 中。
+ - 导致请求失败的 Git 与内部 API 挂钩,返回异常 `undefined method body for "success":String (NoMethodError)`,而不是返回显式 `nil`。
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/22.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/22.yml
index ce9c266a5e..8132ad054a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/22.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/22.yml
@@ -1,4 +1,3 @@
----
date: '2021-09-24'
sections:
security_fixes:
@@ -7,9 +6,9 @@ sections:
- 'The {% data variables.product.prodname_github_connect %} configuration of the source instance was always restored to new instances even when the `--config` option for `ghe-restore` was not used. This would lead to a conflict with the {% data variables.product.prodname_github_connect %} connection and license synchronization if both the source and destination instances were online at the same time. {% comment %} https://github.com/github/github/pull/192247, https://github.com/github/github/pull/191951, https://github.com/github/enterprise2/pull/26870, https://github.com/github/backup-utils/pull/770, https://github.com/github/connected-enterprise/issues/208 {% endcomment %}'
- 'Fixes {% data variables.product.prodname_pages %} builds so they take into account the NO_PROXY setting of the appliance. This is relevant to appliances configured with an HTTP proxy only. {% comment %} https://github.com/github/github/pull/192380 {% endcomment %}'
known_issues:
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in GitHub.com search results.
- - 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
+ - When a replica node is offline in a high availability configuration, {% data variables.product.product_name %} may still route {% data variables.product.prodname_pages %} requests to the offline node, reducing the availability of {% data variables.product.prodname_pages %} for users.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/2-22/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/2-22/9.yml
index 6d60899566..3065398d5a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/2-22/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/2-22/9.yml
@@ -24,8 +24,8 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- |
- Log rotation may fail to signal services to transition to new log files, leading to older log files continuing to be used, and eventual root disk space exhaustion.
- To remedy and/or prevent this issue, run the following commands in the [administrative shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH), or contact [GitHub Enterprise Support](https://support.github.com/contact) for assistance:
+ 日志旋转可能无法指示服务过渡到新日志文件,导致继续使用旧日志文件,最终根磁盘空间耗尽。
+ 为了补救和/或防止这个问题,请在 [管理 shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH) 中运行以下命令或联系 [GitHub Enterprise 支持](https://support.github.com/contact) 寻求协助:
```
printf "PATH=/usr/local/sbin:/usr/local/bin:/usr/local/share/enterprise:/usr/sbin:/usr/bin:/sbin:/bin\n29,59 * * * * root /usr/sbin/logrotate /etc/logrotate.conf\n" | sudo sponge /etc/cron.d/logrotate
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/1.yml
index 8d9496af45..a4651f9d24 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/1.yml
@@ -35,7 +35,7 @@ sections:
- 'Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。'
- '如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。'
- '对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。'
- - 'When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://support.github.com/contact).'
+ - '当启用维护模式时,某些服务将继续列为“活动进程”。 指定的服务预期在维护模式下运行。如果您遇到这个问题但不确定,请联系 [GitHub Enterprise 支持](https://support.github.com/contact)。'
- '重复记录到 `/var/log/messages`、`/var/log/syslog` 和 `/var/log/user.log` 将提高根卷利用率。'
- '用户无需选中所有复选框即可忽略强制消息。'
- '[预接收挂钩脚本](/admin/policies/enforcing-policy-with-pre-receive-hooks) 无法编写临时文件,这可能导致脚本执行失败。使用预接收挂钩的用户应在暂存环境中进行测试,以查看脚本是否需要写入权限。'
@@ -69,4 +69,4 @@ sections:
2. 如果它显示一个或多个节点受到影响,请重启受影响的节点。
- '当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/10.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/10.yml
index 1e72ab8574..372cb0ac7a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/10.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/10.yml
@@ -17,4 +17,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/11.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/11.yml
index 62af1d8f8f..ea7a32f399 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/11.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/11.yml
@@ -2,21 +2,21 @@
date: '2021-07-14'
sections:
security_fixes:
- - '**HIGH:** A path traversal vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. User-controlled configuration options used by GitHub Pages were not sufficiently restricted and made it possible to read files on the GitHub Enterprise Server instance. To exploit this vulnerability, an attacker would need permission to create and build a GitHub Pages site on the GitHub Enterprise Server instance. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.1.3 and has been assigned CVE-2021-22867. This vulnerability was reported via the GitHub Bug Bounty program.'
+ - '**高:** 在 GitHub Enterprise Server 中发现了路径遍历漏洞,该漏洞在构建 GitHub Pages 站点时可能被利用。GitHub Pages 使用的用户控制的配置选项没有受到充分的限制,因此可以读取 GitHub Enterprise Server 实例上的文件。要利用此漏洞,攻击者需要有权在 GitHub Enterprise Server 实例上创建和构建 GitHub Pages 站点。此漏洞影响了 3.1.3 之前的所有版本的 GitHub 企业服务器,并已分配 CVE-2021-22867。此漏洞是通过 GitHub Bug Bounty 计划报告的。'
- 包已更新到最新的安全版本。
bugs:
- - SAML expiration date variable was not configurable.
- - Application services would fail their health checks during config apply before they could enter a healthy state.
- - '`ghe-cluster-config-node-init` would fail during cluster setup if HTTP proxy is enabled.'
- - Pre-receive hooks could encounter an error `Failed to resolve full path of the current executable` due to `/proc` not being mounted on the container.
- - Collectd would not resolve the forwarding destination hostname after the initial startup.
- - The job that purged stale deleted repositories could fail to make progress if some of those repositories were protected from deletion by legal holds.
- - Running `git nw-gc --pristine` would result in an error.
- - Background jobs were being queued to the `spam` queue which were not being processed.
- - The preferred merge method would be reset when retrying after a failed PR merge.
- - Git pushes could result in a 500 Internal Server Error during the user reconciliation process on instances using LDAP authentication mode.
+ - SAML 到期日期变量不可配置。
+ - 应用程序服务在配置应用期间将无法通过运行状况检查,然后才能进入正常状态。
+ - '如果启用了 HTTP 代理,则在群集设置期间,`ghe-cluster-config-node-init` 将失败。'
+ - 预接收挂钩可能会遇到错误“Failed to resolve full path of the current executable(无法解析当前可执行文件的完整路径)”,原因是 `/proc` 未挂载到容器上。
+ - Collectd 不会在初始启动后解析转发目标主机名。
+ - 如果某些存储库因合法保留而不能被删除,则清除过时的已删除存储库的作业可能无法取得进展。
+ - 运行 'git nw-gc --pristine' 会导致错误。
+ - 后台作业正在排队到未处理的“垃圾邮件”队列。
+ - 首选合并方法将在 PR 合并失败后重试时重置。
+ - 在使用 LDAP 身份验证模式的实例上的用户协调过程中,Git 推送可能会导致 500 内部服务器错误。
changes:
- - Improved the efficiency of config apply by skipping IP allow firewall rules that had not changed, which saved significant time on large clusters.
+ - 通过跳过 IP 允许未更改的防火墙规则,提高了配置应用的效率,从而在大型群集上节省了大量时间。
known_issues:
- 在新建的没有任何用户的 GitHub Enterprise Server 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -24,4 +24,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/12.yml
index 24692c9761..eaa9591075 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/12.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/12.yml
@@ -4,14 +4,14 @@ sections:
security_fixes:
- 包已更新到最新的安全版本。
bugs:
- - 'Custom pre-receive hooks could lead to an error like `error: object directory /data/user/repositories/0/nw/12/34/56/7890/network.git/objects does not exist; check .git/objects/info/alternates`.'
- - Unauthenticated HTTP proxy for the pages containers build was not supported for any users that use HTTP proxies.
- - A significant number of 503 errors were logged every time a user visited a repository''s `/settings` page if the dependency graph was not enabled.
- - Internal repositories were only returned when a user had affiliations with the repository through a team or through collaborator status, or queried with the `?type=internal` parameter.
- - Failed background jobs had unlimited retries which could cause large queue depths.
- - A significant number of 503 errors were being created if the scheduled job to sync vulnerabilities with GitHub.com attempted to run when dependency graph was not enabled and content analysis was enabled.
+ - '自定义预接收挂钩可能会导致类似 `error: object directory /data/user/repositories/0/nw/12/34/56/7890/network.git/objects does not exist; check .git/objects/info/alternates` 的错误。'
+ - 使用 HTTP 代理的任何用户都不支持页面容器生成的未经身份验证的 HTTP 代理。
+ - 如果未启用依赖关系图,则每次用户访问存储库的`/settings` 页面时,都会记录大量 503 错误。
+ - 仅当用户通过团队或协作者状态与存储库有从属关系,或者使用 `?type=internal` 参数进行查询时,才会返回内部存储库。
+ - 失败的后台作业具有无限次重试,这可能会导致较大的队列深度。
+ - 如果在未启用依赖关系图和启用内容分析时尝试运行将漏洞与 GitHub.com 同步的计划作业,则会产生大量 503 错误。
changes:
- - The logs for `babeld` now include a `cmd` field for HTTP ref advertisement requests instead of only including it during the negotiation requests.
+ - '`babeld` 的日志现在包括 HTTP 引用通告请求的 `cmd` 字段,而不是仅在协商请求期间包含它。'
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -19,4 +19,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/13.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/13.yml
index 4bdb10d5dc..bcef2c3791 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/13.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/13.yml
@@ -2,12 +2,12 @@
date: '2021-08-10'
sections:
bugs:
- - When GitHub Actions is enabled without running regular scheduled backups the MSSQL Transaction Log could grow unbounded and can consume all available space on the appliance's Data Disk causing a possible outage.
- - Audit log entries for changes made to "Repository creation" organization settings were inaccurate.
- - Excessive logging of `ActionController::UnknownFormat` exceptions caused unnecessary disk usage.
- - "LDAP `group_dn` values longer than 255 characters would result in errors being logged: `Data truncated for column 'group_dn' at row 1`."
+ - 如果在未运行定期计划备份的情况下启用 GitHub 操作,则 MSSQL 事务日志可能会无限增长,并可能占用设备数据磁盘上的所有可用空间,从而导致可能的中断。
+ - 对“存储库创建”组织设置所做更改的审核日志条目不准确。
+ - '`ActionController::UnknownFormat` 异常的过度记录会导致不必要的磁盘使用。'
+ - "超过 255 个字符的 LDAP `group_dn` 值将导致记录错误:“Data truncated for column 'group_dn' at row 1(数据在第 1 行的列 'group_dn' 被截断)”。"
changes:
- - Abuse rate limits are now called Secondary rate limits, since the behavior they limit is not always abusive.
+ - 滥用速率限制现在称为次要速率限制,因为它们限制的行为并不总是滥用行为。
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -15,4 +15,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/14.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/14.yml
index c2bd3e6628..185d44ac7f 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/14.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/14.yml
@@ -4,14 +4,14 @@ sections:
security_fixes:
- 包已更新到最新的安全版本。
bugs:
- - Attaching very large images or animated GIFs to images or pull requests would fail.
- - Journald messages related to automatic updates (`Adding h/m/s random time.`) were logged to syslog.
- - 'Custom pre-receive hooks that used a bash subshell would return an error: `No such file or directory`.'
- - Custom pre-receive hooks that created named pipes (FIFOs) would crash or hang, resulting in a timeout error.
- - Adding filters to the audit log advanced search page did not populate the query text box in real-time with the correct facet prefix and value.
- - Git hooks to the internal API that result in failing requests returned the exception `undefined method body for "success":String (NoMethodError)` instead of returning an explicit `nil`.
- - When an integration was removed, it was possible for an unrelated OAuth application or integration to also be removed.
- - When a mandatory message containing an emoji character was added, attempting to view or change the message would return a 500 Internal Server Error.
+ - 附加超大图像或动画 GIF 到图像或拉取请求将失败。
+ - 与自动更新相关的日志消息 (`Adding h/m/s random time.`) 被记录到 syslog 中。
+ - '使用 bash subshell 的自定义预接收挂钩将返回错误:“No such file or directory(没有此类文件或目录)”。'
+ - 创建具名管道 (FIFO) 的自定义预接收挂钩将崩溃或挂起,从而导致超时错误。
+ - 将筛选器添加到审核日志高级搜索页时,不会使用正确的面前缀和值实时填充查询文本框。
+ - 导致请求失败的 Git 与内部 API 挂钩,返回异常 `undefined method body for "success":String (NoMethodError)`,而不是返回显式 `nil`。
+ - 删除集成时,也可能同时删除不相关的 OAuth 应用程序或集成。
+ - 添加包含表情符号字符的强制消息时,尝试查看或更改该消息将返回 500 内部服务器错误。
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -19,4 +19,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/15.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/15.yml
index fbfc8519cc..c5c4483c0f 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/15.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/15.yml
@@ -4,10 +4,10 @@ sections:
security_fixes:
- 包已更新到最新的安全版本。
bugs:
- - Attempting to tear down a newly-added replica node by specifying its UUID with `ghe-repl-teardown` would fail without reporting an error if replication was not started.
- - GitHub Pages builds were being passed through an external proxy if there was one configured.
- - Custom pre-receive hooks that created sub-processes would lack a `PATH` variable in their environment, resulting in "No such file or directory" errors.
- - MySQL could failover during an upgrade if `mysql-auto-failover` was enabled.
+ - 如果未启动复制,则尝试通过使用 `ghe-repl-teardown` 指定其 UUID 来拆除新添加的副本节点将失败,而不会报告错误。
+ - 如果配置了外部代理,则 GitHub Pages 构建将通过外部代理传递。
+ - 创建子进程的自定义预接收挂钩在其环境中缺少 `PATH` 变量,从而导致“No such file or directory(没有此类文件或目录)”错误。
+ - 如果启用了 `mysql-auto-failover`,MySQL可以在升级期间进行故障转移。
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -15,4 +15,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/16.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/16.yml
index 70dd47a81c..c8c0de3aa3 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/16.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/16.yml
@@ -1,4 +1,3 @@
----
date: '2021-09-24'
sections:
security_fixes:
@@ -10,10 +9,10 @@ sections:
- 'Fixes {% data variables.product.prodname_pages %} builds so they take into account the NO_PROXY setting of the appliance. This is relevant to appliances configured with an HTTP proxy only. (update 2021-09-30) {% comment %} https://github.com/github/pages/pull/3360 {% endcomment %}'
- 'The GitHub Connect configuration of the source instance was always restored to new instances even when the `--config` option for `ghe-restore` was not used. This would lead to a conflict with the GitHub Connect connection and license synchronization if both the source and destination instances were online at the same time. The fix also requires updating backup-utils to 3.2.0 or higher. [updated: 2021-11-18]'
known_issues:
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- - 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
+ - When a replica node is offline in a high availability configuration, {% data variables.product.product_name %} may still route {% data variables.product.prodname_pages %} requests to the offline node, reducing the availability of {% data variables.product.prodname_pages %} for users.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/17.yml
index 1b49e75cd1..d1b62f507f 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/17.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/17.yml
@@ -4,18 +4,18 @@ sections:
security_fixes:
- '包已更新到最新的安全版本。{% comment %} https://github.com/github/enterprise2/pull/27034, https://github.com/github/enterprise2/pull/27010 {% endcomment %}'
bugs:
- - 'Custom pre-receive hooks could have failed due to too restrictive virtual memory or CPU time limits. {% comment %} https://github.com/github/enterprise2/pull/26971, https://github.com/github/enterprise2/pull/26955 {% endcomment %}'
- - 'Attempting to wipe all existing configuration settings with `ghe-cleanup-settings` failed to restart the Management Console service. {% comment %} https://github.com/github/enterprise2/pull/26986, https://github.com/github/enterprise2/pull/26901 {% endcomment %}'
- - 'During replication teardown via `ghe-repl-teardown` Memcached failed to be restarted. {% comment %} https://github.com/github/enterprise2/pull/26992, https://github.com/github/enterprise2/pull/26983 {% endcomment %}'
- - 'During periods of high load, users would receive HTTP 503 status codes when upstream services failed internal healthchecks. {% comment %} https://github.com/github/enterprise2/pull/27081, https://github.com/github/enterprise2/pull/26999 {% endcomment %}'
- - 'Pre-receive hook environments were forbidden from calling the cat command via BusyBox on Alpine. {% comment %} https://github.com/github/enterprise2/pull/27114, https://github.com/github/enterprise2/pull/27094 {% endcomment %}'
- - 'The external database password was logged in plaintext. {% comment %} https://github.com/github/enterprise2/pull/27172, https://github.com/github/enterprise2/pull/26413 {% endcomment %}'
- - 'An erroneous `jq` error message may have been displayed when running `ghe-config-apply`. {% comment %} https://github.com/github/enterprise2/pull/27203, https://github.com/github/enterprise2/pull/26784 {% endcomment %}'
- - 'Failing over from a primary Cluster datacenter to a secondary Cluster datacenter succeeds, but then failing back over to the original primary Cluster datacenter failed to promote Elasticsearch indicies. {% comment %} https://github.com/github/github/pull/193180, https://github.com/github/github/pull/192447 {% endcomment %}'
- - 'The Site Admin page for repository self-hosted runners returned an HTTP 500. {% comment %} https://github.com/github/github/pull/194205 {% endcomment %}'
- - 'In some cases, GitHub Enterprise Administrators attempting to view the `Dormant users` page received `502 Bad Gateway` or `504 Gateway Timeout` response. {% comment %} https://github.com/github/github/pull/194259, https://github.com/github/github/pull/193609 {% endcomment %}'
+ - '自定义预接收挂钩可能由于限制过多的虚拟内存或 CPU 时间限制而失败。 {% comment %} https://github.com/github/enterprise2/pull/26971, https://github.com/github/enterprise2/pull/26955 {% endcomment %}'
+ - '尝试使用 `ghe-cleanup-settings` 擦除所有现有配置设置失败,无法重新启动管理控制台服务。{% comment %} https://github.com/github/enterprise2/pull/26986, https://github.com/github/enterprise2/pull/26901 {% endcomment %}'
+ - '在通过 `ghe-repl-teardown` 进行复制拆解期间,Memcached 无法重新启动。{% comment %} https://github.com/github/enterprise2/pull/26992, https://github.com/github/enterprise2/pull/26983 {% endcomment %}'
+ - '在高负载期间,当上游服务未通过内部运行状况检查时,用户将收到 HTTP 503 状态代码。{% comment %} https://github.com/github/enterprise2/pull/27081, https://github.com/github/enterprise2/pull/26999 {% endcomment %}'
+ - '预接收挂钩环境被禁止通过 Alpine 上的 BusyBox 调用 cat 命令。{% comment %} https://github.com/github/enterprise2/pull/27114, https://github.com/github/enterprise2/pull/27094 {% endcomment %}'
+ - '外部数据库密码以纯文本形式记录。{% comment %} https://github.com/github/enterprise2/pull/27172, https://github.com/github/enterprise2/pull/26413 {% endcomment %}'
+ - '运行 `ghe-config-apply` 时,可能会显示错误的 `jq` 错误消息。{% comment %} https://github.com/github/enterprise2/pull/27203, https://github.com/github/enterprise2/pull/26784 {% endcomment %}'
+ - '从主集群数据中心故障转移到辅助集群数据中心成功,但随后故障回复到原始主集群数据中心失败,无法提升 Elasticsearch 指标。{% comment %} https://github.com/github/github/pull/193180, https://github.com/github/github/pull/192447 {% endcomment %}'
+ - '存储库自托管运行器的站点管理页面返回了 HTTP 500。 {% comment %} https://github.com/github/github/pull/194205 {% endcomment %}'
+ - '在某些情况下,尝试查看“休眠用户”页面的 GitHub 企业管理员会收到“502 网关错误”或“504 网关超时”响应。{% comment %} https://github.com/github/github/pull/194259, https://github.com/github/github/pull/193609 {% endcomment %}'
changes:
- - 'More effectively delete Webhook logs that fall out of the Webhook log retention window. {% comment %} https://github.com/github/enterprise2/pull/27157 {% endcomment %}'
+ - '更有效地删除从 web 挂钩日志保留窗口中掉落的 web 挂钩日志。{% comment %} https://github.com/github/enterprise2/pull/27157 {% endcomment %}'
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -23,4 +23,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/18.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/18.yml
index eba64f6eab..851a462585 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/18.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/18.yml
@@ -2,10 +2,10 @@
date: '2021-10-28'
sections:
security_fixes:
- - 'Several known weak SSH public keys have been added to the deny list and can no longer be registered. In addition, versions of GitKraken known to generate weak SSH keys (7.6.x, 7.7.x and 8.0.0) have been blocked from registering new public keys.'
+ - '几个已知的弱 SSH 公钥已添加到拒绝列表中,无法再注册。此外,已知会生成弱 SSH 密钥的 GitKraken 版本(7.6.x、7.7.x 和 8.0.0)已被阻止注册新的公钥。'
- '包已更新到最新的安全版本。'
bugs:
- - 'Several parts of the application were unusable for users who are owners of many organizations.'
+ - '应用程序的几个部分对于是多个组织所有者的用户不可用。'
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -13,4 +13,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/19.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/19.yml
index c974300716..88e870d0c9 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/19.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/19.yml
@@ -21,4 +21,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/2.yml
index dde9da5846..d927ff16ae 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/2.yml
@@ -27,7 +27,7 @@ sections:
- Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- - When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://support.github.com/contact).
+ - 当启用维护模式时,某些服务将继续列为“活动进程”。 指定的服务预期在维护模式下运行。如果您遇到这个问题但不确定,请联系 [GitHub Enterprise 支持](https://support.github.com/contact)。
- 如果笔记本包含非 ASCII UTF-8 字符,网页界面中的 Jupyter Notebook 渲染可能会失败。
- restructuredText(RST) 渲染在 web 界面可能失败,反而显示原始 RST 标记文本。
- Pages 的旧版本未清理,可能填充用户磁盘 (`/data/user/`)。
@@ -55,4 +55,4 @@ sections:
2. 如果它显示一个或多个节点受到影响,请重启受影响的节点。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/20.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/20.yml
index f7842a94a8..24a0bac6d1 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/20.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/20.yml
@@ -19,4 +19,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
index 3b118cef52..45ff370891 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/21.yml
@@ -20,4 +20,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/22.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/22.yml
index 612a802d17..144b1fb193 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/22.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/22.yml
@@ -11,4 +11,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/23.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/23.yml
index bd8470ba33..7293b92759 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/23.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/23.yml
@@ -17,4 +17,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/24.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/24.yml
index 0145605022..99623733af 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/24.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/24.yml
@@ -18,4 +18,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml
index 9b8fab7db1..c563f88795 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/25.yml
@@ -10,4 +10,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/3.yml
index 79e952b584..e5bee88264 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/3.yml
@@ -26,18 +26,18 @@ sections:
- Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- - When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://support.github.com/contact).
+ - 当启用维护模式时,某些服务将继续列为“活动进程”。 指定的服务预期在维护模式下运行。如果您遇到这个问题但不确定,请联系 [GitHub Enterprise 支持](https://support.github.com/contact)。
- 如果笔记本包含非 ASCII UTF-8 字符,网页界面中的 Jupyter Notebook 渲染可能会失败。
- restructuredText(RST) 渲染在 web 界面可能失败,反而显示原始 RST 标记文本。
- Pages 的旧版本未清理,可能填充用户磁盘 (`/data/user/`)。
- 在合并拉取请求后删除分支时,即使分支删除成功也会出现错误消息。
- |
- Log rotation may fail to signal services to transition to new log files, leading to older log files continuing to be used, and eventual root disk space exhaustion.
- To remedy and/or prevent this issue, run the following commands in the [administrative shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH), or contact [GitHub Enterprise Support](https://support.github.com/) for assistance:
+ 日志旋转可能无法指示服务过渡到新日志文件,导致继续使用旧日志文件,最终根磁盘空间耗尽。
+ 为了补救和/或防止这个问题,请在 [管理 shell](https://docs.github.com/en/enterprise-server/admin/configuration/accessing-the-administrative-shell-ssh) (SSH) 中运行以下命令或联系 [GitHub Enterprise 支持](https://support.github.com/) 寻求协助:
```
printf "PATH=/usr/local/sbin:/usr/local/bin:/usr/local/share/enterprise:/usr/sbin:/usr/bin:/sbin:/bin\n29,59 * * * * root /usr/sbin/logrotate /etc/logrotate.conf\n" | sudo sponge /etc/cron.d/logrotate
sudo /usr/sbin/logrotate -f /etc/logrotate.conf
```
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/4.yml
index a8c4efe643..fad23ba544 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/4.yml
@@ -25,4 +25,4 @@ sections:
- restructuredText(RST) 渲染在 web 界面可能失败,反而显示原始 RST 标记文本。
- 在合并拉取请求后删除分支时,即使分支删除成功也会出现错误消息。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/5.yml
index 5e1fdf4a12..b9fe670ebc 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/5.yml
@@ -26,4 +26,4 @@ sections:
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 在合并拉取请求后删除分支时,即使分支删除成功也会出现错误消息。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/6.yml
index 769af25096..a0fe88ff7a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/6.yml
@@ -29,4 +29,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/7.yml
index e00ce5b4c1..23b23f26a6 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/7.yml
@@ -22,4 +22,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/8.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/8.yml
index a6961778fc..ffd100dc4e 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/8.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/8.yml
@@ -25,4 +25,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-0/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-0/9.yml
index 39fe05632b..66f750222b 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-0/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-0/9.yml
@@ -22,4 +22,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/1.yml
index 1f24b438a0..81341e76c4 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/1.yml
@@ -1,31 +1,30 @@
----
date: '2021-06-10'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- - SVN 1.7 及以上客户端在使用 `svn co` 和 `svn export` 命令时出现错误。
- - 使用 `ghe-repo /` 通过管理外壳访问仓库将被挂起。
- - 升级后,用户在大量使用时会减少可用性,因为服务重启太频繁。 出现这种情况是因为 nomad 配置与内部服务器的配置之间超时不匹配。
- - 在某些情况下,设置 GitHub Actions 后运行 `ghe-repl-status` 会产生错误,并且 `ghe-actions-teardown` 会失败。
- - '`ghe-dbconsole` 会在某些情况下返回错误。'
- - 从 非 GitHub 源导入组织或仓库失败可能会产生 `undefined method '[]' for nil:NilClass` 错误。
- - 使用 SAML 身份验证时,如果 GitHub 配置文件名称不匹配管理控制台中映射到“Full name(全名)”字段的属性值,GitHub 配置文件名称可能已无意中更改。
- - 升级以前运行过 2.13 版本但未运行 2.14 版本的实例,会导致与 `AddRepositoryIdToCheckRuns` 数据转换相关的数据库迁移错误。
+ - SVN 1.7 and older clients showed an error when using the `svn co` and `svn export` commands.
+ - Accessing a repository through the administrative shell using `ghe-repo /` would hang.
+ - After upgrading, users experienced reduced availability during heavy usage, because services restarted too frequently. This would occur due to timeout mismatches between the nomad configuration and that of the internal services.
+ - In some instances, running `ghe-repl-status` after setting up GitHub Actions would produce an error and `ghe-actions-teardown` would fail.
+ - '`ghe-dbconsole` would return errors under some circumstances.'
+ - Import failures of organizations or repositories from non-GitHub sources could produce an `undefined method '[]' for nil:NilClass` error.
+ - GitHub profile names might have changed unintentionally when using SAML authentication, if the GitHub profile name did not match the value of the attribute mapped to the `Full name` field in the Management Console.
+ - Upgrading an instance that had previously ran a 2.13 release, but not a 2.14 release, resulted in a database migration error relating to the `AddRepositoryIdToCheckRuns` data transition.
changes:
- - GraphQL API 的用户可以在 `PullRequest` 对象上查询公共字段 `closingIssuesReferences` 。此字段检索在相关拉取请求合并时自动关闭的议题。此方法还允许未来迁移此数据,作为更高保真度移徙过程的一部分。
+ - Users of the GraphQL API can query the public field `closingIssuesReferences` on the `PullRequest` object. This field retrieves issues that will be automatically closed when the related pull request is merged. This approach will also allow this data to be migrated in future, as part of a higher fidelity migration process.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- |
- 在从 3.0.x 升级到 3.1.x后,GitHub Actions 可能会导致错误:“执行此工作流程时发生意外错误。 要解决这个问题,请连接到管理外壳 (ssh)并运行:
+ After upgrading from 3.0.x to 3.1.x, in some cases GitHub Actions can fail with an error: `An unexpected error occurred when executing this workflow.` To workaround this problem, connect to the administrative shell (ssh) and run:
```
- ghe-actions-console -s actions -c "队列-ServiceJob -JobId 4DB1F4F-19FD-40E0-A253-91288813DE8B"
+ ghe-actions-console -s actions -c "Queue-ServiceJob -JobId 4DB1F4CF-19FD-40E0-A253-91288813DE8B"
```
- - 当副本节点在高可用性配置下离线时,{% data variables.product.product_name %} 仍可能将 {% data variables.product.prodname_pages %} 请求路由到离线节点,从而减少用户的 {% data variables.product.prodname_pages %} 可用性。
+ - When a replica node is offline in a high availability configuration, {% data variables.product.product_name %} may still route {% data variables.product.prodname_pages %} requests to the offline node, reducing the availability of {% data variables.product.prodname_pages %} for users.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/10.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/10.yml
index ca7d3d3268..ea45f7b83d 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/10.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/10.yml
@@ -1,10 +1,9 @@
----
date: '2021-10-28'
sections:
security_fixes:
- 'It was possible for cleartext passwords to end up in certain log files.'
- 'Several known weak SSH public keys have been added to the deny list and can no longer be registered. In addition, versions of GitKraken known to generate weak SSH keys (7.6.x, 7.7.x and 8.0.0) have been blocked from registering new public keys.'
- - '包已更新到最新的安全版本。'
+ - 'Packages have been updated to the latest security versions.'
bugs:
- 'Restore might fail for enterprise server in clustering mode if orchestrator isnt healthily.'
- 'Several parts of the application were unusable for users who are owners of many organizations.'
@@ -12,11 +11,11 @@ sections:
changes:
- 'Browsing and job performance optimizations for repositories with many refs.'
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/11.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/11.yml
index 0fb0ff9b0b..724c3efc7c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/11.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/11.yml
@@ -1,9 +1,8 @@
----
date: '2021-11-09'
sections:
security_fixes:
- A path traversal vulnerability was identified in {% data variables.product.prodname_pages %} builds on {% data variables.product.prodname_ghe_server %} that could allow an attacker to read system files. To exploit this vulnerability, an attacker needed permission to create and build a {% data variables.product.prodname_pages %} site on the {% data variables.product.prodname_ghe_server %} instance. This vulnerability affected all versions of {% data variables.product.prodname_ghe_server %} prior to 3.3, and was fixed in versions 3.0.19, 3.1.11, and 3.2.3. This vulnerability was reported through the {% data variables.product.company_short %} Bug Bounty program and has been assigned CVE-2021-22870.
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Some Git operations failed after upgrading a {% data variables.product.prodname_ghe_server %} 3.x cluster because of the HAProxy configuration.
- Unicorn worker counts might have been set incorrectly in clustering mode.
@@ -11,7 +10,7 @@ sections:
- If Ubuntu's Uncomplicated Firewall (UFW) status was inactive, a client could not clearly see it in the logs.
- Upgrading from {% data variables.product.prodname_ghe_server %} 2.x to 3.x failed when there were UTF8 characters in an LDAP configuration.
- Some pages and Git-related background jobs might not run in cluster mode with certain cluster configurations.
- - 'When a new tag was created, the [push](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push) webhook payload did not display a correct `head_commit` object. Now, when a new tag is created, the push webhook payload now always includes a `head_commit` object that contains the data of the commit that the new tag points to. As a result, the `head_commit` object will always contain the commit data of the payload''s `after` commit.'
+ - When a new tag was created, the [push](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#push) webhook payload did not display a correct `head_commit` object. Now, when a new tag is created, the push webhook payload now always includes a `head_commit` object that contains the data of the commit that the new tag points to. As a result, the `head_commit` object will always contain the commit data of the payload's `after` commit.
- The enterprise audit log page would not display audit events for {% data variables.product.prodname_secret_scanning %}.
- There was an insufficient job timeout for replica repairs.
- 'Users were not warned about potentially dangerous bidirectional unicode characters when viewing files. For more information, see "[Warning about bidirectional Unicode text](https://github.co/hiddenchars)" in {% data variables.product.prodname_blog %}.'
@@ -19,11 +18,11 @@ sections:
changes:
- Kafka configuration improvements have been added. When deleting repositories, package files are now immediately deleted from storage account to free up space. `DestroyDeletedPackageVersionsJob` now deletes package files from storage account for stale packages along with metadata records.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/12.yml
index b19cb56327..feb0161f06 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/12.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/12.yml
@@ -1,8 +1,7 @@
----
date: '2021-11-23'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Running `ghe-repl-start` or `ghe-repl-status` would sometimes return errors connecting to the database when GitHub Actions was enabled.
- Pre-receive hooks would fail due to undefined `PATH`.
@@ -15,11 +14,11 @@ sections:
- We have added extra text to the admin console to remind users about the mobile apps' data collection for experience improvement purposes.
- The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
index 804b31386e..19a568a849 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/13.yml
@@ -1,24 +1,23 @@
----
date: '2021-12-07'
sections:
security_fixes:
- - Support bundles could include sensitive files if they met a specific set of conditions.
+ - Support bundles could include sensitive files if they met a specific set of conditions.
- A UI misrepresentation vulnerability was identified in GitHub Enterprise Server that allowed more permissions to be granted during a GitHub App's user-authorization web flow than was displayed to the user during approval. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.2.5, 3.1.13, 3.0.21. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41598](https://www.cve.org/CVERecord?id=CVE-2021-41598).
- A remote code execution vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.3 and was fixed in versions 3.0.21, 3.1.13, 3.2.5. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned [CVE-2021-41599](https://www.cve.org/CVERecord?id=CVE-2021-41599). Updated February 17, 2022
bugs:
- - Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
- - A misconfiguration in the Management Console caused scheduling errors.
- - Docker would hold log files open after a log rotation.
- - GraphQL requests did not set the GITHUB_USER_IP variable in pre-receive hook environments.
+ - Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
+ - A misconfiguration in the Management Console caused scheduling errors.
+ - Docker would hold log files open after a log rotation.
+ - GraphQL requests did not set the GITHUB_USER_IP variable in pre-receive hook environments.
changes:
- - Clarifies explanation of Actions path-style in documentation.
- - Updates support contact URLs to use the current support site, support.github.com.
+ - Clarifies explanation of Actions path-style in documentation.
+ - Updates support contact URLs to use the current support site, support.github.com.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/14.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/14.yml
index e2e2b72cd5..5a7f55939a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/14.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/14.yml
@@ -1,15 +1,14 @@
----
date: '2021-12-13'
sections:
security_fixes:
- '{% octicon "alert" aria-label="The alert icon" %} **Critical:** A remote code execution vulnerability in the Log4j library, identified as [CVE-2021-44228](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228), affected all versions of {% data variables.product.prodname_ghe_server %} prior to 3.3.1. The Log4j library is used in an open source service running on the {% data variables.product.prodname_ghe_server %} instance. This vulnerability was fixed in {% data variables.product.prodname_ghe_server %} versions 3.0.22, 3.1.14, 3.2.6, and 3.3.1. For more information, please see [this post](https://github.blog/2021-12-13-githubs-response-to-log4j-vulnerability-cve-2021-44228/) on the GitHub Blog.'
- '**December 17, 2021 update**: The fixes in place for this release also mitigate [CVE-2021-45046](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-45046), which was published after this release. No additional upgrade for {% data variables.product.prodname_ghe_server %} is required to mitigate both CVE-2021-44228 and CVE-2021-45046.'
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/15.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/15.yml
index 9d86fa3107..533cd364d8 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/15.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/15.yml
@@ -1,10 +1,9 @@
----
date: '2022-01-18'
sections:
security_fixes:
- 'Packages have been updated to the latest security versions. In these updates, Log4j has been updated to version 2.17.1. Note: previous mitigations released in 3.3.1, 3.2.6, 3.1.14, and 3.0.22 are sufficient to address the impact of CVE-2021-44228, CVE-2021-45046, CVE-2021-45105, and CVE-2021-44832 in these versions of GitHub Enterprise Server.'
- Sanitize more secrets in the generated support bundles
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Running `ghe-config-apply` could sometimes fail because of permission issues in `/data/user/tmp/pages`.
- The save button in management console was unreachable by scrolling in lower resolution browsers.
@@ -12,11 +11,11 @@ sections:
- Some webhook related jobs could generated large amount of logs.
- The repository permissions to the user returned by the `/repos` API would not return the full list.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/16.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/16.yml
index ae3114314a..7fd3cbeeed 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/16.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/16.yml
@@ -1,8 +1,7 @@
----
date: '2022-02-01'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Pages would become unavailable following a MySQL secret rotation until `nginx` was manually restarted.
- When setting the maintenance schedule with a ISO 8601 date, the actual scheduled time wouldn't match due to the timezone not being transformed to UTC.
@@ -15,11 +14,11 @@ sections:
changes:
- The GitHub Connect data connection record now includes a count of the number of active and dormant users and the configured dormancy period.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml
index cdea421aa7..d49abec3b9 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/17.yml
@@ -1,16 +1,15 @@
----
date: '2022-02-17'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- - Fixes SystemStackError (stack too deep) when getting more than 2^16 keys from memcached.
+ - Fixes SystemStackError (stack too deep) when getting more than 2^16 keys from memcached.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/18.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/18.yml
index 574f165668..aea88e5c50 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/18.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/18.yml
@@ -1,17 +1,16 @@
----
date: '2022-03-01'
sections:
security_fixes:
- "HIGH: An integer overflow vulnerability was identified in GitHub's markdown parser that could potentially lead to information leaks and RCE. This vulnerability was reported through the GitHub Bug Bounty program by Felix Wilhelm of Google's Project Zero and has been assigned CVE-2022-24724."
bugs:
- - Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
- - 'OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.1/rest/reference/apps#check-an-authorization) API endpoint.'
+ - Upgrades could sometimes fail if a high-availability replica's clock was out of sync with the primary.
+ - OAuth Applications created after September 1st, 2020 were not able to use the [Check an Authorization](https://docs.github.com/en/enterprise-server@3.1/rest/reference/apps#check-an-authorization) API endpoint.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/19.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/19.yml
index e1c803680b..d53167b7a5 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/19.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/19.yml
@@ -1,42 +1,41 @@
----
date: '2022-04-04'
sections:
security_fixes:
- 'MEDIUM: A path traversal vulnerability was identified in {% data variables.product.prodname_ghe_server %} Management Console that allowed the bypass of CSRF protections. This vulnerability affected all versions of {% data variables.product.prodname_ghe_server %} prior to 3.5 and was fixed in versions 3.1.19, 3.2.11, 3.3.6, 3.4.1. This vulnerability was reported via the {% data variables.product.prodname_dotcom %} Bug Bounty program and has been assigned CVE-2022-23732.'
- 'MEDIUM: An integer overflow vulnerability was identified in the 1.x branch and the 2.x branch of `yajil` which leads to subsequent heap memory corruption when dealing with large (~2GB) inputs. This vulnerability was reported internally and has been assigned CVE-2022-24795. '
- - Support bundles could include sensitive files if {% data variables.product.prodname_actions %} was enabled.
- - 包已更新到最新的安全版本。
+ - Support bundles could include sensitive files if {% data variables.product.prodname_actions %} was enabled.
+ - Packages have been updated to the latest security versions.
bugs:
- - The options to enable `TLS 1.0` and `TLS 1.1` in the Privacy settings of the Management Console were shown, although removal of those protocol versions occurred in an earlier release.
- - In a HA environment, configuring MSSQL replication could require additional manual steps after enabling {% data variables.product.prodname_actions %} for the first time.
- - A subset of internal configuration files are more reliably updated after a hotpatch.
- - The `ghe-run-migrations` script would sometimes fail to generate temporary certificate names correctly.
- - In a cluster environment, Git LFS operations could fail with failed internal API calls that crossed multiple web nodes.
- - Pre-receive hooks that used `gpg --import` timed out due to insufficient `syscall` privileges.
- - In some cluster topologies, webhook delivery information was not available.
- - In HA configurations, tearing down a replica would fail if {% data variables.product.prodname_actions %} had previously been enabled.
- - Elasticsearch health checks would not allow a yellow cluster status when running migrations.
- - Organizations created as a result of a user transforming their user account into an organization were not added to the global enterprise account.
- - When using `ghe-migrator` or exporting from {% data variables.product.prodname_dotcom_the_website %}, a long-running export would fail when data was deleted mid-export.
- - Links to inaccessible pages were removed.
- - Adding a team as a reviewer to a pull request would sometimes show the incorrect number of members on that team.
- - A large number of dormant users could cause a {% data variables.product.prodname_github_connect %} configuration to fail.
- - The "Feature & beta enrollments" page in the Site admin web UI was incorrectly available.
- - The "Site admin mode" link in the site footer did not change state when clicked.
+ - The options to enable `TLS 1.0` and `TLS 1.1` in the Privacy settings of the Management Console were shown, although removal of those protocol versions occurred in an earlier release.
+ - In a HA environment, configuring MSSQL replication could require additional manual steps after enabling {% data variables.product.prodname_actions %} for the first time.
+ - A subset of internal configuration files are more reliably updated after a hotpatch.
+ - The `ghe-run-migrations` script would sometimes fail to generate temporary certificate names correctly.
+ - In a cluster environment, Git LFS operations could fail with failed internal API calls that crossed multiple web nodes.
+ - Pre-receive hooks that used `gpg --import` timed out due to insufficient `syscall` privileges.
+ - In some cluster topologies, webhook delivery information was not available.
+ - In HA configurations, tearing down a replica would fail if {% data variables.product.prodname_actions %} had previously been enabled.
+ - Elasticsearch health checks would not allow a yellow cluster status when running migrations.
+ - Organizations created as a result of a user transforming their user account into an organization were not added to the global enterprise account.
+ - When using `ghe-migrator` or exporting from {% data variables.product.prodname_dotcom_the_website %}, a long-running export would fail when data was deleted mid-export.
+ - Links to inaccessible pages were removed.
+ - Adding a team as a reviewer to a pull request would sometimes show the incorrect number of members on that team.
+ - A large number of dormant users could cause a {% data variables.product.prodname_github_connect %} configuration to fail.
+ - The "Feature & beta enrollments" page in the Site admin web UI was incorrectly available.
+ - The "Site admin mode" link in the site footer did not change state when clicked.
changes:
- - Memcached connection limits were increased to better accommodate large cluster topologies.
- - More effectively identify and delete webhook logs that are outside of the webhook log retention window.
- - The Dependency Graph API previously ran with a statically defined port.
- - The default shard counts for cluster-related Elasticsearch shard settings have been updated.
- - The “Triage” and “Maintain” team roles are preserved during repository migrations.
+ - Memcached connection limits were increased to better accommodate large cluster topologies.
+ - More effectively identify and delete webhook logs that are outside of the webhook log retention window.
+ - The Dependency Graph API previously ran with a statically defined port.
+ - The default shard counts for cluster-related Elasticsearch shard settings have been updated.
+ - The “Triage” and “Maintain” team roles are preserved during repository migrations.
- '`NotProcessedError` exceptions were occurring unnecessarily.'
- - Performance has been improved for web requests made by enterprise owners.
+ - Performance has been improved for web requests made by enterprise owners.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/2.yml
index 18668cef74..015a7300ab 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/2.yml
@@ -1,27 +1,26 @@
----
date: '2021-06-24'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- - 管理控制台中可能会积累大量 `gauge-dependency-graph-api-dispatch_dispatch` 指标。
- - sshd 服务有时无法从 Google Cloud 平台上运行的实例开始。
- - 旧的升级文件将持续在用户磁盘上,有时导致空间不足。
- - '`gh-migrator` 显示了其日志输出的不正确路径。'
- - 如果导出文件包含不在存档中的团队的审查请求,则导出存档在导入拉取请求时将产生无提示的失败。
+ - A large number of `gauge-dependency-graph-api-dispatch_dispatch` metrics could accumulate in the Management Console.
+ - The sshd service would sometimes fail to start on instances running on Google Cloud Platform.
+ - Old upgrade files would persist on the user disk, sometimes resulting in out of space conditions.
+ - '`gh-migrator` displayed an incorrect path to its log output.'
+ - An export archive would silently fail to import pull requests if they contained review requests from teams not present in the archive.
changes:
- - 将 GHES 3.1 中的 {% data variables.product.prodname_actions %} Runner 版本更新到 [v2.278.0](https://github.com/actions/runner/releases/tag/v2.278.0)
+ - Update the {% data variables.product.prodname_actions %} Runner version in GHES 3.1 to [v2.278.0](https://github.com/actions/runner/releases/tag/v2.278.0)
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- |
- 在从 3.0.x 升级到 3.1.x后,GitHub Actions 可能会导致错误:“执行此工作流程时发生意外错误。 要解决这个问题,请连接到管理外壳 (ssh)并运行:
+ After upgrading from 3.0.x to 3.1.x, in some cases GitHub Actions can fail with an error: `An unexpected error occurred when executing this workflow.` To workaround this problem, connect to the administrative shell (ssh) and run:
```
- ghe-actions-console -s actions -c "队列-ServiceJob -JobId 4DB1F4F-19FD-40E0-A253-91288813DE8B"
+ ghe-actions-console -s actions -c "Queue-ServiceJob -JobId 4DB1F4CF-19FD-40E0-A253-91288813DE8B"
```
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/20.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/20.yml
index 5b65af39f8..d26167604c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/20.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/20.yml
@@ -1,23 +1,22 @@
----
date: '2022-04-20'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- - Upgrading the nodes in a high availability pair with an upgrade package could cause Elasticsearch to enter an inconsistent state in some cases.
+ - Upgrading the nodes in a high availability pair with an upgrade package could cause Elasticsearch to enter an inconsistent state in some cases.
- In some cluster topologies, the command line utilities `ghe-spokesctl` and `ghe-btop` failed to run.
- - Elasticsearch indices could be duplicated during a package upgrade, due to an `elasticsearch-upgrade` service running multiple times in parallel.
+ - Elasticsearch indices could be duplicated during a package upgrade, due to an `elasticsearch-upgrade` service running multiple times in parallel.
- The `maint_host_low` job queues were not processed, resulting in some maintenance tasks failing to run.
- - When converting a user account to an organization, if the user account was an owner of the {% data variables.product.prodname_ghe_server %} enterprise account, the converted organization would incorrectly appear in the enterprise owner list.
- - Creating an impersonation OAuth token using the Enterprise Administration REST API resulted in an error when an integration matching the OAuth Application ID already existed.
+ - When converting a user account to an organization, if the user account was an owner of the {% data variables.product.prodname_ghe_server %} enterprise account, the converted organization would incorrectly appear in the enterprise owner list.
+ - Creating an impersonation OAuth token using the Enterprise Administration REST API resulted in an error when an integration matching the OAuth Application ID already existed.
changes:
- - When attempting to cache a value larger than the maximum allowed in Memcached, an error was raised however the key was not reported.
+ - When attempting to cache a value larger than the maximum allowed in Memcached, an error was raised however the key was not reported.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/3.yml
index a2a9e636c2..f93c61a388 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/3.yml
@@ -1,9 +1,8 @@
----
date: '2021-07-14'
sections:
security_fixes:
- '**HIGH:** A path traversal vulnerability was identified in GitHub Enterprise Server that could be exploited when building a GitHub Pages site. User-controlled configuration options used by GitHub Pages were not sufficiently restricted and made it possible to read files on the GitHub Enterprise Server instance. To exploit this vulnerability, an attacker would need permission to create and build a GitHub Pages site on the GitHub Enterprise Server instance. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.1.3 and has been assigned CVE-2021-22867. This vulnerability was reported via the GitHub Bug Bounty program.'
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- SAML expiration date variable was not configurable.
- Application services would fail their health checks during config apply before they could enter a healthy state.
@@ -18,11 +17,11 @@ sections:
changes:
- Improved the efficiency of config apply by skipping IP allow firewall rules that had not changed, which saved significant time on large clusters.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/4.yml
index 2b735737a1..4846e1652c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/4.yml
@@ -1,8 +1,7 @@
----
date: '2021-07-27'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- The counts on packages pages were not being incremented when a package was downloaded.
- '`ghe-config-apply` would timeout, ask for a prompt or fail for a customer that had {% data variables.product.prodname_secret_scanning %} enabled, and had either disabled or never enabled {% data variables.product.prodname_actions %} on their instance.'
@@ -27,11 +26,11 @@ sections:
changes:
- The logs for `babeld` now include a `cmd` field for HTTP ref advertisement requests instead of only including it during the negotiation requests.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/5.yml
index 7de4062554..d5e39f6448 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/5.yml
@@ -1,4 +1,3 @@
----
date: '2021-08-10'
sections:
bugs:
@@ -11,11 +10,11 @@ sections:
changes:
- Abuse rate limits are now called Secondary rate limits, since the behavior they limit is not always abusive.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/6.yml
index 978474aae2..7bee782a80 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/6.yml
@@ -1,8 +1,7 @@
----
date: '2021-08-24'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Attaching very large images or animated GIFs to images or pull requests would fail.
- Journald messages related to automatic updates (`Adding h/m/s random time.`) were logged to syslog.
@@ -14,11 +13,11 @@ sections:
changes:
- Adds `triage` and `maintain` to the list of permissions returned by the REST API.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/7.yml
index 82b53c88f0..782460c8ca 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/7.yml
@@ -1,19 +1,18 @@
----
date: '2021-09-07'
sections:
security_fixes:
- - 包已更新到最新的安全版本。
+ - Packages have been updated to the latest security versions.
bugs:
- Attempting to tear down a newly-added replica node by specifying its UUID with `ghe-repl-teardown` would fail without reporting an error if replication was not started.
- GitHub Pages builds were being passed through an external proxy if there was one configured.
- Custom pre-receive hooks that created sub-processes would lack a `PATH` variable in their environment, resulting in "No such file or directory" errors.
- MySQL could failover during an upgrade if `mysql-auto-failover` was enabled.
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/8.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/8.yml
index a34f58e945..8f2e886f89 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/8.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/8.yml
@@ -1,4 +1,3 @@
----
date: '2021-09-24'
sections:
security_fixes:
@@ -11,11 +10,11 @@ sections:
- 'Fixes {% data variables.product.prodname_pages %} builds so they take into account the NO_PROXY setting of the appliance. This is relevant to appliances configured with an HTTP proxy only. (update 2021-09-30) {% comment %} https://github.com/github/pages/pull/3360 {% endcomment %}'
- 'The GitHub Connect configuration of the source instance was always restored to new instances even when the `--config` option for `ghe-restore` was not used. This would lead to a conflict with the GitHub Connect connection and license synchronization if both the source and destination instances were online at the same time. The fix also requires updating backup-utils to 3.2.0 or higher. [updated: 2021-11-18]'
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml
index 4950dacc22..be28140c54 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-1/9.yml
@@ -1,8 +1,7 @@
----
date: '2021-10-12'
sections:
security_fixes:
- - '包已更新到最新的安全版本。{% comment %} https://github.com/github/enterprise2/pull/27035, https://github.com/github/enterprise2/pull/27010 {% endcomment %}'
+ - 'Packages have been updated to the latest security versions. {% comment %} https://github.com/github/enterprise2/pull/27035, https://github.com/github/enterprise2/pull/27010 {% endcomment %}'
bugs:
- 'Custom pre-receive hooks could have failed due to too restrictive virtual memory or CPU time limits. {% comment %} https://github.com/github/enterprise2/pull/26972, https://github.com/github/enterprise2/pull/26955 {% endcomment %}'
- 'Attempting to wipe all existing configuration settings with `ghe-cleanup-settings` failed to restart the Management Console service. {% comment %} https://github.com/github/enterprise2/pull/26987, https://github.com/github/enterprise2/pull/26901 {% endcomment %}'
@@ -19,11 +18,11 @@ sections:
changes:
- 'More effectively delete Webhook logs that fall out of the Webhook log retention window. {% comment %} https://github.com/github/enterprise2/pull/27158 {% endcomment %}'
known_issues:
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
- If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml
index c52c6eafab..a59268d4f1 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0-rc1.yml
@@ -1,108 +1,154 @@
----
date: '2021-09-09'
release_candidate: true
deprecated: true
-intro: 如果 {% data variables.product.product_location %} 正在运行候选版本,则无法使用热补丁进行升级。我们建议仅在测试环境中运行候选版本。
+intro: If {% data variables.product.product_location %} is running a release candidate build, you can't upgrade with a hotpatch. We recommend only running release candidates on test environments.
sections:
features:
- -
- heading: Custom patterns for secret scanning
+ - heading: Custom patterns for secret scanning
notes:
+ # https://github.com/github/releases/issues/1426
- |
{% data variables.product.prodname_GH_advanced_security %} customers can now specify custom patterns for secret scanning. When a new pattern is specified, secret scanning searches a repository's entire Git history for the pattern, as well as any new commits.
User defined patterns are in beta for {% data variables.product.prodname_ghe_server %} 3.2. They can be defined at the repository, organization, and enterprise levels. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."
- -
- heading: Security overview for Advanced Security (beta)
+
+ - heading: Security overview for Advanced Security (beta)
notes:
+ # https://github.com/github/releases/issues/1381
- |
{% data variables.product.prodname_GH_advanced_security %} customers now have an organization-level view of the application security risks detected by {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_dependabot %}, and {% data variables.product.prodname_secret_scanning %}. The security overview shows the enablement status of security features on each repository, as well as the number of alerts detected.
In addition, the security overview lists all {% data variables.product.prodname_secret_scanning %} alerts at the organization level. Similar views for {% data variables.product.prodname_dependabot %} and {% data variables.product.prodname_code_scanning %} alerts are coming in future releases. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."

- -
- heading: Dependency review (beta)
+
+ - heading: Dependency review (beta)
notes:
+ # https://github.com/github/releases/issues/1364
- |
{% data variables.product.prodname_GH_advanced_security %} customers can now see a rich diff of the dependencies changed in a pull request. Dependency review provides an easy-to-understand view of dependency changes and their security impact in the "Files changed" tab of pull requests. It informs you of which dependencies were added, removed, or updated, along with vulnerability information for these dependencies. For more information, see "[Reviewing dependency changes in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)."
- -
- heading: GitHub Actions environments
+
+ - heading: GitHub Actions environments
notes:
+ # https://github.com/github/releases/issues/1308
- |
Environments, environment protection rules, and environment secrets are now generally available for {% data variables.product.prodname_actions %} on {% data variables.product.product_name %}. For more information, see "[Environments](/actions/reference/environments)."

- -
- heading: SSH authentication with security keys
+
+ - heading: SSH authentication with security keys
notes:
+ # https://github.com/github/releases/issues/1276
- |
SSH authentication using a FIDO2 security key is now supported when you add a `sk-ecdsa-sha2-nistp256@openssh.com` or `sk-ssh-ed25519@openssh.com` SSH key to your account. SSH security keys store secret key material on a separate hardware device that requires verification, such as a tap, to operate. For more information, see "[Generating a new SSH key and adding it to the ssh-agent](/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#generating-a-new-ssh-key-for-a-hardware-security-key)."
- -
- heading: 'Dark and dark dimmed themes'
+
+ - heading: 'Dark and dark dimmed themes'
notes:
+ # https://github.com/github/releases/issues/1260
- |
Dark and dark dimmed themes are now available for the web UI. {% data variables.product.product_name %} will match your system preferences when you haven't set theme preferences in {% data variables.product.product_name %}. You can also choose which themes are active during the day and night. For more information, see "[Managing your theme settings](/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)."

- -
- heading: 'Approving unverified domains for email notifications'
+
+ - heading: 'Approving unverified domains for email notifications'
notes:
- - 'Domains that are not able to be verified can now be approved for email notification routing. Enterprise and organization owners will be able to approve domains and immediately augment their email notification restriction policy, allowing notifications to be sent to collaborators, consultants, acquisitions, or other partners. For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise#about-approval-of-domains)" and "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise#restricting-email-notifications-for-your-enterprise-account)."'
- -
- heading: 'Git Credential Manager (GCM) secure credential storage and multi-factor authentication support'
+ # https://github.com/github/releases/issues/1244
+ - Domains that are not able to be verified can now be approved for email notification routing. Enterprise and organization owners will be able to approve domains and immediately augment their email notification restriction policy, allowing notifications to be sent to collaborators, consultants, acquisitions, or other partners. For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise#about-approval-of-domains)" and "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise#restricting-email-notifications-for-your-enterprise-account)."
+
+ - heading: 'Git Credential Manager (GCM) secure credential storage and multi-factor authentication support'
notes:
+ # https://github.com/github/releases/issues/1406
- |
Git Credential Manager (GCM) versions 2.0.452 and later now provide security-hardened credential storage and multi-factor authentication support for {% data variables.product.product_name %}.
GCM with support for {% data variables.product.product_name %} is included with [Git for Windows](https://gitforwindows.org) versions 2.32 and later. GCM is not included with Git for macOS or Linux, but can be installed separately. For more information, see the [latest release](https://github.com/GitCredentialManager/git-credential-manager/releases/) and [installation instructions](https://github.com/GitCredentialManager/git-credential-manager/releases/) in the `GitCredentialManager/git-credential-manager` repository.
+
changes:
- -
- heading: 管理更改
+ - heading: Administration Changes
notes:
+ # https://github.com/github/releases/issues/1309
- A 'User Agent Referrer Policy' setting has been added to the enterprise settings. This allows an admin to set a stricter `Referrer-Policy` to hide the hostname of a {% data variables.product.prodname_ghe_server %} installation from external sites. The setting is disabled by default and is tracked by audit log events for staff and enterprise owners when enabled or disabled. For more information, see "[Configuring Referrer Policy for your enterprise](/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise)."
+
+ # https://github.com/github/releases/issues/1515
- The MySQL health check was changed to use `mysqladmin ping` instead of TCP checks, which removes some unnecessary noise in the MySQL error log. Also, Orchestrator failover checks were improved to prevent unnecessary MySQL failovers when applying cluster config changes.
- - 'The Resque service, which supports background job processing, has been replaced with Aqueduct Lite. This change makes the job system easier to manage and should not affect the user experience. For the new administration and debugging commands for Aqueduct, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-aqueduct)."'
- -
- heading: Token Changes
+
+ # https://github.com/github/releases/issues/1287
+ - The Resque service, which supports background job processing, has been replaced with Aqueduct Lite. This change makes the job system easier to manage and should not affect the user experience. For the new administration and debugging commands for Aqueduct, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-aqueduct)."
+
+ - heading: Token Changes
notes:
+ # https://github.com/github/releases/issues/1235
- |
The format of authentication tokens for {% data variables.product.product_name %} has changed. The change affects the format of personal access tokens and access tokens for {% data variables.product.prodname_oauth_apps %}, as well as user-to-server, server-to-server, and refresh tokens for {% data variables.product.prodname_github_apps %}.
The different token types now have unique identifiable prefixes, which allows for secret scanning to detect the tokens so that you can mitigate the impact of someone accidentally committing a token to a repository. {% data variables.product.company_short %} recommends updating existing tokens as soon as possible. For more information, see "[About authentication to {% data variables.product.prodname_dotcom %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/about-authentication-to-github#githubs-token-formats)" and "[About {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/about-secret-scanning)."
- -
- heading: 'Repositories changes'
+
+ - heading: 'Repositories changes'
notes:
+ # https://github.com/github/releases/issues/1295
- Repositories on user profiles and organization profiles now support sorting by star count.
+
+ # https://github.com/github/releases/issues/1327
- When viewing the commit history of a single file, you can now click {% octicon "file-code" aria-label="The code icon" %} to view that file at the selected point in history.
+
+ # https://github.com/github/releases/issues/1254
- When a submodule is defined with a relative path in {% data variables.product.product_location %}, the submodule is now clickable in the web UI. Clicking the submodule in the web UI will take you to the linked repository. Previously, only submodules with absolute URLs were clickable. This is supported for relative paths for repositories with the same owner that follow the pattern ../REPOSITORY or relative paths for repositories with a different owner that follow the pattern ../OWNER/REPOSITORY. For more information about working with submodules, see [Working with submodules](https://github.blog/2016-02-01-working-with-submodules/) on {% data variables.product.prodname_blog %}.
- - 'The web UI can now be used to synchronize an out-of-date branch of a fork with the fork''s upstream branch. If there are no merge conflicts between the branches, the branch is updated either by fast-forwarding or by merging from upstream. If there are conflicts, you will be prompted to create a pull request to resolve the conflicts. For more information, see "[Syncing a fork](/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui)."'
- -
- heading: 'Markdown changes'
+
+ # https://github.com/github/releases/issues/1250
+ - The web UI can now be used to synchronize an out-of-date branch of a fork with the fork's upstream branch. If there are no merge conflicts between the branches, the branch is updated either by fast-forwarding or by merging from upstream. If there are conflicts, you will be prompted to create a pull request to resolve the conflicts. For more information, see "[Syncing a fork](/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui)."
+
+ - heading: 'Markdown changes'
notes:
- - 'The markdown editor used when creating or editing a release in a repository now has a text-editing toolbar. For more information, see "[Managing releases in a repository](/github/administering-a-repository/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release)."'
+ # https://github.com/github/releases/issues/1477
+ - The markdown editor used when creating or editing a release in a repository now has a text-editing toolbar. For more information, see "[Managing releases in a repository](/github/administering-a-repository/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release)."
+
+ # https://github.com/github/releases/issues/1169
- Uploading video files is now supported everywhere you write Markdown on {% data variables.product.product_name %}. Share demos, reproduction steps, and more in your issue and pull request comments, as well as in Markdown files within repositories, such as READMEs. For more information, see "[Attaching files](/github/writing-on-github/working-with-advanced-formatting/attaching-files)."
+
+ # https://github.com/github/releases/issues/1269
- Markdown files will now automatically generate a table of contents in the header when there are 2 or more headings. The table of contents is interactive and links to the selected section. All 6 Markdown heading levels are supported.
+
+ # https://github.com/github/releases/issues/1294
- 'There is a new keyboard shortcut, `cmd+e` on macOS or `ctrl+e` on Windows, to insert codeblocks in Markdown files, issues, pull requests, and comments.'
- - 'Appending `?plain=1` to the URL for any Markdown file will now display the file without rendering and with line numbers. The plain view can be used to link other users to specific lines. For example, appending `?plain=1#L52` will highlight line 52 of a plain text Markdown file. For more information, "[Creating a permanent link to a code snippet](/github/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet#linking-to-markdown)."'
- -
- heading: 'Issues and pull requests changes'
+
+ # https://github.com/github/releases/issues/1474
+ - Appending `?plain=1` to the URL for any Markdown file will now display the file without rendering and with line numbers. The plain view can be used to link other users to specific lines. For example, appending `?plain=1#L52` will highlight line 52 of a plain text Markdown file. For more information, "[Creating a permanent link to a code snippet](/github/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet#linking-to-markdown)."
+
+ - heading: 'Issues and pull requests changes'
notes:
+ # https://github.com/github/releases/issues/1413
- With the [latest version of Octicons](https://github.com/primer/octicons/releases), the states of issues and pull requests are now more visually distinct so you can scan their status more easily. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2021-06-08-new-issue-and-pull-request-state-icons/).
- - 'A new "Require conversation resolution before merging" branch protection rule and "Conversations" menu is now available. Easily discover your pull request comments from the "Files changed" tab, and require that all your pull request conversations are resolved before merging. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)."'
+
+ # https://github.com/github/releases/issues/1419
+ - A new "Require conversation resolution before merging" branch protection rule and "Conversations" menu is now available. Easily discover your pull request comments from the "Files changed" tab, and require that all your pull request conversations are resolved before merging. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)."
+
+ # https://github.com/github/releases/issues/1279
- To prevent the merge of unexpected changes after auto-merge is enabled for a pull request, auto-merge is now disabled automatically when new changes are pushed by a user without write access to the repository. Users without write access can still update the pull request with changes from the base branch when auto-merge is enabled. To prevent a malicious user from using a merge conflict to introduce unexpected changes to the pull request, auto-merge for the pull request is disabled if the update causes a merge conflict. For more information about auto-merge, see "[Automatically merging a pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)."
- - 'People with maintain permissions can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin permissions could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."'
+
+ # https://github.com/github/releases/issues/1550
+ - People with maintain permissions can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin permissions could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."
+
+ # https://github.com/github/releases/issues/1201
- The assignees selection for issues and pull requests now supports type ahead searching so you can find users in your organization faster. Additionally, search result rankings have been updated to prefer matches at the start of a person's username or profile name.
+
+ # https://github.com/github/releases/issues/1430
- When a review is requested from a team of more than 100 people, developers are now shown a confirmation dialog box in order to prevent unnecessary notifications for large teams.
+
+ # https://github.com/github/releases/issues/1293
- Back-tick `code blocks` are now supported in issue titles, pull request titles, and in any place issue and pull request titles are referenced in {% data variables.product.prodname_ghe_server %}.
- - 'Events for pull requests and pull request reviews are now included in the audit log for both [enterprises](/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization). These events help admins better monitor pull request activity and help ensure security and compliance requirements are being met. Events can be viewed from the web UI, exported as CSV or JSON, or accessed via REST API. You can also search the audit log for specific pull request events. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#pull_request-category-actions)."'
- -
- heading: 'Branches changes'
+
+ # https://github.com/github/releases/issues/1300
+ - Events for pull requests and pull request reviews are now included in the audit log for both [enterprises](/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization). These events help admins better monitor pull request activity and help ensure security and compliance requirements are being met. Events can be viewed from the web UI, exported as CSV or JSON, or accessed via REST API. You can also search the audit log for specific pull request events. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#pull_request-category-actions)."
+
+ - heading: 'Branches changes'
notes:
+ # https://github.com/github/releases/issues/885
- |
The default branch name for new repositories is now `main`. Existing repositories are not impacted by this change. If users, organization owners, or enterprise owners have previously specified a default branch for new repositories, they are also not impacted.
If you want to set a different default branch name, you can do so in the [user](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories), [organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization), or [enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name) settings.
+
+ # https://github.com/github/releases/issues/981
- |
Branches, including the default branch, can now be renamed using the the {% data variables.product.product_name %} web UI. When a branch is renamed, any open pull requests and draft releases targeting the renamed branch will be retargeted automatically, and branch protection rules that explicitly reference the renamed branch will be updated.
@@ -116,44 +162,75 @@ sections:
* An informational message is displayed to Git command line users that push to the old branch.
For more information, see "[Renaming a branch](/github/administering-a-repository/managing-branches-in-your-repository/renaming-a-branch)."
- -
- heading: 'GitHub Actions changes'
+
+ - heading: 'GitHub Actions changes'
notes:
+ # https://github.com/github/releases/issues/1227
- '{% data variables.product.prodname_actions %} now lets you control the permissions granted to the `GITHUB_TOKEN` secret. The `GITHUB_TOKEN` is an automatically-generated secret that lets you make authenticated calls to the API for {% data variables.product.product_name %} in your workflow runs. {% data variables.product.prodname_actions %} generates a new token for each job and expires the token when a job completes. The token usually has `write` permissions to a number of [API endpoints](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token), except in the case of pull requests from forks, which are always `read`. These new settings allow you to follow a principle of least privilege in your workflows. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#modifying-the-permissions-for-the-github_token)."'
+
+ # https://github.com/github/releases/issues/1280
- '{% data variables.product.prodname_cli %} 1.9 and later allows you to work with {% data variables.product.prodname_actions %} in your terminal. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-04-15-github-cli-1-9-enables-you-to-work-with-github-actions-from-your-terminal/).'
- - 'The audit log now includes events associated with {% data variables.product.prodname_actions %} workflow runs. This data provides administrators with a greatly expanded data set for security and compliance audits. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#workflows-category-actions)."'
- - 'Performance improvements have been made to {% data variables.product.prodname_actions %}, which may result in higher maximum job throughput. For more information on job throughput with internally-tested CPU and memory configurations, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-considerations)."'
- -
- heading: 'GitHub Packages changes'
+
+ # https://github.com/github/releases/issues/1157
+ - The audit log now includes events associated with {% data variables.product.prodname_actions %} workflow runs. This data provides administrators with a greatly expanded data set for security and compliance audits. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#workflows-category-actions)."
+
+ # https://github.com/github/releases/issues/1587
+ - Performance improvements have been made to {% data variables.product.prodname_actions %}, which may result in higher maximum job throughput. For more information on job throughput with internally-tested CPU and memory configurations, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-considerations)."
+
+ - heading: 'GitHub Packages changes'
notes:
+ # https://github.com/github/releases/issues/1088
- Any package or package version for {% data variables.product.prodname_registry %} can now be deleted from {% data variables.product.product_name %}'s web UI. You can also undo the deletion of any package or package version within 30 days. For more information, see "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)".
- -
- heading: 'Dependabot and Dependency graph changes'
+
+ - heading: 'Dependabot and Dependency graph changes'
notes:
- - 'The dependency graph can now be enabled using the Management Console, rather than needing to run a command in the administrative shell. For more information, see "[Enabling alerts for vulnerable dependencies {% data variables.product.prodname_ghe_server %}](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server#enabling-the-dependency-graph-and-dependabot-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."'
+ # https://github.com/github/releases/issues/1537
+ - The dependency graph can now be enabled using the Management Console, rather than needing to run a command in the administrative shell. For more information, see "[Enabling alerts for vulnerable dependencies {% data variables.product.prodname_ghe_server %}](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server#enabling-the-dependency-graph-and-dependabot-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
+
+ # https://github.com/github/releases/issues/1153
- Notifications for multiple {% data variables.product.prodname_dependabot_alerts %} are now grouped together if they're discovered at the same time. This significantly reduces the volume of {% data variables.product.prodname_dependabot %} alert notifications that users receive. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-03-18-grouped-dependabot-alert-notifications/).
- - 'Dependency graph and {% data variables.product.prodname_dependabot_alerts %} now support Go modules. {% data variables.product.prodname_ghe_server %} analyzes a repository''s `go.mod` files to understand the repository’s dependencies. Along with security advisories, the dependency graph provides the information needed to alert developers to vulnerable dependencies. For more information about enabling the dependency graph on private repositories, see "[Securing your repository](/code-security/getting-started/securing-your-repository#managing-the-dependency-graph)."'
+
+ # https://github.com/github/releases/issues/1371
+ - Dependency graph and {% data variables.product.prodname_dependabot_alerts %} now support Go modules. {% data variables.product.prodname_ghe_server %} analyzes a repository's `go.mod` files to understand the repository’s dependencies. Along with security advisories, the dependency graph provides the information needed to alert developers to vulnerable dependencies. For more information about enabling the dependency graph on private repositories, see "[Securing your repository](/code-security/getting-started/securing-your-repository#managing-the-dependency-graph)."
+
+ # https://github.com/github/releases/issues/1538
- The default notification settings for security alerts have changed. Previously, if you had permission to view security alerts in a repository, you would receive notifications for that repository as long as your settings allowed for security alert notifications. Now, you must opt in to security alert notifications by watching the repository. You will be notified if you select `All Activity` or configure `Custom` to include `Security alerts`. All existing repositories will be automatically migrated to these new settings and you will continue to receive notifications; however, any new repositories will require opting-in by watching the repository. For more information see "[Configuring notifications for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies)" and "[Managing alerts from secret scanning](/code-security/secret-security/managing-alerts-from-secret-scanning)."
- -
- heading: 'Code scanning and secret scanning changes'
+
+ - heading: 'Code scanning and secret scanning changes'
notes:
+ # https://github.com/github/releases/issues/1352
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql %} now generates diagnostic information for all supported languages. This helps check the state of the created database to understand the status and quality of performed analysis. The diagnostic information is available starting in [version 2.5.6](https://github.com/github/codeql-cli-binaries/releases) of the [{% data variables.product.prodname_codeql_cli %}](https://codeql.github.com/docs/codeql-cli/). You can see the detailed diagnostic information in the {% data variables.product.prodname_actions %} logs for {% data variables.product.prodname_codeql %}. For more information, see "[Viewing code scanning logs](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/viewing-code-scanning-logs)."'
+
+ # https://github.com/github/releases/issues/1360
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql_cli %} now supports analyzing several languages during a single build. This makes it easier to run code analysis to use CI/CD systems other than {% data variables.product.prodname_actions %}. The new mode of the `codeql database create` command is available starting [version 2.5.6](https://github.com/github/codeql-cli-binaries/releases) of the [{% data variables.product.prodname_codeql_cli %}](https://codeql.github.com/docs/codeql-cli/). For more information about setting this up, see "[Installing {% data variables.product.prodname_codeql_cli %} in your CI system](/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-cli-in-your-ci-system)."'
+
+ # https://github.com/github/releases/issues/1160
- '{% data variables.product.prodname_code_scanning_capc %} alerts from all enabled tools are now shown in one consolidated list, so that you can easily prioritize across all alerts. You can view alerts from a specific tool by using the "Tool" filter, and the "Rule" and "Tag" filters will dynamically update based on your "Tool" selection.'
+
+ # https://github.com/github/releases/issues/1454
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql %} now includes beta support for analyzing C++20 code. This is only available when building codebases with GCC on Linux. C++20 modules are not supported yet.'
+
+ # https://github.com/github/releases/issues/1375
- The depth of {% data variables.product.prodname_codeql %}'s analysis has been improved by adding support for more [libraries and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/) and increasing the coverage of our existing library and framework models for several languages ([C++](https://github.com/github/codeql/tree/main/cpp), [JavaScript](https://github.com/github/codeql/tree/main/javascript), [Python](https://github.com/github/codeql/tree/main/python), and [Java](https://github.com/github/codeql/tree/main/java)). As a result, {% data variables.product.prodname_codeql %} can now detect even more potential sources of untrusted user data, review the steps through which that data flows, and identify potentially dangerous sinks in which this data could end up. This results in an overall improvement of the quality of the {% data variables.product.prodname_code_scanning %} alerts. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-07-01-codeql-code-scanning-now-recognizes-more-sources-and-uses-of-untrusted-user-data/).
+
+ # https://github.com/github/releases/issues/1335
+ # https://github.com/github/releases/issues/1314
- |
- {% data variables.product.prodname_code_scanning_capc %} now shows `security-severity` levels for CodeQL security alerts. You can configure which `security-severity` levels will cause a check failure for a pull request. The severity level of security alerts can be `critical`, `high`, `medium`, or `low`. By default, any {% data variables.product.prodname_code_scanning %} alerts with a `security-severity` of `critical` or `high` will cause a pull request check failure.
+ {% data variables.product.prodname_code_scanning_capc %} now shows `security-severity` levels for CodeQL security alerts. You can configure which `security-severity` levels will cause a check failure for a pull request. The severity level of security alerts can be `critical`, `high`, `medium`, or `low`. By default, any {% data variables.product.prodname_code_scanning %} alerts with a `security-severity` of `critical` or `high` will cause a pull request check failure.
Additionally, you can now also configure which severity levels will cause a pull request check to fail for non-security alerts. You can configure this behavior at the repository level, and define whether alerts with the severity `error`, `warning`, or `note` will cause a pull request check to fail. By default, non-security {% data variables.product.prodname_code_scanning %} alerts with a severity of `error` will cause a pull request check failure.
For more information see "[Defining which alert severity levels cause pull request check failure](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#defining-the-severities-causing-pull-request-check-failure)."

+
+ # https://github.com/github/releases/issues/1324
- |
Improvements to the branch filter for {% data variables.product.prodname_code_scanning %} alerts make it clearer which {% data variables.product.prodname_code_scanning %} alerts are being displayed on the alerts page. By default, {% data variables.product.prodname_code_scanning %} alerts are filtered to show alerts for the default branch of the repository only. You can use the branch filter to display the alerts on any of the non-default branches. Any branch filter that has been applied is shown in the search bar.
The search syntax has also been simplified to `branch:`. This syntax can be used multiple times in the search bar to filter on multiple branches. The previous syntax, `ref:refs/heads/`, is still supported, so any saved URLs will continue to work.
+
+ # https://github.com/github/releases/issues/1313
- |
Free text search is now available for code scanning alerts. You can search code scanning results to quickly find specific alerts without having to know exact search terms. The search is applied across the alert's name, description, and help text. The syntax is:
@@ -161,50 +238,58 @@ sections:
- Multiple search words returns matches to either word.
- Words in double quotes returns exact matches.
- The keyword 'AND' returns matches to multiple words.
+
- '{% data variables.product.prodname_secret_scanning_caps %} added patterns for 23 new service providers. For the updated list of supported secrets, see "[About secret scanning](/code-security/secret-scanning/about-secret-scanning)."'
- -
- heading: API 更改
+
+ - heading: API Changes
notes:
- - 'Pagination support has been added to the Repositories REST API''s "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."'
- - 'The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Webhooks](/rest/reference/webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.'
+ # https://github.com/github/releases/issues/1253
+ - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+
+ # https://github.com/github/releases/issues/969
+ - The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Webhooks](/rest/reference/webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.
+
+ # https://github.com/github/releases/issues/1349
- |
Improvements have been made to the code scanning and {% data variables.product.prodname_GH_advanced_security %} APIs:
- The code scanning API now returns the CodeQL query version used for an analysis. This can be used to reproduce results or confirm that an analysis used the latest query. For more information, see "[Code scanning](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository)" in the REST API documentation.
- Admin users can now use the REST API to enable or disable {% data variables.product.prodname_GH_advanced_security %} for repositories, using the `security_and_analysis` object on `repos/{org}/{repo}`. In addition, admin users can check whether {% data variables.product.prodname_advanced_security %} is currently enabled for a repository by using a `GET /repos/{owner}/{repo}` request. These changes help you manage {% data variables.product.prodname_advanced_security %} repository access at scale. For more information, see "[Repositories](/rest/reference/repos#update-a-repository)" in the REST API documentation.
- #No security/bug fixes for the RC release
- #security_fixes:
- #- PLACEHOLDER
- #bugs:
- #- PLACEHOLDER
+
+ # No security/bug fixes for the RC release
+ # security_fixes:
+ # - PLACEHOLDER
+
+ # bugs:
+ # - PLACEHOLDER
+
known_issues:
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+
deprecations:
- -
- heading: 弃用 GitHub Enterprise Server 2.21
+ - heading: Deprecation of GitHub Enterprise Server 2.21
notes:
- - '*{% data variables.product.prodname_ghe_server %} 2.21 自 2021 年 6 月 6 日起停止使用**。这意味着在此日期之后,即使对于关键的安全问题,也不会发布修补程序。为获得更好的性能、更高的安全性和新功能,请尽快[升级到最新版本的 {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server)。'
- -
- heading: 弃用 GitHub Enterprise Server 2.22
+ - '**{% data variables.product.prodname_ghe_server %} 2.21 was discontinued on June 6, 2021**. That means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ - heading: Deprecation of GitHub Enterprise Server 2.22
notes:
- - '*{% data variables.product.prodname_ghe_server %} 2.22 自 2021 年 9 月 23 日起停止使用**。这意味着在此日期之后,即使对于关键的安全问题,也不会发布修补程序。为获得更好的性能、更高的安全性和新功能,请尽快[升级到最新版本的 {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server)。'
- -
- heading: XenServer Hypervisor 支持终止
+ - '**{% data variables.product.prodname_ghe_server %} 2.22 will be discontinued on September 23, 2021**. That means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ - heading: Deprecation of XenServer Hypervisor support
notes:
+ # https://github.com/github/docs-content/issues/4439
- Beginning in {% data variables.product.prodname_ghe_server %} 3.1, we will begin discontinuing support for Xen Hypervisor. The complete deprecation is scheduled for {% data variables.product.prodname_ghe_server %} 3.3, following the standard one year deprecation window. Please contact [GitHub Support](https://support.github.com/contact) with questions or concerns.
- -
- heading: 删除旧 GitHub 服务
+ - heading: Removal of Legacy GitHub Services
notes:
+ # https://github.com/github/releases/issues/1506
- '{% data variables.product.prodname_ghe_server %} 3.2 removes unused GitHub Service database records. More information is available in the [deprecation announcement post](https://developer.github.com/changes/2018-04-25-github-services-deprecation/).'
- -
- heading: Deprecation of OAuth Application API endpoints and API authentication via query parameters
+ - heading: Deprecation of OAuth Application API endpoints and API authentication via query parameters
notes:
+ # https://github.com/github/releases/issues/1316
- |
To prevent accidental logging or exposure of `access_tokens`, we discourage the use of OAuth Application API endpoints and the use of API auth via query params. Visit the following posts to see the proposed replacements:
@@ -212,12 +297,13 @@ sections:
* [Replacement auth via headers instead of query param](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/#changes-to-make)
These endpoints and auth route are planned to be removed from {% data variables.product.prodname_ghe_server %} in {% data variables.product.prodname_ghe_server %} 3.4.
- -
- heading: Removal of legacy GitHub App webhook events and endpoints
+ - heading: Removal of legacy GitHub App webhook events and endpoints
notes:
+ # https://github.com/github/releases/issues/965
- |
Two legacy GitHub Apps-related webhook events have been removed: `integration_installation` and `integration_installation_repositories`. You should instead be listening to the `installation` and `installation_repositories` events.
- |
The following REST API endpoint has been removed: `POST /installations/{installation_id}/access_tokens`. You should instead be using the namespaced equivalent `POST /app/installations/{installation_id}/access_tokens`.
+
backups:
- '{% data variables.product.prodname_ghe_server %} 3.2 requires at least [GitHub Enterprise Backup Utilities 3.2.0](https://github.com/github/backup-utils) for [Backups and Disaster Recovery](/enterprise-server@3.2/admin/configuration/configuring-backups-on-your-appliance).'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
index bc1a754344..dd9ef8063b 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/0.yml
@@ -1,106 +1,152 @@
----
date: '2021-09-28'
intro: For upgrade instructions, see "[Upgrading {% data variables.product.prodname_ghe_server %}](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)."
sections:
features:
- -
- heading: Custom patterns for secret scanning
+ - heading: Custom patterns for secret scanning
notes:
+ # https://github.com/github/releases/issues/1426
- |
{% data variables.product.prodname_GH_advanced_security %} customers can now specify custom patterns for secret scanning. When a new pattern is specified, secret scanning searches a repository's entire Git history for the pattern, as well as any new commits.
User defined patterns are in beta for {% data variables.product.prodname_ghe_server %} 3.2. They can be defined at the repository, organization, and enterprise levels. For more information, see "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."
- -
- heading: Security overview for Advanced Security (beta)
+
+ - heading: Security overview for Advanced Security (beta)
notes:
+ # https://github.com/github/releases/issues/1381
- |
{% data variables.product.prodname_GH_advanced_security %} customers now have an organization-level view of the application security risks detected by {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_dependabot %}, and {% data variables.product.prodname_secret_scanning %}. The security overview shows the enablement status of security features on each repository, as well as the number of alerts detected.
In addition, the security overview lists all {% data variables.product.prodname_secret_scanning %} alerts at the organization level. Similar views for {% data variables.product.prodname_dependabot %} and {% data variables.product.prodname_code_scanning %} alerts are coming in future releases. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."

- -
- heading: Dependency review (beta)
+
+ - heading: Dependency review (beta)
notes:
+ # https://github.com/github/releases/issues/1364
- |
{% data variables.product.prodname_GH_advanced_security %} customers can now see a rich diff of the dependencies changed in a pull request. Dependency review provides an easy-to-understand view of dependency changes and their security impact in the "Files changed" tab of pull requests. It informs you of which dependencies were added, removed, or updated, along with vulnerability information for these dependencies. For more information, see "[Reviewing dependency changes in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)."
- -
- heading: GitHub Actions environments
+
+ - heading: GitHub Actions environments
notes:
+ # https://github.com/github/releases/issues/1308
- |
Environments, environment protection rules, and environment secrets are now generally available for {% data variables.product.prodname_actions %} on {% data variables.product.product_name %}. For more information, see "[Environments](/actions/reference/environments)."

- -
- heading: SSH authentication with security keys
+
+ - heading: SSH authentication with security keys
notes:
+ # https://github.com/github/releases/issues/1276
- |
SSH authentication using a FIDO2 security key is now supported when you add a `sk-ecdsa-sha2-nistp256@openssh.com` or `sk-ssh-ed25519@openssh.com` SSH key to your account. SSH security keys store secret key material on a separate hardware device that requires verification, such as a tap, to operate. For more information, see "[Generating a new SSH key and adding it to the ssh-agent](/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#generating-a-new-ssh-key-for-a-hardware-security-key)."
- -
- heading: 'Dark and dark dimmed themes'
+
+ - heading: 'Dark and dark dimmed themes'
notes:
+ # https://github.com/github/releases/issues/1260
- |
Dark and dark dimmed themes are now available for the web UI. {% data variables.product.product_name %} will match your system preferences when you haven't set theme preferences in {% data variables.product.product_name %}. You can also choose which themes are active during the day and night. For more information, see "[Managing your theme settings](/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)."

- -
- heading: 'Approving unverified domains for email notifications'
+
+ - heading: 'Approving unverified domains for email notifications'
notes:
- - 'Domains that are not able to be verified can now be approved for email notification routing. Enterprise and organization owners will be able to approve domains and immediately augment their email notification restriction policy, allowing notifications to be sent to collaborators, consultants, acquisitions, or other partners. For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise#about-approval-of-domains)" and "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise#restricting-email-notifications-for-your-enterprise-account)."'
- -
- heading: 'Git Credential Manager (GCM) secure credential storage and multi-factor authentication support'
+ # https://github.com/github/releases/issues/1244
+ - Domains that are not able to be verified can now be approved for email notification routing. Enterprise and organization owners will be able to approve domains and immediately augment their email notification restriction policy, allowing notifications to be sent to collaborators, consultants, acquisitions, or other partners. For more information, see "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise#about-approval-of-domains)" and "[Restricting email notifications for your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/restricting-email-notifications-for-your-enterprise#restricting-email-notifications-for-your-enterprise-account)."
+
+ - heading: 'Git Credential Manager (GCM) secure credential storage and multi-factor authentication support'
notes:
+ # https://github.com/github/releases/issues/1406
- |
Git Credential Manager (GCM) versions 2.0.452 and later now provide security-hardened credential storage and multi-factor authentication support for {% data variables.product.product_name %}.
GCM with support for {% data variables.product.product_name %} is included with [Git for Windows](https://gitforwindows.org) versions 2.32 and later. GCM is not included with Git for macOS or Linux, but can be installed separately. For more information, see the [latest release](https://github.com/GitCredentialManager/git-credential-manager/releases/) and [installation instructions](https://github.com/GitCredentialManager/git-credential-manager/releases/) in the `GitCredentialManager/git-credential-manager` repository.
+
changes:
- -
- heading: 管理更改
+ - heading: Administration Changes
notes:
+ # https://github.com/github/releases/issues/1309
- A 'User Agent Referrer Policy' setting has been added to the enterprise settings. This allows an admin to set a stricter `Referrer-Policy` to hide the hostname of a {% data variables.product.prodname_ghe_server %} installation from external sites. The setting is disabled by default and is tracked by audit log events for staff and enterprise owners when enabled or disabled. For more information, see "[Configuring Referrer Policy for your enterprise](/admin/configuration/configuring-your-enterprise/configuring-the-referrer-policy-for-your-enterprise)."
+
+ # https://github.com/github/releases/issues/1515
- The MySQL health check was changed to use `mysqladmin ping` instead of TCP checks, which removes some unnecessary noise in the MySQL error log. Also, Orchestrator failover checks were improved to prevent unnecessary MySQL failovers when applying cluster config changes.
- - 'The Resque service, which supports background job processing, has been replaced with Aqueduct Lite. This change makes the job system easier to manage and should not affect the user experience. For the new administration and debugging commands for Aqueduct, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-aqueduct)."'
- -
- heading: Token Changes
+
+ # https://github.com/github/releases/issues/1287
+ - The Resque service, which supports background job processing, has been replaced with Aqueduct Lite. This change makes the job system easier to manage and should not affect the user experience. For the new administration and debugging commands for Aqueduct, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-aqueduct)."
+
+ - heading: Token Changes
notes:
+ # https://github.com/github/releases/issues/1235
- |
The format of authentication tokens for {% data variables.product.product_name %} has changed. The change affects the format of personal access tokens and access tokens for {% data variables.product.prodname_oauth_apps %}, as well as user-to-server, server-to-server, and refresh tokens for {% data variables.product.prodname_github_apps %}.
The different token types now have unique identifiable prefixes, which allows for secret scanning to detect the tokens so that you can mitigate the impact of someone accidentally committing a token to a repository. {% data variables.product.company_short %} recommends updating existing tokens as soon as possible. For more information, see "[About authentication to {% data variables.product.prodname_dotcom %}](/github/authenticating-to-github/keeping-your-account-and-data-secure/about-authentication-to-github#githubs-token-formats)" and "[About {% data variables.product.prodname_secret_scanning %}](/code-security/secret-security/about-secret-scanning)."
- -
- heading: 'Repositories changes'
+
+ - heading: 'Repositories changes'
notes:
+ # https://github.com/github/releases/issues/1295
- Repositories on user profiles and organization profiles now support sorting by star count.
+
+ # https://github.com/github/releases/issues/1327
- When viewing the commit history of a single file, you can now click {% octicon "file-code" aria-label="The code icon" %} to view that file at the selected point in history.
+
+ # https://github.com/github/releases/issues/1254
- When a submodule is defined with a relative path in {% data variables.product.product_location %}, the submodule is now clickable in the web UI. Clicking the submodule in the web UI will take you to the linked repository. Previously, only submodules with absolute URLs were clickable. This is supported for relative paths for repositories with the same owner that follow the pattern ../REPOSITORY or relative paths for repositories with a different owner that follow the pattern ../OWNER/REPOSITORY. For more information about working with submodules, see [Working with submodules](https://github.blog/2016-02-01-working-with-submodules/) on {% data variables.product.prodname_blog %}.
- - 'The web UI can now be used to synchronize an out-of-date branch of a fork with the fork''s upstream branch. If there are no merge conflicts between the branches, the branch is updated either by fast-forwarding or by merging from upstream. If there are conflicts, you will be prompted to create a pull request to resolve the conflicts. For more information, see "[Syncing a fork](/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui)."'
- -
- heading: 'Markdown changes'
+
+ # https://github.com/github/releases/issues/1250
+ - The web UI can now be used to synchronize an out-of-date branch of a fork with the fork's upstream branch. If there are no merge conflicts between the branches, the branch is updated either by fast-forwarding or by merging from upstream. If there are conflicts, you will be prompted to create a pull request to resolve the conflicts. For more information, see "[Syncing a fork](/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui)."
+
+ - heading: 'Markdown changes'
notes:
- - 'The markdown editor used when creating or editing a release in a repository now has a text-editing toolbar. For more information, see "[Managing releases in a repository](/github/administering-a-repository/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release)."'
+ # https://github.com/github/releases/issues/1477
+ - The markdown editor used when creating or editing a release in a repository now has a text-editing toolbar. For more information, see "[Managing releases in a repository](/github/administering-a-repository/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release)."
+
+ # https://github.com/github/releases/issues/1169
- Uploading video files is now supported everywhere you write Markdown on {% data variables.product.product_name %}. Share demos, reproduction steps, and more in your issue and pull request comments, as well as in Markdown files within repositories, such as READMEs. For more information, see "[Attaching files](/github/writing-on-github/working-with-advanced-formatting/attaching-files)."
+
+ # https://github.com/github/releases/issues/1269
- Markdown files will now automatically generate a table of contents in the header when there are 2 or more headings. The table of contents is interactive and links to the selected section. All 6 Markdown heading levels are supported.
+
+ # https://github.com/github/releases/issues/1294
- 'There is a new keyboard shortcut, `cmd+e` on macOS or `ctrl+e` on Windows, to insert codeblocks in Markdown files, issues, pull requests, and comments.'
- - 'Appending `?plain=1` to the URL for any Markdown file will now display the file without rendering and with line numbers. The plain view can be used to link other users to specific lines. For example, appending `?plain=1#L52` will highlight line 52 of a plain text Markdown file. For more information, "[Creating a permanent link to a code snippet](/github/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet#linking-to-markdown)."'
- -
- heading: 'Issues and pull requests changes'
+
+ # https://github.com/github/releases/issues/1474
+ - Appending `?plain=1` to the URL for any Markdown file will now display the file without rendering and with line numbers. The plain view can be used to link other users to specific lines. For example, appending `?plain=1#L52` will highlight line 52 of a plain text Markdown file. For more information, "[Creating a permanent link to a code snippet](/github/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet#linking-to-markdown)."
+
+ - heading: 'Issues and pull requests changes'
notes:
+ # https://github.com/github/releases/issues/1413
- With the [latest version of Octicons](https://github.com/primer/octicons/releases), the states of issues and pull requests are now more visually distinct so you can scan their status more easily. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2021-06-08-new-issue-and-pull-request-state-icons/).
- - 'A new "Require conversation resolution before merging" branch protection rule and "Conversations" menu is now available. Easily discover your pull request comments from the "Files changed" tab, and require that all your pull request conversations are resolved before merging. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)."'
+
+ # https://github.com/github/releases/issues/1419
+ - A new "Require conversation resolution before merging" branch protection rule and "Conversations" menu is now available. Easily discover your pull request comments from the "Files changed" tab, and require that all your pull request conversations are resolved before merging. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)."
+
+ # https://github.com/github/releases/issues/1279
- To prevent the merge of unexpected changes after auto-merge is enabled for a pull request, auto-merge is now disabled automatically when new changes are pushed by a user without write access to the repository. Users without write access can still update the pull request with changes from the base branch when auto-merge is enabled. To prevent a malicious user from using a merge conflict to introduce unexpected changes to the pull request, auto-merge for the pull request is disabled if the update causes a merge conflict. For more information about auto-merge, see "[Automatically merging a pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)."
- - 'People with maintain permissions can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin permissions could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."'
+
+ # https://github.com/github/releases/issues/1550
+ - People with maintain permissions can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin permissions could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."
+
+ # https://github.com/github/releases/issues/1201
- The assignees selection for issues and pull requests now supports type ahead searching so you can find users in your organization faster. Additionally, search result rankings have been updated to prefer matches at the start of a person's username or profile name.
+
+ # https://github.com/github/releases/issues/1430
- When a review is requested from a team of more than 100 people, developers are now shown a confirmation dialog box in order to prevent unnecessary notifications for large teams.
+
+ # https://github.com/github/releases/issues/1293
- Back-tick `code blocks` are now supported in issue titles, pull request titles, and in any place issue and pull request titles are referenced in {% data variables.product.prodname_ghe_server %}.
- - 'Events for pull requests and pull request reviews are now included in the audit log for both [enterprises](/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization). These events help admins better monitor pull request activity and help ensure security and compliance requirements are being met. Events can be viewed from the web UI, exported as CSV or JSON, or accessed via REST API. You can also search the audit log for specific pull request events. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#pull_request-category-actions)."'
- -
- heading: 'Branches changes'
+
+ # https://github.com/github/releases/issues/1300
+ - Events for pull requests and pull request reviews are now included in the audit log for both [enterprises](/admin/user-management/managing-users-in-your-enterprise/auditing-users-across-your-enterprise) and [organizations](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization). These events help admins better monitor pull request activity and help ensure security and compliance requirements are being met. Events can be viewed from the web UI, exported as CSV or JSON, or accessed via REST API. You can also search the audit log for specific pull request events. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#pull_request-category-actions)."
+
+ - heading: 'Branches changes'
notes:
+ # https://github.com/github/releases/issues/885
- |
The default branch name for new repositories is now `main`. Existing repositories are not impacted by this change. If users, organization owners, or enterprise owners have previously specified a default branch for new repositories, they are also not impacted.
If you want to set a different default branch name, you can do so in the [user](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories), [organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization), or [enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name) settings.
+
+ # https://github.com/github/releases/issues/981
- |
Branches, including the default branch, can now be renamed using the the {% data variables.product.product_name %} web UI. When a branch is renamed, any open pull requests and draft releases targeting the renamed branch will be retargeted automatically, and branch protection rules that explicitly reference the renamed branch will be updated.
@@ -114,47 +160,79 @@ sections:
* An informational message is displayed to Git command line users that push to the old branch.
For more information, see "[Renaming a branch](/github/administering-a-repository/managing-branches-in-your-repository/renaming-a-branch)."
- -
- heading: 'GitHub Actions changes'
+
+ - heading: 'GitHub Actions changes'
notes:
+ # https://github.com/github/releases/issues/1227
- '{% data variables.product.prodname_actions %} now lets you control the permissions granted to the `GITHUB_TOKEN` secret. The `GITHUB_TOKEN` is an automatically-generated secret that lets you make authenticated calls to the API for {% data variables.product.product_name %} in your workflow runs. {% data variables.product.prodname_actions %} generates a new token for each job and expires the token when a job completes. The token usually has `write` permissions to a number of [API endpoints](/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token), except in the case of pull requests from forks, which are always `read`. These new settings allow you to follow a principle of least privilege in your workflows. For more information, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#modifying-the-permissions-for-the-github_token)."'
+
+ # https://github.com/github/releases/issues/1280
- '{% data variables.product.prodname_cli %} 1.9 and later allows you to work with {% data variables.product.prodname_actions %} in your terminal. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-04-15-github-cli-1-9-enables-you-to-work-with-github-actions-from-your-terminal/).'
- - 'The audit log now includes events associated with {% data variables.product.prodname_actions %} workflow runs. This data provides administrators with a greatly expanded data set for security and compliance audits. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#workflows-category-actions)."'
+
+ # https://github.com/github/releases/issues/1157
+ - The audit log now includes events associated with {% data variables.product.prodname_actions %} workflow runs. This data provides administrators with a greatly expanded data set for security and compliance audits. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#workflows-category-actions)."
+
+ # https://github.com/github/releases/issues/1587
- |
{% data variables.product.prodname_ghe_server %} 3.2 contains performance improvements for job concurrency with {% data variables.product.prodname_actions %}. For more information about the new performance targets for a range of CPU and memory configurations, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-considerations)."
* The "Maximum Concurrency" values were modified to reflect our most up to date performance testing. [Updated: 2021-12-07]
+
- The [{% data variables.product.prodname_actions %} Runner](https://github.com/actions/runner) application in {% data variables.product.prodname_ghe_server %} 3.2 has been updated to [v2.279.0](https://github.com/actions/runner/releases/tag/v2.279.0).
- -
- heading: 'GitHub Packages changes'
+
+ - heading: 'GitHub Packages changes'
notes:
+ # https://github.com/github/releases/issues/1088
- Any package or package version for {% data variables.product.prodname_registry %} can now be deleted from {% data variables.product.product_name %}'s web UI. You can also undo the deletion of any package or package version within 30 days. For more information, see "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)".
- -
- heading: 'Dependabot and Dependency graph changes'
+
+ - heading: 'Dependabot and Dependency graph changes'
notes:
- - 'The dependency graph can now be enabled using the Management Console, rather than needing to run a command in the administrative shell. For more information, see "[Enabling alerts for vulnerable dependencies {% data variables.product.prodname_ghe_server %}](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server#enabling-the-dependency-graph-and-dependabot-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."'
+ # https://github.com/github/releases/issues/1537
+ - The dependency graph can now be enabled using the Management Console, rather than needing to run a command in the administrative shell. For more information, see "[Enabling alerts for vulnerable dependencies {% data variables.product.prodname_ghe_server %}](/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server#enabling-the-dependency-graph-and-dependabot-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
+
+ # https://github.com/github/releases/issues/1153
- Notifications for multiple {% data variables.product.prodname_dependabot_alerts %} are now grouped together if they're discovered at the same time. This significantly reduces the volume of {% data variables.product.prodname_dependabot %} alert notifications that users receive. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-03-18-grouped-dependabot-alert-notifications/).
- - 'Dependency graph and {% data variables.product.prodname_dependabot_alerts %} now support Go modules. {% data variables.product.prodname_ghe_server %} analyzes a repository''s `go.mod` files to understand the repository’s dependencies. Along with security advisories, the dependency graph provides the information needed to alert developers to vulnerable dependencies. For more information about enabling the dependency graph on private repositories, see "[Securing your repository](/code-security/getting-started/securing-your-repository#managing-the-dependency-graph)."'
+
+ # https://github.com/github/releases/issues/1371
+ - Dependency graph and {% data variables.product.prodname_dependabot_alerts %} now support Go modules. {% data variables.product.prodname_ghe_server %} analyzes a repository's `go.mod` files to understand the repository’s dependencies. Along with security advisories, the dependency graph provides the information needed to alert developers to vulnerable dependencies. For more information about enabling the dependency graph on private repositories, see "[Securing your repository](/code-security/getting-started/securing-your-repository#managing-the-dependency-graph)."
+
+ # https://github.com/github/releases/issues/1538
- The default notification settings for security alerts have changed. Previously, if you had permission to view security alerts in a repository, you would receive notifications for that repository as long as your settings allowed for security alert notifications. Now, you must opt in to security alert notifications by watching the repository. You will be notified if you select `All Activity` or configure `Custom` to include `Security alerts`. All existing repositories will be automatically migrated to these new settings and you will continue to receive notifications; however, any new repositories will require opting-in by watching the repository. For more information see "[Configuring notifications for vulnerable dependencies](/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies)" and "[Managing alerts from secret scanning](/code-security/secret-security/managing-alerts-from-secret-scanning)."
- -
- heading: 'Code scanning and secret scanning changes'
+
+ - heading: 'Code scanning and secret scanning changes'
notes:
+ # https://github.com/github/releases/issues/1352
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql %} now generates diagnostic information for all supported languages. This helps check the state of the created database to understand the status and quality of performed analysis. The diagnostic information is available starting in [version 2.5.6](https://github.com/github/codeql-cli-binaries/releases) of the [{% data variables.product.prodname_codeql_cli %}](https://codeql.github.com/docs/codeql-cli/). You can see the detailed diagnostic information in the {% data variables.product.prodname_actions %} logs for {% data variables.product.prodname_codeql %}. For more information, see "[Viewing code scanning logs](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/viewing-code-scanning-logs)."'
+
+ # https://github.com/github/releases/issues/1360
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql_cli %} now supports analyzing several languages during a single build. This makes it easier to run code analysis to use CI/CD systems other than {% data variables.product.prodname_actions %}. The new mode of the `codeql database create` command is available starting [version 2.5.6](https://github.com/github/codeql-cli-binaries/releases) of the [{% data variables.product.prodname_codeql_cli %}](https://codeql.github.com/docs/codeql-cli/). For more information about setting this up, see "[Installing {% data variables.product.prodname_codeql_cli %} in your CI system](/code-security/secure-coding/using-codeql-code-scanning-with-your-existing-ci-system/running-codeql-cli-in-your-ci-system)."'
+
+ # https://github.com/github/releases/issues/1160
- '{% data variables.product.prodname_code_scanning_capc %} alerts from all enabled tools are now shown in one consolidated list, so that you can easily prioritize across all alerts. You can view alerts from a specific tool by using the "Tool" filter, and the "Rule" and "Tag" filters will dynamically update based on your "Tool" selection.'
+
+ # https://github.com/github/releases/issues/1454
- '{% data variables.product.prodname_code_scanning_capc %} with {% data variables.product.prodname_codeql %} now includes beta support for analyzing C++20 code. This is only available when building codebases with GCC on Linux. C++20 modules are not supported yet.'
+
+ # https://github.com/github/releases/issues/1375
- The depth of {% data variables.product.prodname_codeql %}'s analysis has been improved by adding support for more [libraries and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/) and increasing the coverage of our existing library and framework models for several languages ([C++](https://github.com/github/codeql/tree/main/cpp), [JavaScript](https://github.com/github/codeql/tree/main/javascript), [Python](https://github.com/github/codeql/tree/main/python), and [Java](https://github.com/github/codeql/tree/main/java)). As a result, {% data variables.product.prodname_codeql %} can now detect even more potential sources of untrusted user data, review the steps through which that data flows, and identify potentially dangerous sinks in which this data could end up. This results in an overall improvement of the quality of the {% data variables.product.prodname_code_scanning %} alerts. For more information, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-07-01-codeql-code-scanning-now-recognizes-more-sources-and-uses-of-untrusted-user-data/).
+
+ # https://github.com/github/releases/issues/1335
+ # https://github.com/github/releases/issues/1314
- |
- {% data variables.product.prodname_code_scanning_capc %} now shows `security-severity` levels for CodeQL security alerts. You can configure which `security-severity` levels will cause a check failure for a pull request. The severity level of security alerts can be `critical`, `high`, `medium`, or `low`. By default, any {% data variables.product.prodname_code_scanning %} alerts with a `security-severity` of `critical` or `high` will cause a pull request check failure.
+ {% data variables.product.prodname_code_scanning_capc %} now shows `security-severity` levels for CodeQL security alerts. You can configure which `security-severity` levels will cause a check failure for a pull request. The severity level of security alerts can be `critical`, `high`, `medium`, or `low`. By default, any {% data variables.product.prodname_code_scanning %} alerts with a `security-severity` of `critical` or `high` will cause a pull request check failure.
Additionally, you can now also configure which severity levels will cause a pull request check to fail for non-security alerts. You can configure this behavior at the repository level, and define whether alerts with the severity `error`, `warning`, or `note` will cause a pull request check to fail. By default, non-security {% data variables.product.prodname_code_scanning %} alerts with a severity of `error` will cause a pull request check failure.
For more information see "[Defining which alert severity levels cause pull request check failure](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#defining-the-severities-causing-pull-request-check-failure)."

+
+ # https://github.com/github/releases/issues/1324
- |
Improvements to the branch filter for {% data variables.product.prodname_code_scanning %} alerts make it clearer which {% data variables.product.prodname_code_scanning %} alerts are being displayed on the alerts page. By default, {% data variables.product.prodname_code_scanning %} alerts are filtered to show alerts for the default branch of the repository only. You can use the branch filter to display the alerts on any of the non-default branches. Any branch filter that has been applied is shown in the search bar.
The search syntax has also been simplified to `branch:`. This syntax can be used multiple times in the search bar to filter on multiple branches. The previous syntax, `ref:refs/heads/`, is still supported, so any saved URLs will continue to work.
+
+ # https://github.com/github/releases/issues/1313
- |
Free text search is now available for code scanning alerts. You can search code scanning results to quickly find specific alerts without having to know exact search terms. The search is applied across the alert's name, description, and help text. The syntax is:
@@ -162,50 +240,58 @@ sections:
- Multiple search words returns matches to either word.
- Words in double quotes returns exact matches.
- The keyword 'AND' returns matches to multiple words.
+
- '{% data variables.product.prodname_secret_scanning_caps %} added patterns for 23 new service providers. For the updated list of supported secrets, see "[About secret scanning](/code-security/secret-scanning/about-secret-scanning)."'
- -
- heading: API 更改
+
+ - heading: API Changes
notes:
- - 'Pagination support has been added to the Repositories REST API''s "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."'
- - 'The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Repositories](/rest/reference/repos#webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.'
+ # https://github.com/github/releases/issues/1253
+ - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+
+ # https://github.com/github/releases/issues/969
+ - The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Repositories](/rest/reference/repos#webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.
+
+ # https://github.com/github/releases/issues/1349
- |
Improvements have been made to the code scanning and {% data variables.product.prodname_GH_advanced_security %} APIs:
- The code scanning API now returns the CodeQL query version used for an analysis. This can be used to reproduce results or confirm that an analysis used the latest query. For more information, see "[Code scanning](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository)" in the REST API documentation.
- Admin users can now use the REST API to enable or disable {% data variables.product.prodname_GH_advanced_security %} for repositories, using the `security_and_analysis` object on `repos/{org}/{repo}`. In addition, admin users can check whether {% data variables.product.prodname_advanced_security %} is currently enabled for a repository by using a `GET /repos/{owner}/{repo}` request. These changes help you manage {% data variables.product.prodname_advanced_security %} repository access at scale. For more information, see "[Repositories](/rest/reference/repos#update-a-repository)" in the REST API documentation.
- #No security/bug fixes for the RC release
- #security_fixes:
- #- PLACEHOLDER
- #bugs:
- #- PLACEHOLDER
+
+ # No security/bug fixes for the RC release
+ # security_fixes:
+ # - PLACEHOLDER
+
+ # bugs:
+ # - PLACEHOLDER
+
known_issues:
- - 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- - 自定义防火墙规则在升级过程中被删除。
- - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
+ - Custom firewall rules are removed during the upgrade process.
+ - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
+ - Issues cannot be closed if they contain a permalink to a blob in the same repository, where the blob's file path is longer than 255 characters.
+ - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
+ - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+
deprecations:
- -
- heading: 弃用 GitHub Enterprise Server 2.21
+ - heading: Deprecation of GitHub Enterprise Server 2.21
notes:
- - '*{% data variables.product.prodname_ghe_server %} 2.21 自 2021 年 6 月 6 日起停止使用**。这意味着在此日期之后,即使对于关键的安全问题,也不会发布修补程序。为获得更好的性能、更高的安全性和新功能,请尽快[升级到最新版本的 {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server)。'
- -
- heading: 弃用 GitHub Enterprise Server 2.22
+ - '**{% data variables.product.prodname_ghe_server %} 2.21 was discontinued on June 6, 2021**. That means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ - heading: Deprecation of GitHub Enterprise Server 2.22
notes:
- - '*{% data variables.product.prodname_ghe_server %} 2.22 自 2021 年 9 月 23 日起停止使用**。这意味着在此日期之后,即使对于关键的安全问题,也不会发布修补程序。为获得更好的性能、更高的安全性和新功能,请尽快[升级到最新版本的 {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server)。'
- -
- heading: XenServer Hypervisor 支持终止
+ - '**{% data variables.product.prodname_ghe_server %} 2.22 will be discontinued on September 23, 2021**. That means that no patch releases will be made, even for critical security issues, after this date. For better performance, improved security, and new features, [upgrade to the newest version of {% data variables.product.prodname_ghe_server %}](/enterprise-server@3.2/admin/enterprise-management/upgrading-github-enterprise-server) as soon as possible.'
+ - heading: Deprecation of XenServer Hypervisor support
notes:
+ # https://github.com/github/docs-content/issues/4439
- Beginning in {% data variables.product.prodname_ghe_server %} 3.1, we will begin discontinuing support for Xen Hypervisor. The complete deprecation is scheduled for {% data variables.product.prodname_ghe_server %} 3.3, following the standard one year deprecation window. Please contact [GitHub Support](https://support.github.com/contact) with questions or concerns.
- -
- heading: 删除旧 GitHub 服务
+ - heading: Removal of Legacy GitHub Services
notes:
+ # https://github.com/github/releases/issues/1506
- '{% data variables.product.prodname_ghe_server %} 3.2 removes unused GitHub Service database records. More information is available in the [deprecation announcement post](https://developer.github.com/changes/2018-04-25-github-services-deprecation/).'
- -
- heading: Deprecation of OAuth Application API endpoints and API authentication via query parameters
+ - heading: Deprecation of OAuth Application API endpoints and API authentication via query parameters
notes:
+ # https://github.com/github/releases/issues/1316
- |
To prevent accidental logging or exposure of `access_tokens`, we discourage the use of OAuth Application API endpoints and the use of API auth via query params. Visit the following posts to see the proposed replacements:
@@ -213,12 +299,13 @@ sections:
* [Replacement auth via headers instead of query param](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/#changes-to-make)
These endpoints and auth route are planned to be removed from {% data variables.product.prodname_ghe_server %} in {% data variables.product.prodname_ghe_server %} 3.4.
- -
- heading: Removal of legacy GitHub App webhook events and endpoints
+ - heading: Removal of legacy GitHub App webhook events and endpoints
notes:
+ # https://github.com/github/releases/issues/965
- |
Two legacy GitHub Apps-related webhook events have been removed: `integration_installation` and `integration_installation_repositories`. You should instead be listening to the `installation` and `installation_repositories` events.
- |
The following REST API endpoint has been removed: `POST /installations/{installation_id}/access_tokens`. You should instead be using the namespaced equivalent `POST /app/installations/{installation_id}/access_tokens`.
+
backups:
- '{% data variables.product.prodname_ghe_server %} 3.2 requires at least [GitHub Enterprise Backup Utilities 3.2.0](https://github.com/github/backup-utils) for [Backups and Disaster Recovery](/enterprise-server@3.2/admin/configuration/configuring-backups-on-your-appliance).'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
index 4c3937f4c8..e2b03c3f3d 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/1.yml
@@ -4,20 +4,20 @@ sections:
security_fixes:
- '包已更新到最新的安全版本。{% comment %} https://github.com/github/enterprise2/pull/27118, https://github.com/github/enterprise2/pull/27110 {% endcomment %}'
bugs:
- - 'Custom pre-receive hooks could have failed due to too restrictive virtual memory or CPU time limits. {% comment %} https://github.com/github/enterprise2/pull/26973, https://github.com/github/enterprise2/pull/26955 {% endcomment %}'
- - 'In a GitHub Enterprise Server clustering configuration, Dependency Graph settings could have been incorrectly applied. {% comment %} https://github.com/github/enterprise2/pull/26981, https://github.com/github/enterprise2/pull/26861 {% endcomment %}'
- - 'Attempting to wipe all existing configuration settings with `ghe-cleanup-settings` failed to restart the Management Console service. {% comment %} https://github.com/github/enterprise2/pull/26988, https://github.com/github/enterprise2/pull/26901 {% endcomment %}'
- - 'During replication teardown via `ghe-repl-teardown` Memcached failed to be restarted. {% comment %} https://github.com/github/enterprise2/pull/26994, https://github.com/github/enterprise2/pull/26983 {% endcomment %}'
- - 'During periods of high load, users would receive HTTP 503 status codes when upstream services failed internal healthchecks. {% comment %} https://github.com/github/enterprise2/pull/27083, https://github.com/github/enterprise2/pull/26999 {% endcomment %}'
- - 'Pre-receive hook environments were forbidden from calling the cat command via BusyBox on Alpine. {% comment %} https://github.com/github/enterprise2/pull/27116, https://github.com/github/enterprise2/pull/27094 {% endcomment %}'
- - 'Failing over from a primary Cluster datacenter to a secondary Cluster datacenter succeeds, but then failing back over to the original primary Cluster datacenter failed to promote Elasticsearch indicies. {% comment %} https://github.com/github/github/pull/193182, https://github.com/github/github/pull/192447 {% endcomment %}'
- - 'The "Import teams" button on the Teams page for an Organization returned an HTTP 404. {% comment %} https://github.com/github/github/pull/193303 {% endcomment %}'
- - 'Using the API to disable Secret Scanning correctly disabled the property but incorrectly returned an HTTP 422 and an error message. {% comment %} https://github.com/github/github/pull/193455, https://github.com/github/github/pull/192907 {% endcomment %}'
- - 'In some cases, GitHub Enterprise Administrators attempting to view the `Dormant users` page received `502 Bad Gateway` or `504 Gateway Timeout` response. {% comment %} https://github.com/github/github/pull/194262, https://github.com/github/github/pull/193609 {% endcomment %}'
- - 'Performance was negatively impacted in certain high load situations as a result of the increased number of `SynchronizePullRequestJob` jobs. {% comment %} https://github.com/github/github/pull/195256, https://github.com/github/github/pull/194591 {% endcomment %}'
- - 'A user defined pattern created for Secret Scanning would continue getting scanned even after it was deleted. {% comment %} https://github.com/github/token-scanning-service/pull/1039, https://github.com/github/token-scanning-service/pull/822 {% endcomment %}'
+ - '自定义预接收挂钩可能由于限制过多的虚拟内存或 CPU 时间限制而失败。 {% comment %} https://github.com/github/enterprise2/pull/26973, https://github.com/github/enterprise2/pull/26955 {% endcomment %}'
+ - '在 GitHub Enterprise Server 群集配置中,可能错误地应用了依赖关系图设置。{% comment %} https://github.com/github/enterprise2/pull/26981, https://github.com/github/enterprise2/pull/26861 {% endcomment %}'
+ - '尝试使用 `ghe-cleanup-settings` 擦除所有现有配置设置失败,无法重新启动管理控制台服务。{% comment %} https://github.com/github/enterprise2/pull/26988, https://github.com/github/enterprise2/pull/26901 {% endcomment %}'
+ - '在通过 `ghe-repl-teardown` 进行复制拆解期间,Memcached 无法重新启动。{% comment %} https://github.com/github/enterprise2/pull/26994, https://github.com/github/enterprise2/pull/26983 {% endcomment %}'
+ - '在高负载期间,当上游服务未通过内部运行状况检查时,用户将收到 HTTP 503 状态代码。{% comment %} https://github.com/github/enterprise2/pull/27083, https://github.com/github/enterprise2/pull/26999 {% endcomment %}'
+ - '预接收挂钩环境被禁止通过 Alpine 上的 BusyBox 调用 cat 命令。{% comment %} https://github.com/github/enterprise2/pull/27116, https://github.com/github/enterprise2/pull/27094 {% endcomment %}'
+ - '从主集群数据中心故障转移到辅助集群数据中心成功,但随后故障回复到原始主集群数据中心失败,无法提升 Elasticsearch 指标。{% comment %} https://github.com/github/github/pull/193182, https://github.com/github/github/pull/192447 {% endcomment %}'
+ - '组织的“团队”页面上的“Import teams(导入团队)”按钮返回了 HTTP 404。{% comment %} https://github.com/github/github/pull/193303 {% endcomment %}'
+ - '使用 API 禁用机密扫描可正确禁用该属性,但错误地返回 HTTP 422 和错误消息。{% comment %} https://github.com/github/github/pull/193455, https://github.com/github/github/pull/192907 {% endcomment %}'
+ - '在某些情况下,尝试查看“休眠用户”页面的 GitHub 企业管理员会收到“502 网关错误”或“504 网关超时”响应。{% comment %} https://github.com/github/github/pull/194262, https://github.com/github/github/pull/193609 {% endcomment %}'
+ - '在某些高负载情况下,由于 `SynchronizePullRequestJob` 作业的数量增加,性能受到负面影响。{% comment %} https://github.com/github/github/pull/195256, https://github.com/github/github/pull/194591 {% endcomment %}'
+ - '为秘密扫描创建的用户定义的模式即使在被删除后也将继续被扫描。{% comment %} https://github.com/github/token-scanning-service/pull/1039, https://github.com/github/token-scanning-service/pull/822 {% endcomment %}'
changes:
- - 'GitHub Apps now set the Secret Scanning feature on a repository consistently with the API. {% comment %} https://github.com/github/github/pull/193456, https://github.com/github/github/pull/193125 {% endcomment %}'
+ - 'GitHub 应用程序现在已在存储库上设置与 API 一致的机密扫描功能。{% comment %} https://github.com/github/github/pull/193456, https://github.com/github/github/pull/193125 {% endcomment %}'
known_issues:
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
@@ -25,4 +25,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
index 8a50be503d..d56cb0b1cb 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/10.yml
@@ -13,4 +13,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
index 4987d617d1..3d01f6405c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/11.yml
@@ -41,4 +41,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
index fe2cdd79e3..30a305d231 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/12.yml
@@ -21,4 +21,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
index bd5927460f..c9e304e0f9 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/2.yml
@@ -2,22 +2,22 @@
date: '2021-10-28'
sections:
security_fixes:
- - 'It was possible for cleartext passwords to end up in certain log files.'
- - 'Several known weak SSH public keys have been added to the deny list and can no longer be registered. In addition, versions of GitKraken known to generate weak SSH keys (7.6.x, 7.7.x and 8.0.0) have been blocked from registering new public keys.'
+ - '明文密码可能会最终出现在某些日志文件中。'
+ - '几个已知的弱 SSH 公钥已添加到拒绝列表中,无法再注册。此外,已知会生成弱 SSH 密钥的 GitKraken 版本(7.6.x、7.7.x 和 8.0.0)已被阻止注册新的公钥。'
- '包已更新到最新的安全版本。'
bugs:
- - 'Restore might fail for enterprise server in clustering mode if orchestrator is not healthily.'
- - 'Codespaces links were displayed in organization settings.'
- - 'Several parts of the application were unusable for users who are owners of many organizations.'
- - 'Fixed a link to https://docs.github.com.'
+ - '如果业务流程协调程序运行状况不佳,则处于群集模式的企业服务器的还原可能会失败。'
+ - '代码空间链接显示在组织设置中。'
+ - '应用程序的几个部分对于是多个组织所有者的用户不可用。'
+ - '修复了指向 https://docs.github.com 的链接。'
changes:
- - 'Browsing and job performance optimizations for repositories with many refs.'
+ - '具有许多引用的存储库的浏览和作业性能优化。'
known_issues:
- - After saving a new release on a repository, the `/releases` page shows a 500 error. A fix for this issue is expected to ship in 3.2.3.
+ - 在存储库中保存新版本后,`/releases` 页面显示 500 错误。此问题的修复程序预计将在 3.2.3 中提供。
- 在新建的没有任何用户的 {% data variables.product.prodname_ghe_server %} 上,攻击者可以创建第一个管理员用户。
- 自定义防火墙规则在升级过程中被删除。
- Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
index 8e19207fc8..3d82006740 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/3.yml
@@ -28,4 +28,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
index 5b6c9752c8..a0fb2d5239 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/4.yml
@@ -27,4 +27,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
index 5e229c6640..5146b882d2 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/5.yml
@@ -25,4 +25,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
index 4ea8259572..d5e44e043c 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/6.yml
@@ -11,4 +11,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
index 56cff95c89..3b9c347334 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/7.yml
@@ -20,4 +20,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
index 4ba202aa11..a6a39c9bfd 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/8.yml
@@ -23,4 +23,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
index d57809fbc9..0db4e78e56 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-2/9.yml
@@ -17,4 +17,4 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0-rc1.yml
index 26be5c3737..dd43b99fc8 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0-rc1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0-rc1.yml
@@ -54,7 +54,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} 3.3 includes improvements to the user impersonation process. An impersonation session now requires a justification for the impersonation, actions are recorded in the audit log as being performed as an impersonated user, and the user who is impersonated will receive an email notification that they have been impersonated by an enterprise administrator. For more information, see "[Impersonating a user](/enterprise-server@3.3/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user)."'
- A new stream processing service has been added to facilitate the growing set of events that are published to the audit log, including events associated with Git and {% data variables.product.prodname_actions %} activity.
-
- heading: Token Changes
+ heading: 令牌更改
notes:
- |
An expiration date can now be set for new and existing personal access tokens. Setting an expiration date on personal access tokens is highly recommended to prevent older tokens from leaking and compromising security. Token owners will receive an email when it's time to renew a token that's about to expire. Tokens that have expired can be regenerated, giving users a duplicate token with the same properties as the original.
@@ -65,7 +65,7 @@ sections:
notes:
- 'Notification emails from discussions now include `(Discussion #xx)` in the subject, so you can recognize and filter emails that reference discussions.'
-
- heading: 'Repositories changes'
+ heading: '存储库更改'
notes:
- Public repositories now have a `Public` label next to their names like private and internal repositories. This change makes it easier to identify public repositories and avoid accidentally committing private code.
- If you specify the exact name of a branch when using the branch selector menu, the result now appears at the top of the list of matching branches. Previously, exact branch name matches could appear at the bottom of the list.
@@ -75,7 +75,7 @@ sections:
- A warning is now displayed when viewing a file that contains bidirectional Unicode text. Bidirectional Unicode text can be interpreted or compiled differently than it appears in a user interface. For example, hidden bidirectional Unicode characters can be used to swap segments of text in a file. For more information about replacing these characters, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-31-warning-about-bidirectional-unicode-text/).
- You can now use `CITATION.cff` files to let others know how you would like them to cite your work. `CITATION.cff` files are plain text files with human- and machine-readable citation information. {% data variables.product.prodname_ghe_server %} parses this information into common citation formats such as [APA](https://apastyle.apa.org) and [BibTeX](https://en.wikipedia.org/wiki/BibTeX). For more information, see "[About CITATION files](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files)."
-
- heading: 'Markdown changes'
+ heading: 'Markdown 更改'
notes:
- |
You can use new keyboard shortcuts for quotes and lists in Markdown files, issues, pull requests, and comments.
@@ -91,7 +91,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} now automatically generates a table of contents for Wikis, based on headings.'
- When dragging and dropping files into a Markdown editor, such as images and videos, {% data variables.product.prodname_ghe_server %} now uses the mouse pointer location instead of the cursor location when placing the file.
-
- heading: 'Issues and pull requests changes'
+ heading: '议题和拉取请求更改'
notes:
- 'You can now search issues by label using a logical OR operator. To filter issues using logical OR, use the comma syntax. For example, `label:"good first issue","bug"` will list all issues with a label of `good first issue` or `bug`. For more information, see "[Filtering and searching issues and pull requests](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests#about-search-terms)."'
- |
@@ -107,7 +107,7 @@ sections:
- You can now filter pull request searches to only include pull requests you are directly requested to review.
- Filtered files in pull requests are now completely hidden from view, and are no longer shown as collapsed in the "Files Changed" tab. The "File Filter" menu has also been simplified. For more information, see "[Filtering files in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)."
-
- heading: 'GitHub Actions changes'
+ heading: 'GitHub Actions 更改'
notes:
- You can now create "composite actions" which combine multiple workflow steps into one action, and includes the ability to reference other actions. This makes it easier to reduce duplication in workflows. Previously, an action could only use scripts in its YAML definition. For more information, see "[Creating a composite action](/actions/creating-actions/creating-a-composite-action)."
- 'Managing self-hosted runners at the enterprise level no longer requires using personal access tokens with the `admin:enterprise` scope. You can instead use the new `manage_runners:enterprise` scope to restrict the permissions on your tokens. Tokens with this scope can authenticate to [many REST API endpoints](/rest/reference/enterprise-admin#list-self-hosted-runner-groups-for-an-enterprise) to manage your enterprise''s self-hosted runners.'
@@ -123,16 +123,16 @@ sections:
For more information, see "[Security hardening for {% data variables.product.prodname_actions %}](/actions/security-guides/security-hardening-for-github-actions#auditing-github-actions-events)."
- Performance improvements have been made to {% data variables.product.prodname_actions %}, which may result in higher maximum job concurrency.
-
- heading: 'GitHub Packages changes'
+ heading: 'GitHub Packages 更改'
notes:
- When a repository is deleted, any associated package files are now immediately deleted from your {% data variables.product.prodname_registry %} external storage.
-
- heading: 'Dependabot and Dependency graph changes'
+ heading: 'Dependabot 和依赖关系图更改'
notes:
- Dependency review is out of beta and is now generally available for {% data variables.product.prodname_GH_advanced_security %} customers. Dependency review provides an easy-to-understand view of dependency changes and their security impact in the "Files changed" tab of pull requests. It informs you of which dependencies were added, removed, or updated, along with vulnerability information. For more information, see "[Reviewing dependency changes in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)."
- '{% data variables.product.prodname_dependabot %} is now available as a private beta, offering both version updates and security updates for several popular ecosystems. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} requires {% data variables.product.prodname_actions %} and a pool of self-hosted runners configured for {% data variables.product.prodname_dependabot %} use. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} also requires {% data variables.product.prodname_github_connect %} to be enabled. To learn more and sign up for the beta, contact the GitHub Sales team.'
-
- heading: 'Code scanning and secret scanning changes'
+ heading: '代码扫描和秘密扫描更改'
notes:
- The depth of {% data variables.product.prodname_codeql %}'s analysis has been improved by adding support for more [libraries and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/) and increasing the coverage of our existing library and framework models. [JavaScript](https://github.com/github/codeql/tree/main/javascript) analysis now supports most common templating languages, and [Java](https://github.com/github/codeql/tree/main/java) now covers more than three times the endpoints of previous {% data variables.product.prodname_codeql %} versions. As a result, {% data variables.product.prodname_codeql %} can now detect even more potential sources of untrusted user data, steps through which that data flows, and potentially dangerous sinks where the data could end up. This results in an overall improvement of the quality of {% data variables.product.prodname_code_scanning %} alerts.
- '{% data variables.product.prodname_codeql %} now supports scanning standard language features in Java 16, such as records and pattern matching. {% data variables.product.prodname_codeql %} is able to analyze code written in Java version 7 through 16. For more information about supported languages and frameworks, see the [{% data variables.product.prodname_codeql %} documentation](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/#id5).'
@@ -173,7 +173,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
deprecations:
-
heading: 弃用 GitHub Enterprise Server 2.22
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
index 35642edada..f816ec2c95 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/0.yml
@@ -46,7 +46,7 @@ sections:
- A new stream processing service has been added to facilitate the growing set of events that are published to the audit log, including events associated with Git and {% data variables.product.prodname_actions %} activity.
- The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
-
- heading: Token Changes
+ heading: 令牌更改
notes:
- |
An expiration date can now be set for new and existing personal access tokens. Setting an expiration date on personal access tokens is highly recommended to prevent older tokens from leaking and compromising security. Token owners will receive an email when it's time to renew a token that's about to expire. Tokens that have expired can be regenerated, giving users a duplicate token with the same properties as the original.
@@ -57,7 +57,7 @@ sections:
notes:
- 'Notification emails from discussions now include `(Discussion #xx)` in the subject, so you can recognize and filter emails that reference discussions.'
-
- heading: 'Repositories changes'
+ heading: '存储库更改'
notes:
- Public repositories now have a `Public` label next to their names like private and internal repositories. This change makes it easier to identify public repositories and avoid accidentally committing private code.
- If you specify the exact name of a branch when using the branch selector menu, the result now appears at the top of the list of matching branches. Previously, exact branch name matches could appear at the bottom of the list.
@@ -67,7 +67,7 @@ sections:
- A warning is now displayed when viewing a file that contains bidirectional Unicode text. Bidirectional Unicode text can be interpreted or compiled differently than it appears in a user interface. For example, hidden bidirectional Unicode characters can be used to swap segments of text in a file. For more information about replacing these characters, see the [{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-31-warning-about-bidirectional-unicode-text/).
- You can now use `CITATION.cff` files to let others know how you would like them to cite your work. `CITATION.cff` files are plain text files with human- and machine-readable citation information. {% data variables.product.prodname_ghe_server %} parses this information into common citation formats such as [APA](https://apastyle.apa.org) and [BibTeX](https://en.wikipedia.org/wiki/BibTeX). For more information, see "[About CITATION files](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files)."
-
- heading: 'Markdown changes'
+ heading: 'Markdown 更改'
notes:
- |
You can use new keyboard shortcuts for quotes and lists in Markdown files, issues, pull requests, and comments.
@@ -83,7 +83,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} now automatically generates a table of contents for Wikis, based on headings.'
- When dragging and dropping files into a Markdown editor, such as images and videos, {% data variables.product.prodname_ghe_server %} now uses the mouse pointer location instead of the cursor location when placing the file.
-
- heading: 'Issues and pull requests changes'
+ heading: '议题和拉取请求更改'
notes:
- 'You can now search issues by label using a logical OR operator. To filter issues using logical OR, use the comma syntax. For example, `label:"good first issue","bug"` will list all issues with a label of `good first issue` or `bug`. For more information, see "[Filtering and searching issues and pull requests](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests#about-search-terms)."'
- |
@@ -99,7 +99,7 @@ sections:
- You can now filter pull request searches to only include pull requests you are directly requested to review.
- Filtered files in pull requests are now completely hidden from view, and are no longer shown as collapsed in the "Files Changed" tab. The "File Filter" menu has also been simplified. For more information, see "[Filtering files in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request)."
-
- heading: 'GitHub Actions changes'
+ heading: 'GitHub Actions 更改'
notes:
- You can now create "composite actions" which combine multiple workflow steps into one action, and includes the ability to reference other actions. This makes it easier to reduce duplication in workflows. Previously, an action could only use scripts in its YAML definition. For more information, see "[Creating a composite action](/actions/creating-actions/creating-a-composite-action)."
- 'Managing self-hosted runners at the enterprise level no longer requires using personal access tokens with the `admin:enterprise` scope. You can instead use the new `manage_runners:enterprise` scope to restrict the permissions on your tokens. Tokens with this scope can authenticate to [many REST API endpoints](/rest/reference/enterprise-admin#list-self-hosted-runner-groups-for-an-enterprise) to manage your enterprise''s self-hosted runners.'
@@ -116,16 +116,16 @@ sections:
- '{% data variables.product.prodname_ghe_server %} 3.3 contains performance improvements for job concurrency with {% data variables.product.prodname_actions %}. For more information about the new performance targets for a range of CPU and memory configurations, see "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/getting-started-with-github-actions-for-github-enterprise-server#review-hardware-considerations)."'
- To mitigate insider man in the middle attacks when using actions resolved through {% data variables.product.prodname_github_connect %} to {% data variables.product.prodname_dotcom_the_website %} from {% data variables.product.prodname_ghe_server %}, the actions namespace (`owner/name`) is retired on use. Retiring the namespace prevents that namespace from being created on your {% data variables.product.prodname_ghe_server %} instance, and ensures all workflows referencing the action will download it from {% data variables.product.prodname_dotcom_the_website %}.
-
- heading: 'GitHub Packages changes'
+ heading: 'GitHub Packages 更改'
notes:
- When a repository is deleted, any associated package files are now immediately deleted from your {% data variables.product.prodname_registry %} external storage.
-
- heading: 'Dependabot and Dependency graph changes'
+ heading: 'Dependabot 和依赖关系图更改'
notes:
- Dependency review is out of beta and is now generally available for {% data variables.product.prodname_GH_advanced_security %} customers. Dependency review provides an easy-to-understand view of dependency changes and their security impact in the "Files changed" tab of pull requests. It informs you of which dependencies were added, removed, or updated, along with vulnerability information. For more information, see "[Reviewing dependency changes in a pull request](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request)."
- '{% data variables.product.prodname_dependabot %} is now available as a private beta, offering both version updates and security updates for several popular ecosystems. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} requires {% data variables.product.prodname_actions %} and a pool of self-hosted runners configured for {% data variables.product.prodname_dependabot %} use. {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_ghe_server %} also requires {% data variables.product.prodname_github_connect %} to be enabled. To learn more and sign up for the beta, contact the GitHub Sales team.'
-
- heading: 'Code scanning and secret scanning changes'
+ heading: '代码扫描和秘密扫描更改'
notes:
- The depth of {% data variables.product.prodname_codeql %}'s analysis has been improved by adding support for more [libraries and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/) and increasing the coverage of our existing library and framework models. [JavaScript](https://github.com/github/codeql/tree/main/javascript) analysis now supports most common templating languages, and [Java](https://github.com/github/codeql/tree/main/java) now covers more than three times the endpoints of previous {% data variables.product.prodname_codeql %} versions. As a result, {% data variables.product.prodname_codeql %} can now detect even more potential sources of untrusted user data, steps through which that data flows, and potentially dangerous sinks where the data could end up. This results in an overall improvement of the quality of {% data variables.product.prodname_code_scanning %} alerts.
- '{% data variables.product.prodname_codeql %} now supports scanning standard language features in Java 16, such as records and pattern matching. {% data variables.product.prodname_codeql %} is able to analyze code written in Java version 7 through 16. For more information about supported languages and frameworks, see the [{% data variables.product.prodname_codeql %} documentation](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/#id5).'
@@ -167,7 +167,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
deprecations:
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
index 8a5d8db39b..53db1d26df 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/1.yml
@@ -12,6 +12,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
index ebdf502d9f..5b4d360329 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/2.yml
@@ -27,6 +27,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
index d3cf8797f5..46254f4419 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/3.yml
@@ -25,6 +25,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
index dfec3aef30..236c75aceb 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/4.yml
@@ -20,6 +20,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
index bee2a27a7c..3d43c11824 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/5.yml
@@ -14,6 +14,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
index 5e158252b5..12e11d2847 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/6.yml
@@ -45,6 +45,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
index 720fc5a6ea..da95356d96 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-3/7.yml
@@ -27,6 +27,6 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- '{% data variables.product.prodname_actions %} storage settings cannot be validated and saved in the {% data variables.enterprise.management_console %} when "Force Path Style" is selected, and must instead be configured with the `ghe-actions-precheck` command line utility.'
- '{% data variables.product.prodname_ghe_server %} 3.3 instances installed on Azure and provisioned with 32+ CPU cores would fail to launch, due to a bug present in the current Linux kernel. [Updated: 2022-04-08]'
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml
index 3e8bec4d28..f62d7467c6 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0-rc1.yml
@@ -57,7 +57,7 @@ sections:
- Organizations can now display a `README.md` file on their profile Overview. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-09-14-readmes-for-organization-profiles/)."
- 'Members of organizations can now view a list of their enterprise owners under the organization''s "People" tab. The enterprise owners list is also now accessible using the GraphQL API. For more information, see the "[`enterpriseOwners`](/graphql/reference/objects#organization)" field under the Organization object in the GraphQL API documentation.'
-
- heading: Repositories changes
+ heading: 存储库更改
notes:
- |
A "Manage Access" section is now shown on the "Collaborators and teams" page in your repository settings. The new section makes it easier for repository administrators to see and manage who has access to their repository, and the level of access granted to each user. Administrators can now:
@@ -74,7 +74,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} 3.4 includes improvements to the Releases UI, such as automatically generated release notes which display a summary of all the pull requests for a given release. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-20-improvements-to-github-releases-generally-available/)."'
- When a release is published, an avatar list is now displayed at the bottom of the release. Avatars for all user accounts mentioned in the release notes are shown. For more information, see "[Managing releases in a repository](/repositories/releasing-projects-on-github/managing-releases-in-a-repository)."
-
- heading: 'Markdown changes'
+ heading: 'Markdown 更改'
notes:
- You can now use the new "Accessibility" settings page to manage your keyboard shortcuts. You can choose to disable keyboard shortcuts that only use single characters like S, G C, and . (the period key). For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-16-managing-keyboard-shortcuts-using-accessibility-settings/)."
- You can now choose to use a fixed-width font in Markdown-enabled fields, like issue comments and pull request descriptions. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-12-fixed-width-font-support-in-markdown-enabled-fields/)."
@@ -84,12 +84,12 @@ sections:
- When typing the name of a {% data variables.product.prodname_dotcom %} user in issues, pull requests and discussions, the @mention suggester now ranks existing participants higher than other {% data variables.product.prodname_dotcom %} users, so that it's more likely the user you're looking for will be listed.
- Right-to-left languages are now supported natively in Markdown files, issues, pull requests, discussions, and comments.
-
- heading: 'Issues and pull requests changes'
+ heading: '议题和拉取请求更改'
notes:
- The diff setting to hide whitespace changes in the pull request "Files changed" tab is now retained for your user account for that pull request. The setting you have chosen is automatically reapplied if you navigate away from the page and then revisit the "Files changed" tab of the same pull request.
- When using auto assignment for pull request code reviews, you can now choose to only notify requested team members independently of your auto assignment settings. This setting is useful in scenarios where many users are auto assigned but not all users require notification. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-team-member-pull-request-review-notifications-can-be-configured-independently-of-auto-assignment/)."
-
- heading: 'Branches changes'
+ heading: '分支更改'
notes:
- 'Organization and repository administrators can now trigger webhooks to listen for changes to branch protection rules on their repositories. For more information, see the "[branch_protection_rule](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#branch_protection_rule)" event in the webhooks events and payloads documentation.'
- When configuring protected branches, you can now enforce that a required status check is provided by a specific {% data variables.product.prodname_github_app %}. If a status is then provided by a different application, or by a user via a commit status, merging is prevented. This ensures all changes are validated by the intended application. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-01-ensure-required-status-checks-provided-by-the-intended-app/)."
@@ -98,7 +98,7 @@ sections:
- Administrators can now allow only specific users and teams to force push to a repository. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-21-specify-who-can-force-push-to-a-repository/)."
- When requiring pull requests for all changes to a protected branch, administrators can now choose if approved reviews are also a requirement. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-require-pull-requests-without-requiring-reviews/)."
-
- heading: 'GitHub Actions changes'
+ heading: 'GitHub Actions 更改'
notes:
- '{% data variables.product.prodname_actions %} workflows triggered by {% data variables.product.prodname_dependabot %} for the `create`, `deployment`, and `deployment_status` events now always receive a read-only token and no secrets. Similarly, workflows triggered by {% data variables.product.prodname_dependabot %} for the `pull_request_target` event on pull requests where the base ref was created by {% data variables.product.prodname_dependabot %}, now always receive a read-only token and no secrets. These changes are designed to prevent potentially malicious code from executing in a privileged workflow. For more information, see "[Automating {% data variables.product.prodname_dependabot %} with {% data variables.product.prodname_actions %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions)."'
- Workflow runs on `push` and `pull_request` events triggered by {% data variables.product.prodname_dependabot %} will now respect the permissions specified in your workflows, allowing you to control how you manage automatic dependency updates. The default token permissions will remain read-only. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-06-github-actions-workflows-triggered-by-dependabot-prs-will-respect-permissions-key-in-workflows/)."
@@ -110,13 +110,13 @@ sections:
- The search order behavior for self-hosted runners has now changed, so that the first available matching runner at any level will run the job in all cases. This allows jobs to be sent to self-hosted runners much faster, especially for organizations and enterprises with lots of self-hosted runners. Previously, when running a job that required a self-hosted runner, {% data variables.product.prodname_actions %} would look for self-hosted runners in the repository, organization, and enterprise, in that order.
- 'Runner labels for {% data variables.product.prodname_actions %} self-hosted runners can now be listed, added and removed using the REST API. For more information about using the new APIs at a repository, organization, or enterprise level, see "[Repositories](/rest/reference/actions#list-labels-for-a-self-hosted-runner-for-a-repository)", "[Organizations](/rest/reference/actions#add-custom-labels-to-a-self-hosted-runner-for-an-organization)", and "[Enterprises](/rest/reference/enterprise-admin#list-labels-for-a-self-hosted-runner-for-an-enterprise)" in the REST API documentation.'
-
- heading: 'Dependabot and Dependency graph changes'
+ heading: 'Dependabot 和依赖关系图更改'
notes:
- Dependency graph now supports detecting Python dependencies in repositories that use the Poetry package manager. Dependencies will be detected from both `pyproject.toml` and `poetry.lock` manifest files.
- When configuring {% data variables.product.prodname_dependabot %} security and version updates on GitHub Enterprise Server, we recommend you also enable {% data variables.product.prodname_dependabot %} in {% data variables.product.prodname_github_connect %}. This will allow {% data variables.product.prodname_dependabot %} to retrieve an updated list of dependencies and vulnerabilities from {% data variables.product.prodname_dotcom_the_website %}, by querying for information such as the changelogs of the public releases of open source code that you depend upon. For more information, see "[Enabling the dependency graph and Dependabot alerts for your enterprise](/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise)."
- '{% data variables.product.prodname_dependabot_alerts %} alerts can now be dismissed using the GraphQL API. For more information, see the "[dismissRepositoryVulnerabilityAlert](/graphql/reference/mutations#dismissrepositoryvulnerabilityalert)" mutation in the GraphQL API documentation.'
-
- heading: 'Code scanning and secret scanning changes'
+ heading: '代码扫描和秘密扫描更改'
notes:
- The {% data variables.product.prodname_codeql %} CLI now supports including markdown-rendered query help in SARIF files, so that the help text can be viewed in the {% data variables.product.prodname_code_scanning %} UI when the query generates an alert. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-23-display-help-text-for-your-custom-codeql-queries-in-code-scanning/)."
- The {% data variables.product.prodname_codeql %} CLI and {% data variables.product.prodname_vscode %} extension now support building databases and analyzing code on machines powered by Apple Silicon, such as Apple M1. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-codeql-now-supports-apple-silicon-m1/)."
@@ -147,7 +147,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- Actions services needs to be restarted after restoring appliance from backup taken on a different host.
deprecations:
-
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
index 635b5abbd2..b13d8dddbf 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/0.yml
@@ -56,7 +56,7 @@ sections:
- Organizations can now display a `README.md` file on their profile Overview. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-09-14-readmes-for-organization-profiles/)."
- 'Members of organizations can now view a list of their enterprise owners under the organization''s "People" tab. The enterprise owners list is also now accessible using the GraphQL API. For more information, see the "[`enterpriseOwners`](/graphql/reference/objects#organization)" field under the Organization object in the GraphQL API documentation.'
-
- heading: Repositories changes
+ heading: 存储库更改
notes:
- |
A "Manage Access" section is now shown on the "Collaborators and teams" page in your repository settings. The new section makes it easier for repository administrators to see and manage who has access to their repository, and the level of access granted to each user. Administrators can now:
@@ -73,7 +73,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} 3.4 includes improvements to the Releases UI, such as automatically generated release notes which display a summary of all the pull requests for a given release. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-20-improvements-to-github-releases-generally-available/)."'
- When a release is published, an avatar list is now displayed at the bottom of the release. Avatars for all user accounts mentioned in the release notes are shown. For more information, see "[Managing releases in a repository](/repositories/releasing-projects-on-github/managing-releases-in-a-repository)."
-
- heading: 'Markdown changes'
+ heading: 'Markdown 更改'
notes:
- You can now use the new "Accessibility" settings page to manage your keyboard shortcuts. You can choose to disable keyboard shortcuts that only use single characters like S, G C, and . (the period key). For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-16-managing-keyboard-shortcuts-using-accessibility-settings/)."
- You can now choose to use a fixed-width font in Markdown-enabled fields, like issue comments and pull request descriptions. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-12-fixed-width-font-support-in-markdown-enabled-fields/)."
@@ -83,12 +83,12 @@ sections:
- When typing the name of a {% data variables.product.prodname_dotcom %} user in issues, pull requests and discussions, the @mention suggester now ranks existing participants higher than other {% data variables.product.prodname_dotcom %} users, so that it's more likely the user you're looking for will be listed.
- Right-to-left languages are now supported natively in Markdown files, issues, pull requests, discussions, and comments.
-
- heading: 'Issues and pull requests changes'
+ heading: '议题和拉取请求更改'
notes:
- The diff setting to hide whitespace changes in the pull request "Files changed" tab is now retained for your user account for that pull request. The setting you have chosen is automatically reapplied if you navigate away from the page and then revisit the "Files changed" tab of the same pull request.
- When using auto assignment for pull request code reviews, you can now choose to only notify requested team members independently of your auto assignment settings. This setting is useful in scenarios where many users are auto assigned but not all users require notification. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-team-member-pull-request-review-notifications-can-be-configured-independently-of-auto-assignment/)."
-
- heading: 'Branches changes'
+ heading: '分支更改'
notes:
- 'Organization and repository administrators can now trigger webhooks to listen for changes to branch protection rules on their repositories. For more information, see the "[branch_protection_rule](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#branch_protection_rule)" event in the webhooks events and payloads documentation.'
- When configuring protected branches, you can now enforce that a required status check is provided by a specific {% data variables.product.prodname_github_app %}. If a status is then provided by a different application, or by a user via a commit status, merging is prevented. This ensures all changes are validated by the intended application. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-01-ensure-required-status-checks-provided-by-the-intended-app/)."
@@ -97,7 +97,7 @@ sections:
- Administrators can now allow only specific users and teams to force push to a repository. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-12-21-specify-who-can-force-push-to-a-repository/)."
- When requiring pull requests for all changes to a protected branch, administrators can now choose if approved reviews are also a requirement. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-require-pull-requests-without-requiring-reviews/)."
-
- heading: 'GitHub Actions changes'
+ heading: 'GitHub Actions 更改'
notes:
- '{% data variables.product.prodname_actions %} workflows triggered by {% data variables.product.prodname_dependabot %} for the `create`, `deployment`, and `deployment_status` events now always receive a read-only token and no secrets. Similarly, workflows triggered by {% data variables.product.prodname_dependabot %} for the `pull_request_target` event on pull requests where the base ref was created by {% data variables.product.prodname_dependabot %}, now always receive a read-only token and no secrets. These changes are designed to prevent potentially malicious code from executing in a privileged workflow. For more information, see "[Automating {% data variables.product.prodname_dependabot %} with {% data variables.product.prodname_actions %}](/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions)."'
- Workflow runs on `push` and `pull_request` events triggered by {% data variables.product.prodname_dependabot %} will now respect the permissions specified in your workflows, allowing you to control how you manage automatic dependency updates. The default token permissions will remain read-only. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-10-06-github-actions-workflows-triggered-by-dependabot-prs-will-respect-permissions-key-in-workflows/)."
@@ -109,13 +109,13 @@ sections:
- The search order behavior for self-hosted runners has now changed, so that the first available matching runner at any level will run the job in all cases. This allows jobs to be sent to self-hosted runners much faster, especially for organizations and enterprises with lots of self-hosted runners. Previously, when running a job that required a self-hosted runner, {% data variables.product.prodname_actions %} would look for self-hosted runners in the repository, organization, and enterprise, in that order.
- 'Runner labels for {% data variables.product.prodname_actions %} self-hosted runners can now be listed, added and removed using the REST API. For more information about using the new APIs at a repository, organization, or enterprise level, see "[Repositories](/rest/reference/actions#list-labels-for-a-self-hosted-runner-for-a-repository)", "[Organizations](/rest/reference/actions#add-custom-labels-to-a-self-hosted-runner-for-an-organization)", and "[Enterprises](/rest/reference/enterprise-admin#list-labels-for-a-self-hosted-runner-for-an-enterprise)" in the REST API documentation.'
-
- heading: 'Dependabot and Dependency graph changes'
+ heading: 'Dependabot 和依赖关系图更改'
notes:
- Dependency graph now supports detecting Python dependencies in repositories that use the Poetry package manager. Dependencies will be detected from both `pyproject.toml` and `poetry.lock` manifest files.
- When configuring {% data variables.product.prodname_dependabot %} security and version updates on GitHub Enterprise Server, we recommend you also enable {% data variables.product.prodname_dependabot %} in {% data variables.product.prodname_github_connect %}. This will allow {% data variables.product.prodname_dependabot %} to retrieve an updated list of dependencies and vulnerabilities from {% data variables.product.prodname_dotcom_the_website %}, by querying for information such as the changelogs of the public releases of open source code that you depend upon. For more information, see "[Enabling the dependency graph and Dependabot alerts for your enterprise](/admin/configuration/configuring-github-connect/enabling-the-dependency-graph-and-dependabot-alerts-for-your-enterprise)."
- '{% data variables.product.prodname_dependabot_alerts %} alerts can now be dismissed using the GraphQL API. For more information, see the "[dismissRepositoryVulnerabilityAlert](/graphql/reference/mutations#dismissrepositoryvulnerabilityalert)" mutation in the GraphQL API documentation.'
-
- heading: 'Code scanning and secret scanning changes'
+ heading: '代码扫描和秘密扫描更改'
notes:
- The {% data variables.product.prodname_codeql %} CLI now supports including markdown-rendered query help in SARIF files, so that the help text can be viewed in the {% data variables.product.prodname_code_scanning %} UI when the query generates an alert. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-23-display-help-text-for-your-custom-codeql-queries-in-code-scanning/)."
- The {% data variables.product.prodname_codeql %} CLI and {% data variables.product.prodname_vscode %} extension now support building databases and analyzing code on machines powered by Apple Silicon, such as Apple M1. For more information, see the "[{% data variables.product.prodname_dotcom %} changelog](https://github.blog/changelog/2021-11-10-codeql-now-supports-apple-silicon-m1/)."
@@ -150,7 +150,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- Actions services needs to be restarted after restoring appliance from backup taken on a different host.
- |
When using SAML encrypted assertions with {% data variables.product.prodname_ghe_server %} 3.4.0 and 3.4.1, a new XML attribute `WantAssertionsEncrypted` in the `SPSSODescriptor` contains an invalid attribute for SAML metadata. IdPs that consume this SAML metadata endpoint may encounter errors when validating the SAML metadata XML schema. A fix will be available in the next patch release. [Updated: 2022-04-11]
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
index 9e2abde51d..cc3cea8307 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/1.yml
@@ -46,7 +46,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- |
When using SAML encrypted assertions with {% data variables.product.prodname_ghe_server %} 3.4.0 and 3.4.1, a new XML attribute `WantAssertionsEncrypted` in the `SPSSODescriptor` contains an invalid attribute for SAML metadata. IdPs that consume this SAML metadata endpoint may encounter errors when validating the SAML metadata XML schema. A fix will be available in the next patch release. [Updated: 2022-04-11]
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
index 11f711b1bb..7021324b1a 100644
--- a/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-4/2.yml
@@ -25,7 +25,7 @@ sections:
- 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
- When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
- '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
- - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
- |
When using SAML encrypted assertions with {% data variables.product.prodname_ghe_server %} 3.4.0 and 3.4.1, a new XML attribute `WantAssertionsEncrypted` in the `SPSSODescriptor` contains an invalid attribute for SAML metadata. IdPs that consume this SAML metadata endpoint may encounter errors when validating the SAML metadata XML schema. A fix will be available in the next patch release. [Updated: 2022-04-11]
diff --git a/translations/zh-CN/data/release-notes/enterprise-server/3-5/0-rc1.yml b/translations/zh-CN/data/release-notes/enterprise-server/3-5/0-rc1.yml
new file mode 100644
index 0000000000..268445d726
--- /dev/null
+++ b/translations/zh-CN/data/release-notes/enterprise-server/3-5/0-rc1.yml
@@ -0,0 +1,345 @@
+---
+date: '2022-05-10'
+release_candidate: true
+deprecated: false
+intro: |
+ {% note %}
+
+ **Note:** If {% data variables.product.product_location %} is running a release candidate build, you can't upgrade with a hotpatch. We recommend only running release candidates on test environments.
+
+ {% endnote %}
+
+ For upgrade instructions, see "[Upgrading {% data variables.product.prodname_ghe_server %}](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)."
+sections:
+ features:
+ -
+ heading: IP exception list for validation testing after maintenance
+ notes:
+ - |
+ You can now configure an allow list of IP addresses that can access application services on your GitHub Enterprise Server instance while maintenance mode is enabled. Administrators who visit the instance's web interface from an allowed IP address can validate the instance's functionality post-maintenance and before disabling maintenance mode. For more information, see "[Enabling and scheduling maintenance mode](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode#validating-changes-in-maintenance-mode-using-the-ip-exception-list)."
+ -
+ heading: Custom repository roles are generally available
+ notes:
+ - |
+ With custom repository roles, organizations now have more granular control over the repository access permissions they can grant to users. 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)."
+
+ A custom repository role is created by an organization owner, and is available across all repositories in that organization. Each role can be given a custom name, and a description. It can be configured from a set of over 40 fine grained permissions. Once created, repository admins can assign a custom role to any user, team or outside collaborator in their repository.
+
+ Custom repository roles can be created, viewed, edited and deleted via the new **Repository roles** tab in an organization's settings. A maximum of 3 custom roles can be created within an organization.
+
+ Custom repository roles are also fully supported in the GitHub Enterprise Server REST APIs. The Organizations API can be used to list all custom repository roles in an organization, and the existing APIs for granting repository access to individuals and teams have been extended to support custom repository roles. For more information, see "[Organizations](/rest/reference/orgs#list-custom-repository-roles-in-an-organization)" in the REST API documentation.
+ -
+ heading: GitHub Container registry in public beta
+ notes:
+ - |
+ The GitHub Container registry (GHCR) is now available in GitHub Enterprise Server 3.5 as a public beta, offering developers the ability to publish, download, and manage containers. GitHub Packages container support implements the OCI standards for hosting Docker images. For more information, see "[GitHub Container registry](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)."
+ -
+ heading: Dependabot updates are generally available
+ notes:
+ - |
+ Dependabot version and security updates are now generally available in GitHub Enterprise Server 3.5. All the popular ecosystems and features that work on GitHub.com repositories now can be set up on your GitHub Enterprise Server instance. Dependabot on GitHub Enterprise Server requires GitHub Actions and a pool of self-hosted Dependabot runners, GitHub Connect enabled, and Dependabot enabled by an admin.
+
+ Following on from the public beta release, we will be supporting the use of GitHub Actions runners hosted on a Kubernetes setup.
+
+ For more information, see "[Setting up Dependabot updates](https://docs.github.com/en/enterprise-server@3.5/admin/github-actions/enabling-github-actions-for-github-enterprise-server/setting-up-dependabot-updates)."
+ -
+ heading: Server Statistics in public beta
+ notes:
+ - |
+ You can now analyze how your team works, understand the value you get from GitHub Enterprise Server, and help us improve our products by reviewing your instance's usage data and sharing this aggregate data with GitHub. You can use your own tools to analyze your usage over time by downloading your data in a CSV or JSON file or by accessing it using the REST API. To see the list of aggregate metrics collected, see "[About Server Statistics](/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics#server-statistics-data-collected)." **Server Statistics data includes no personal data nor GitHub content, such as code, issues, comments, or pull requests content. For a better understanding of how we store and secure Server Statistics data, see "[GitHub Security](https://github.com/security)."** For more information about Server Statistics, see "[Analyzing how your team works with Server Statistics](/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics)." This feature is available in public beta.
+ -
+ heading: GitHub Actions rate limiting is now configurable
+ notes:
+ - |
+ Site administrators can now enable and configure a rate limit for GitHub Actions. By default, the rate limit is disabled. When workflow jobs cannot immediately be assigned to an available runner, they will wait in a queue until a runner is available. However, if GitHub Actions experiences a sustained high load, the queue can back up faster than it can drain and the performance of the GitHub Enterprise Server instance may degrade. To avoid this, an administrator can configure a rate limit. When the rate limit is exceeded, additional workflow runs will fail immediately rather than being put in the queue. Once the rate has stabilized below the threshold, new runs can be queued again. For more information, see "[Configuring rate limits](/admin/configuration/configuring-your-enterprise/configuring-rate-limits#configuring-rate-limits-for-github-actions)."
+ -
+ heading: OpenID Connect (OIDC) for secure deployments with GitHub Actions
+ notes:
+ - |
+ GitHub Actions on GitHub Enterprise Server now supports OIDC for secure deployments to cloud providers, which uses short-lived tokens that are automatically rotated for each deployment. OIDC enables the following functionality.
+
+ - Seamless authentication between cloud providers and GitHub Enterprise Server without the need for storing any long-lived cloud secrets on your instance
+ - Cloud administrators can rely on the security mechanisms of a particular cloud provider to ensure that GitHub Actions workflows have minimal access to cloud resources. There is no duplication of secret management between GitHub Enterprise Server and the cloud.
+
+ For more information, see "[Security hardening your deployments](/actions/deployment/security-hardening-your-deployments)."
+ -
+ heading: Sharing GitHub Actions within your enterprise is generally available
+ notes:
+ - |
+ Support for GitHub Actions in internal repositories is now generally available for organizations on your GitHub Enterprise Server instance. You can innersource automation by sharing actions in internal repositories. You can manage a repository's settings or use the REST API to allow access to workflows in other repositories within the organization or in any organization on the instance. For more information, see "[Sharing actions and workflows with your enterprise](/actions/creating-actions/sharing-actions-and-workflows-with-your-enterprise)," "[Managing GitHub Actions settings for a repository](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#allowing-access-to-components-in-an-internal-repository)," and "[Actions Permissions](/rest/actions/permissions#get-the-level-of-access-for-workflows-outside-of-the-repository)" in the REST API documentation.
+ -
+ heading: Cache support for GitHub Actions on GitHub Enterprise Server is now generally available
+ notes:
+ - |
+ You can now use dependency caching to speed up your GitHub Actions workflows. To cache dependencies for a job, you can include the [actions/cache](https://github.com/actions/cache) action to create a cache with a unique key. You can share caches across all workflows in the same repository. These workflows can then restore the cache and run faster.
+
+ Actions users can also use our cache APIs to:
+
+ - Define the enterprise policy for cache size range allowed per repository.
+ - Query the cache usage within each repository and monitor if the total size of all caches is reaching the upper limit.
+ - Increase the maximum cache size for a repository within the allowed enterprise limits, based on the cache requirements of the repository.
+ - Monitor aggregate cache usage at organization level or at enterprise level.
+
+ The external blob storage that is configured within your enterprise account will now be shared across workflow artifacts, logs, and also the caches. For more information, see "[Caching dependencies to speed up workflows](/actions/using-workflows/caching-dependencies-to-speed-up-workflows)."
+ -
+ heading: Automatically sign commits made in the web UI
+ notes:
+ - |
+ You can now configure GitHub Enterprise Server to automatically sign commits made in the web interface, such as from editing a file or merging a pull request. Signed commits increase confidence that changes come from trusted sources. This feature allows the [Require signed commits](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-signed-commits) branch protection setting to block unsigned commits from entering a repository, while allowing entry of signed commits – even those made in the web interface. For more information, see "[Configuring web commit signing](/admin/configuration/configuring-your-enterprise/configuring-web-commit-signing)."
+ -
+ heading: Sync license usage any time
+ notes:
+ - |
+ For customers that sync license usage between GitHub Enterprise Server and GitHub Enterprise Cloud automatically using GitHub Connect, you now have the ability to sync your license usage independently of the automatic weekly sync. This feature also reports the status of sync job. For more information, see "[Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud#manually-syncing-license-usage)."
+ -
+ heading: Reusable workflows for GitHub Actions are generally available
+ notes:
+ - |
+ Reusable workflows are now generally available. Reusable workflows help you reduce duplication by enabling you to reuse an entire workflow as if it were an action. With the general availability release, a number of improvements are now available for GitHub Enterprise Server. For more information, see "[Reusing workflows](/actions/using-workflows/reusing-workflows)."
+
+ - You can utilize outputs to pass data from reusable workflows to other jobs in the caller workflow.
+ - You can pass environment secrets to reusable workflows.
+ - The audit log includes information about which reusable workflows are used.
+ - Reusable workflows in the same repository as the calling repository can be referenced with just the path and filename (`PATH/FILENAME`). The called workflow will be from the same commit as the caller workflow.
+ - Reusable workflows are subject to your organization's actions access policy. Previously, even if your organization had configured the "Allow select actions" policy, you were still able to use a reusable workflow from any location. Now if you use a reusable workflow that falls outside of that policy, your run will fail. For more information, see "[Enforcing policies for GitHub Actions in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#enforcing-a-policy-to-restrict-the-use-of-actions-in-your-enterprise)."
+ -
+ heading: Self-hosted runners for GitHub Actions can now disable automatic updates
+ notes:
+ - |
+ You now have more control over when your self-hosted runners perform software updates. If you specify the `--disableupdate` flag to the runner then it will not try to perform an automatic software update if a newer version of the runner is available. This allows you to update the self-hosted runner on your own schedule, and is especially convenient if your self-hosted runner is in a container.
+
+ For compatibility with the GitHub Actions service, you will need to manually update your runner within 30 days of a new runner version being available. For instructions on how to install the latest runner version, please see the installation instructions for [the latest release in the runner repo](https://github.com/actions/runner/releases).
+ -
+ heading: Secure self-hosted runners for GitHub Actions by limiting workflows
+ notes:
+ - |
+ Organization owners can now increase the security of CI/CD workflows on self-hosted runners by choosing which workflows can access a runner group. Previously, any workflow in a repository, such as an issue labeler, could access the self-hosted runners available to an organization. For more information, see "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#changing-what-workflows-can-access-a-runner-group)" and the [GitHub Blog](https://github.blog/2022-03-23-github-actions-secure-self-hosted-runners-specific-workflows/).
+ -
+ heading: Prevent GitHub Actions from approving pull requests
+ notes:
+ - |
+ You can now control whether GitHub Actions can approve pull requests. This feature protects against a user using GitHub Actions to satisfy the "Required approvals" branch protection requirement and merging a change that was not reviewed by another user. To prevent breaking existing workflows, **Allow GitHub Actions reviews to count towards required approval** is enabled by default. Organization owners can disable the feature in the organization's GitHub Actions settings. For more information, see "[Disabling or limiting GitHub Actions for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization#preventing-github-actions-from-approving-pull-requests)."
+ -
+ heading: Re-run failed or individual GitHub Actions jobs
+ notes:
+ - |
+ You can now re-run only failed jobs or an individual job in a GitHub Actions workflow run. For more information, see "[Re-running workflows and jobs](/managing-workflow-runs/re-running-workflows-and-jobs)."
+ -
+ heading: Dependency graph supports GitHub Actions
+ notes:
+ - |
+ The dependency graph now detects YAML files for GitHub Actions workflows. GitHub Enterprise Server will display the workflow files within the **Insights** tab's dependency graph section. Repositories that publish actions will also be able to see the number of repositories that depend on that action from the "Used By" control on the repository homepage. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."
+ -
+ heading: Security overview for enterprises in public beta
+ notes:
+ - |
+ GitHub Advanced Security customers can now view an overview of security alerts at the enterprise level. The new **Security** tab at the enterprise level provides a repository-centric view of application security risks, as well as an alert-centric view of all secret scanning alerts. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."
+ -
+ heading: Security view for organizations is generally available
+ notes:
+ - |
+ The overview of security alerts at the organization level is now generally available. GitHub Advanced Security customers can use the security overview to view a repository-centric view of application security risks, or an alert-centric view of all code scanning, Dependabot, and secret scanning alerts for all repositories in an organization. For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."
+ -
+ heading: Code scanning detects more security issues, supports new language versions
+ notes:
+ - |
+ Code scanning now detects a larger number of CWEs, and CodeQL code scanning fully supports the standard language features in the following language releases.
+
+ - C# 10 / .NET 6
+ - Python 3.10
+ - Java 17
+ - TypeScript 4.5
+
+ For more information, see the [GitHub Blog](https://github.blog/changelog/2022-02-25-code-scanning-detects-more-security-issues-supports-new-language-versions/).
+ -
+ heading: View code scanning alerts across an organization
+ notes:
+ - |
+ GitHub Advanced Security customers can now view code scanning alerts in an organization's **Security** tab. This view is available to organization owners and members of teams with the [security manager role](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization). For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."
+ - |
+ Users can now retrieve code scanning alerts for an organization on your GitHub Enterprise Server instance via the REST API. This new API endpoint supplements the existing [endpoint for repositories](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository). For more information, see [Code Scanning](/rest/code-scanning) in the REST API documentation.
+ -
+ heading: Secret scanning available as a push protection
+ notes:
+ - |
+ GitHub Enterprise Server can now block any pushes where a token is detected with high confidence. Developers can bypass the block by providing details of why the secret needs to be committed via a web UI. For more information, see "[Protecting pushes with secret scanning](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)."
+ -
+ heading: Dry runs for custom patterns with secret scanning
+ notes:
+ - |
+ GitHub Advanced Security customers can now dry run custom secret scanning patterns at the organization or repository level. Dry runs allow people with owner or admin access to review and hone their patterns before publishing them and generating alerts. You can compose a pattern, then use **Save and dry run** to retrieve results. The scans typically take just a few seconds, but GitHub Enterprise Server will also notify organization owners or repository admins via email when dry run results are ready. For more information, see "[About secret scanning](/code-security/secret-scanning/about-secret-scanning#about-secret-scanning-for-private-repositories)" and "[Defining custom patterns for secret scanning](/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning)."
+ -
+ heading: Secret scanning custom pattern events now in the audit log
+ notes:
+ - |
+ The audit log now includes events associated with secret scanning custom patterns. This data helps GitHub Advanced Security customers understand actions taken on their [repository](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization#repository_secret_scanning_custom_pattern-category-actions)-, [organization](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization#org_secret_scanning_custom_pattern-category-actions)-, or [enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#business_secret_scanning_custom_pattern-category-actions)-level custom patterns for security and compliance audits. For more information, see "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)" or "[Reviewing audit logs for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise)."
+ -
+ heading: Configure permissions for secret scanning with custom repository roles
+ notes:
+ - |
+ You can now configure two new permissions for secret scanning when managing custom repository roles.
+
+ - View secret scanning results
+ - Dismiss or reopen secret scanning results
+
+ 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)."
+ -
+ heading: Secret scanning now supports archived repositories
+ notes:
+ - |
+ GitHub Advanced Security customers can now enable secret scanning for archived repositories via the UI and API. For more information, see "[About secret scanning](/code-security/secret-scanning/about-secret-scanning#about-secret-scanning-for-private-repositories)," "[About archived repositories](/repositories/archiving-a-github-repository/archiving-repositories)," and "[Repositories](/rest/repos/repos#update-a-repository)" in the REST API documentation.
+ -
+ heading: Secret scanning webhooks for alert locations
+ notes:
+ - |
+ GitHub Advanced Security customers using secret scanning can now opt to receive a webhook each time a secret is detected in a new location. The `secret_scanning_alert_location` webhook event includes location details, like the commit SHA, and the associated alert for the detection. A location is created for every new file path containing the detected secret. For more information, see "[Webhook events and payloads](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#secret_scanning_alert_location)."
+ -
+ heading: View Dependabot alerts across an organization
+ notes:
+ - |
+ GitHub Advanced Security customers can now view Dependabot alerts in in an organization's **Security** tab. This view is available to organization owners and members of teams with the [security manager role](/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization). For more information, see "[About the security overview](/code-security/security-overview/about-the-security-overview)."
+ -
+ heading: Configure permissions for Dependabot alerts with custom repository roles
+ notes:
+ - |
+ You can now configure two new permissions for Dependabot alerts when managing custom repository roles.
+
+ - View Dependabot alerts
+ - Dismiss or reopen Dependabot alerts
+
+ 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)."
+ -
+ heading: Reopen dismissed Dependabot alerts
+ notes:
+ - |
+ You can now reopen dismissed Dependabot alerts through the UI page for a closed alert. This does not affect Dependabot pull requests or the GraphQL API. For more information, see "[About Dependabot alerts](/code-security/dependabot/dependabot-alerts/about-dependabot-alerts)."
+ -
+ heading: Pub support for Dependabot version updates is in public beta
+ notes:
+ - |
+ Users of Dependabot version updates can now proactively update dependencies for Flutter or Dart projects that use the Pub package manager.
+
+ To test [version updates](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates) on your own Dart or Flutter repository, add the following configuration file in [.github/dependabot.yaml](/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates#enabling-dependabot-version-updates). Note the `package-ecosystem: "pub"` and `enable-beta-ecosystems: true` flags.
+ ```yaml
+ version: 2
+ enable-beta-ecosystems: true
+ updates:
+ - package-ecosystem: "pub"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ ```
+ -
+ heading: See pull request associated with a repository's Dependabot alerts via GraphQL API
+ notes:
+ - |
+ The new `DependabotUpdate` GraphQL object lets you view information about what happens to your repository's security updates. When GitHub Enterprise Server detects that a dependency in your repository is vulnerable, Dependabot will attempt to open a pull request to update that dependency to a non-vulnerable version. You can now see the pull request that fixes the vulnerability. In some cases, Dependabot fails to open a pull request. Previously, the error message that Dependabot generated was only visible in the "Dependabot Alerts" section of the **Security** tab. Now, if Dependabot runs into an error when trying to open a pull request for a security alert, you can determine the reason using the GraphQL API. For more information, see "[Objects](/graphql/reference/objects#dependabotupdate)" in the GraphQL API documentation.
+ -
+ heading: Access more information about Dependabot alerts via GraphQL API
+ notes:
+ - |
+ You can now view fixed alerts from Dependabot with the GraphQL API. You can also access and filter by state, as well as by unique numeric identifier, and you can filter by state on the vulnerability alert object. The following fields now exist for a `RepositoryVulnerabilityAlert`.
+
+ - `number`
+ - `fixed_at`
+ - `fix_reason`
+ - `state`
+
+ For more information, see "[Objects](/graphql/reference/objects#repositoryvulnerabilityalert)" in the GraphQL API documentation.
+ -
+ heading: Git events in the enterprise audit log
+ notes:
+ - |
+ The following Git-related events can now appear in the enterprise audit log. If you enable the feature and set an audit log retention period, the new events will be available for search via the UI and API, or export via JSON or CSV.
+
+ - `git.clone`
+ - `git.fetch`
+ - `git.push`
+
+ Due to the large number of Git events logged, we recommend you monitor your instance's file storage and review your related alert configurations. For more information, see "[Audit log events for your enterprise](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#git-category-actions)" and "[Monitoring storage](/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds#monitoring-storage)."
+ -
+ heading: Improvements to CODEOWNERS
+ notes:
+ - |
+ This release includes improvements to CODEOWNERS.
+
+ - Syntax errors are now surfaced when viewing a CODEOWNERS file from the web. Previously, when a line in a CODEOWNERS file had a syntax error, the error would be ignored or in some cases cause the entire CODEOWNERS file to not load. GitHub Apps and Actions can access the same list of errors using new REST and GraphQL APIs. For more information, see "[Repositories](/rest/repos/repos#list-codeowners-errors)" in the REST API documentation or "[Objects](/graphql/reference/objects#repositorycodeowners)" in the GraphQL API documentation.
+ - After someone creates a new pull request or pushes new changes to a draft pull request, any code owners that will be requested for review are now listed in the pull request under "Reviewers". This feature gives you an early look at who will be requested to review once the pull request is marked ready for review.
+ - Comments in CODEOWNERS files can now appear at the end of a line, not just on dedicated lines.
+
+ For more information, see "[About code owners](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)."
+ -
+ heading: More ways to keep a pull request's topic branch up to date
+ notes:
+ - |
+ The **Update branch** button on the pull request page lets you update your pull request's branch with the latest changes from the base branch. This is useful for verifying your changes are compatible with the current version of the base branch before you merge. Two enhancements now give you more ways to keep your branch up-to-date.
+
+ - When your pull request's topic branch is out of date with the base branch, you now have the option to update it by rebasing on the latest version of the base branch. Rebasing applies the changes from your branch onto the latest version of the base branch, resulting in a branch with a linear history since no merge commit is created. To update by rebasing, click the drop down menu next to the **Update Branch** button, click **Update with rebase**, and then click **Rebase branch**. Previously, **Update branch** performed a traditional merge that always resulted in a merge commit in your pull request branch. This option is still available, but now you have the choice. For more information, see "[Keeping your pull request in sync with the base branch](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch)."
+
+ - A new repository setting allows the **Update branch** button to always be available when a pull request's topic branch is not up to date with the base branch. Previously, this button was only available when the **Require branches to be up to date before merging** branch protection setting was enabled. People with admin or maintainer access can manage the **Always suggest updating pull request branches** setting from the **Pull Requests** section in repository settings. For more information, see "[Managing suggestions to update pull request branches](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches)."
+ -
+ heading: Configure custom HTTP headers for GitHub Pages sites
+ notes:
+ - |
+ You can now configure custom HTTP headers that apply to all GitHub Pages sites served from your GitHub Enterprise Server instance. For more information, see "[Configuring GitHub Pages for your enterprise](/admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise#configuring-github-pages-response-headers-for-your-enterprise)."
+ -
+ heading: Ignore commits in blame view
+ notes:
+ - |
+ It's now possible to ignore revisions in the blame view by creating a _.git-blame-ignore-revs_ file in the root of your repository. For more information, see "[Viewing a file](/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view)."
+ -
+ heading: Light high contrast theme is generally available
+ notes:
+ - |
+ A light high contrast theme, with greater contrast between foreground and background elements, is now generally available. For more information, see "[Managing your theme settings](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-your-theme-settings)."
+ -
+ heading: 标记保护规则
+ notes:
+ - |
+ Repository owners can now configure tag protection rules to protect a repository's tags. Once protected by a tag protection rule, tags matching a specified name pattern can only be created and deleted by users with the Maintain or Admin role in the repository. For more information, see "[Configuring tag protection rules](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules)."
+ bugs:
+ - |
+ It is now possible for GitHub Apps to upload release assets.
+ changes:
+ - |
+ To use the device authorization flow for OAuth and GitHub Apps, you must manually enable the feature. This change reduces the likelihood of apps being used in phishing attacks against GitHub Enterprise Server users by ensuring integrators are aware of the risks and make a conscious choice to support this form of authentication. If you own or manage an OAuth App or GitHub App and you want to use the device flow, you can enable it for your app via the app's settings page. The device flow API endpoints will respond with status code `400` to apps that have not enabled this feature. For more information, see "[Authorizing OAuth Apps](/developers/apps/building-oauth-apps/authorizing-oauth-apps#device-flow)."
+ - |
+ The code scanning alert page now always shows the alert status and information for the default branch. There is a new "Affected branches" panel in the sidebar where you can see the status of the alert in other branches. If the alert does not exist in your default branch, the alert page will show the status as "In branch" or "In pull request" for the location where the alert was last seen. This improvement makes it easier to understand the status of alerts which have been introduced into your code base. For more information, see "[About code scanning alerts](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts#about-alert-details)."
+
+ The alert list page is not changed and can be filtered by `branch`. You can use the code scanning API to retrieve more detailed branch information for alerts. For more information, see "[Code Scanning](/rest/code-scanning)" in the REST API documentation.
+ - |
+ Code scanning now shows the details of the analysis origin of an alert. If an alert has more than one analysis origin, it is shown in the "Affected branches" sidebar and in the alert timeline. You can hover over the analysis origin icon in the "Affected branches" sidebar to see the alert status in each analysis origin. If an alert only has a single analysis origin, no information about analysis origins is displayed on the alert page. These improvements will make it easier to understand your alerts. In particular, it will help you understand those that have multiple analysis origins. This is especially useful for setups with multiple analysis configurations, such as monorepos. For more information, see "[About code scanning alerts](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-alerts#about-analysis-origins)."
+ - |
+ Lists of repositories owned by a user or organization now have an additional filter option, "Templates", making it easier to find template repositories.
+ - |
+ GitHub Enterprise Server can display several common image formats, including PNG, JPG, GIF, PSD, and SVG, and provides several ways to compare differences between versions. Now when reviewing added or changed images in a pull request, previews of those images are shown by default. Previously, you would see a message indicating that binary files could not be shown and you would need to toggle the "Display rich diff" option. For more information, see "[Working with non-code files](/repositories/working-with-files/using-files/working-with-non-code-files)."
+ - |
+ New gists are now created with a default branch name of either `main` or the alternative default branch name defined in your user settings. This matches how other repositories are created on GitHub Enterprise Server. For more information, see "[About branches](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch)" and "[Managing the default branch name for your repositories](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/managing-the-default-branch-name-for-your-repositories)."
+ - |
+ Gists now only show the 30 most recent comments when first displayed. You can click **Load earlier comments...** to view more. This allows gists that have many comments to appear more quickly. For more information, see "[Editing and sharing content with gists](/get-started/writing-on-github/editing-and-sharing-content-with-gists)."
+ - |
+ Settings pages for users, organizations, repositories, and teams have been redesigned, grouping similar settings pages into sections for improved information architecture and discoverability. For more information, see the [GitHub changelog](https://github.blog/changelog/2022-02-02-redesign-of-githubs-settings-pages/).
+ - |
+ Focusing or hovering over a label now displays the label description in a tooltip.
+ - |
+ Creating and removing repository invitations, whether done through the API or web interface, are now subject to rate limits that may be enabled on your GitHub Enterprise Server instance. For more information about rate limits, see "[Configuring rate limits](/admin/configuration/configuring-your-enterprise/configuring-rate-limits)."
+ deprecations:
+ -
+ heading: Change to the format of authentication tokens
+ notes:
+ - |
+ GitHub Connect will no longer work after June 3rd for instances running GitHub Enterprise Server 3.1 or older, due to the format of GitHub authentication tokens changing. For more information, see the [GitHub changelog](https://github.blog/changelog/2021-03-31-authentication-token-format-updates-are-generally-available/).
+ -
+ heading: CodeQL runner deprecated in favor of CodeQL CLI
+ notes:
+ - |
+ The CodeQL runner is deprecated in favor of the CodeQL CLI. GitHub Enterprise Server 3.4 and later no longer include the CodeQL runner. This deprecation only affects users who use CodeQL code scanning in 3rd party CI/CD systems. GitHub Actions users are not affected. GitHub strongly recommends that customers migrate to the CodeQL CLI, which is a feature-complete replacement for the CodeQL runner and has many additional features. For more information, see "[Migrating from the CodeQL runner to CodeQL CLI](/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli)."
+ known_issues:
+ - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+ - 自定义防火墙规则在升级过程中被删除。
+ - Git LFS 跟踪的文件[通过 Web 界面上传](https://github.com/blog/2105-upload-files-to-your-repositories) 被错误地直接添加到仓库。
+ - 如果议题包含文件路径长于 255 个字符的同一仓库中 blob 的永久链接,则议题无法关闭。
+ - 对 GitHub Connect 启用“用户可以搜索 GitHub.com”后,私有和内部仓库中的议题不包括在 GitHub.com 搜索结果中。
+ - '{% data variables.product.prodname_registry %} npm 注册表不再返回元数据响应的时间值。这样做是为了大幅改善性能。作为元数据响应的一部分,我们继续拥有返回时间值所需的所有数据,并将在我们解决现有性能问题后恢复返回这个值。'
+ - 特定于处理预接收挂钩的资源限制可能会导致某些预接收挂钩失败。
+ - Actions services need to be restarted after restoring an appliance from a backup taken on a different host.
diff --git a/translations/zh-CN/data/release-notes/github-ae/2021-06/2021-12-06.yml b/translations/zh-CN/data/release-notes/github-ae/2021-06/2021-12-06.yml
index aff7b2e2e0..af5fa71e1e 100644
--- a/translations/zh-CN/data/release-notes/github-ae/2021-06/2021-12-06.yml
+++ b/translations/zh-CN/data/release-notes/github-ae/2021-06/2021-12-06.yml
@@ -102,7 +102,7 @@ sections:
- |
People with maintain access can now manage the repository-level "Allow auto-merge" setting. This setting, which is off by default, controls whether auto-merge is available on pull requests in the repository. Previously, only people with admin access could manage this setting. Additionally, this setting can now by controlled using the "[Create a repository](/rest/reference/repos#create-an-organization-repository)" and "[Update a repository](/rest/reference/repos#update-a-repository)" REST APIs. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository)."
- |
- The assignees selection for issues and pull requests now supports type ahead searching so you can find users in your organization faster. Additionally, search result rankings have been updated to prefer matches at the start of a person's username or profile name.
+ 针对议题和拉取请求的受理人选择现在支持提前键入搜索,以便您可以更快地在组织中查找用户。此外,搜索结果排名已更新为首选用户的用户名或个人资料名称开头的匹配项。
-
heading: '仓库'
notes:
diff --git a/translations/zh-CN/data/reusables/actions/about-artifact-log-retention.md b/translations/zh-CN/data/reusables/actions/about-artifact-log-retention.md
index b4b454f393..33b1ff3168 100644
--- a/translations/zh-CN/data/reusables/actions/about-artifact-log-retention.md
+++ b/translations/zh-CN/data/reusables/actions/about-artifact-log-retention.md
@@ -4,6 +4,6 @@
- 对于公共仓库:您可以将此保留期更改为 1 至 90 天。
{%- endif %}
-- For private{% ifversion ghec or ghes or ghae %} and internal{% endif %} repositories: you can change this retention period to anywhere between 1 day or 400 days.
+- 对于私有{% ifversion ghec or ghes or ghae %} 和内部{% endif %} 存储库:您可以将此保留期更改为 1 天或 400 天之间的任何保留期。
自定义保留期时,它仅适用于新构件和日志文件,并且不追溯性地应用于现有对象。 对于托管的仓库和组织,最长保留期不能超过管理组织或企业设置的限制。
diff --git a/translations/zh-CN/data/reusables/actions/about-environments.md b/translations/zh-CN/data/reusables/actions/about-environments.md
index 0d9b0fc2a4..431d8073dd 100644
--- a/translations/zh-CN/data/reusables/actions/about-environments.md
+++ b/translations/zh-CN/data/reusables/actions/about-environments.md
@@ -1 +1 @@
-Environments are used to describe a general deployment target like `production`, `staging`, or `development`. When a {% data variables.product.prodname_actions %} workflow deploys to an environment, the environment is displayed on the main page of the repository. You can use environments to require approval for a job to proceed, restrict which branches can trigger a workflow, or limit access to secrets. For more information about creating environments, see "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)."
+环境用于描述一般的部署目标,如`生产`、`暂存`或`开发`。 当 {% data variables.product.prodname_actions %} 工作流程部署到某个环境时,该环境将显示在存储库的主页上。 您可以使用环境来要求批准才能继续作业,限制哪些分支可以触发工作流程,或限制对机密的访问。 有关创建环境的更多信息,请参阅“[使用环境进行部署](/actions/deployment/using-environments-for-deployment)”。
diff --git a/translations/zh-CN/data/reusables/actions/about-oidc-short-overview.md b/translations/zh-CN/data/reusables/actions/about-oidc-short-overview.md
index 4da4c8f81a..49d1b46764 100644
--- a/translations/zh-CN/data/reusables/actions/about-oidc-short-overview.md
+++ b/translations/zh-CN/data/reusables/actions/about-oidc-short-overview.md
@@ -1,2 +1,2 @@
-If your {% data variables.product.prodname_actions %} workflows need to access resources from a cloud provider that supports OpenID Connect (OIDC), you can configure your workflows to authenticate directly to the cloud provider. This will let you stop storing these credentials as long-lived secrets and provide other security benefits. For more information, see "[About security hardening with OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)"
+如果您的 {% data variables.product.prodname_actions %} 工作流程需要从支持 OpenID Connect (OIDC) 的云提供商访问资源,则可以将工作流程配置为直接向云提供商进行身份验证。 这将允许您停止将这些凭据存储为长期存在的机密,并提供其他安全优势。 更多信息请参阅“[关于使用 OpenID Connect 进行安全强化](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)”。
diff --git a/translations/zh-CN/data/reusables/actions/about-runners.md b/translations/zh-CN/data/reusables/actions/about-runners.md
index 0b661b9ecf..64fe5a2e8e 100644
--- a/translations/zh-CN/data/reusables/actions/about-runners.md
+++ b/translations/zh-CN/data/reusables/actions/about-runners.md
@@ -1 +1 @@
-A runner is a server that runs your workflows when they're triggered.
+运行器是在触发工作流程时运行工作流程的服务器。
diff --git a/translations/zh-CN/data/reusables/actions/actions-audit-events-workflow.md b/translations/zh-CN/data/reusables/actions/actions-audit-events-workflow.md
index 015b1a4d16..cb8edee670 100644
--- a/translations/zh-CN/data/reusables/actions/actions-audit-events-workflow.md
+++ b/translations/zh-CN/data/reusables/actions/actions-audit-events-workflow.md
@@ -1,12 +1,12 @@
-| 操作 | 描述 |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
+| 操作 | 描述 |
+| ------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
| `cancel_workflow_run` | 工作流程运行取消时触发。 更多信息请参阅“[取消工作流程](/actions/managing-workflow-runs/canceling-a-workflow)。{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
| `completed_workflow_run` | 当工作流程状态更改为`完成`时触发。 只能使用 REST API 查看;在 UI 或 JSON/CSV 导出中不可见。 更多信息请参阅“[查看工作流程运行历史记录](/actions/managing-workflow-runs/viewing-workflow-run-history)”。{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
| `created_workflow_run` | 工作流程运行创建时触发。 只能使用 REST API 查看;在 UI 或 JSON/CSV 导出中不可见。 更多信息请参阅“[创建示例工作流程](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)。{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
-| `delete_workflow_run` | 工作流程运行被删除时触发。 更多信息请参阅“[删除工作流程运行](/actions/managing-workflow-runs/deleting-a-workflow-run)”。 |
-| `disable_workflow` | 工作流程禁用时触发。 |
-| `enable_workflow` | 在之前被 `disable_workflow` 禁用后,当工作流程启用时触发。 |
-| `rerun_workflow_run` | 工作流程运行重新运行时触发。 For more information, see "[Re-running a workflow](/actions/managing-workflow-runs/re-running-a-workflow)."{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
-| `prepared_workflow_job` | 工作流程作业启动时触发。 包括提供给作业的机密列表。 Can only be viewed using the REST API. It is not visible in the the {% data variables.product.prodname_dotcom %} web interface or included in the JSON/CSV export. For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows)."{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
-| `approve_workflow_job` | Triggered when a workflow job has been approved. For more information, see "[Reviewing deployments](/actions/managing-workflow-runs/reviewing-deployments)." |
-| `reject_workflow_job` | Triggered when a workflow job has been rejected. For more information, see "[Reviewing deployments](/actions/managing-workflow-runs/reviewing-deployments)."{% endif %}
+| `delete_workflow_run` | 工作流程运行被删除时触发。 更多信息请参阅“[删除工作流程运行](/actions/managing-workflow-runs/deleting-a-workflow-run)”。 |
+| `disable_workflow` | 工作流程禁用时触发。 |
+| `enable_workflow` | 在之前被 `disable_workflow` 禁用后,当工作流程启用时触发。 |
+| `rerun_workflow_run` | 工作流程运行重新运行时触发。 更多信息请参阅“[重新运行工作流程](/actions/managing-workflow-runs/re-running-a-workflow)。{% endif %}{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4963 %}
+| `prepared_workflow_job` | 工作流程作业启动时触发。 包括提供给作业的机密列表。 只能使用 REST API 查看。 它在 {% data variables.product.prodname_dotcom %} Web 界面中不可见,也不包含在 JSON/CSV 导出中。 更多信息请参阅“[触发工作流程的事件](/actions/reference/events-that-trigger-workflows)”。{% endif %}{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
+| `approve_workflow_job` | 在批准工作流程作业时触发。 更多信息请参阅“[审查部署](/actions/managing-workflow-runs/reviewing-deployments)”。 |
+| `reject_workflow_job` | 在拒绝工作流程作业时触发。 更多信息请参阅“[审查部署](/actions/managing-workflow-runs/reviewing-deployments)”。{% endif %}
diff --git a/translations/zh-CN/data/reusables/actions/actions-authentication.md b/translations/zh-CN/data/reusables/actions/actions-authentication.md
index ac196b62b3..f0c20f6358 100644
--- a/translations/zh-CN/data/reusables/actions/actions-authentication.md
+++ b/translations/zh-CN/data/reusables/actions/actions-authentication.md
@@ -1 +1 @@
-此 API 适用于经过身份验证的用户、{% data variables.product.prodname_oauth_apps %} 和 {% data variables.product.prodname_github_apps %}。 Access tokens require [`repo` scope](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/#available-scopes) for private repositories and [`public_repo` scope](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/#available-scopes) for {% ifversion ghae %}internal{% else %}public{% endif %} repositories.
+此 API 适用于经过身份验证的用户、{% data variables.product.prodname_oauth_apps %} 和 {% data variables.product.prodname_github_apps %}。 访问令牌需要 [`repo` 作用域](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/#available-scopes)(对于私有仓库)和 [`public_repo` 作用域](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/#available-scopes)(对于{% ifversion ghae %}内部{% else %}公共{% endif %}仓库)。
diff --git a/translations/zh-CN/data/reusables/actions/actions-group-concurrency.md b/translations/zh-CN/data/reusables/actions/actions-group-concurrency.md
index 9da2404f59..c2d44772cd 100644
--- a/translations/zh-CN/data/reusables/actions/actions-group-concurrency.md
+++ b/translations/zh-CN/data/reusables/actions/actions-group-concurrency.md
@@ -24,9 +24,9 @@ concurrency:
```
{% endraw %}
-### Example: Using a fallback value
+### 示例:使用回退值
-If you build the group name with a property that is only defined for specific events, you can use a fallback value. For example, `github.head_ref` is only defined on `pull_request` events. If your workflow responds to other events in addition to `pull_request` events, you will need to provide a fallback to avoid a syntax error. The following concurrency group cancels in-progress jobs or runs on `pull_request` events only; if `github.head_ref` is undefined, the concurrency group will fallback to the run ID, which is guaranteed to be both unique and defined for the run.
+如果使用仅为特定事件定义的属性构建组名,则可以使用回退值。 例如,`github.head_ref` 仅在 `pull_request` 事件上定义。 如果您的工作流响应除 `pull_request` 事件之外的其他事件,则需要提供回退以避免语法错误。 以下并发组取消正在进行的作业或仅在 `pull_request` 事件上运行;如果未定义 `github.head_ref` ,则并发组将回退到运行 ID,该 ID 保证是唯一的,并且是为运行定义的。
{% raw %}
```yaml
@@ -37,11 +37,11 @@ concurrency:
{% endraw %}
-### Example: Only cancel in-progress jobs or runs for the current workflow
+### 示例:仅取消当前工作流程的正在进行的作业或运行
- If you have multiple workflows in the same repository, concurrency group names must be unique across workflows to avoid canceling in-progress jobs or runs from other workflows. Otherwise, any previously in-progress or pending job will be canceled, regardless of the workflow.
+ 如果同一存储库中有多个工作流程,则并发组名称在工作流程中必须唯一,以避免取消正在进行的作业或从其他工作流程运行。 否则,无论工作流程如何,任何以前正在进行的或挂起的作业都将被取消。
-To only cancel in-progress runs of the same workflow, you can use the `github.workflow` property to build the concurrency group:
+要仅取消同一工作流程的正在进行的运行,可以使用 `github.workflow` 属性来构建并发组:
{% raw %}
```yaml
diff --git a/translations/zh-CN/data/reusables/actions/actions-multiple-types.md b/translations/zh-CN/data/reusables/actions/actions-multiple-types.md
index 0a904faa5c..15ce520243 100644
--- a/translations/zh-CN/data/reusables/actions/actions-multiple-types.md
+++ b/translations/zh-CN/data/reusables/actions/actions-multiple-types.md
@@ -1,10 +1,10 @@
-If you specify activity types or filters for an event and your workflow triggers on multiple events, you must configure each event separately. You must append a colon (`:`) to all events, including events without configuration.
+如果为事件指定活动类型或筛选器,并且工作流程触发多个事件,则必须单独配置每个事件。 您必须为所有事件附加冒号 (`:`),包括没有配置的事件。
-For example, a workflow with the following `on` value will run when:
+例如,使用以下 `on` 值的工作流程将在以下情况下运行:
-- A label is created
-- A push is made to the `main` branch in the repository
-- A push is made to a {% data variables.product.prodname_pages %}-enabled branch
+- 创建标签
+- 推送到存储库中的 `main` 分支
+- 推送到启用了 {% data variables.product.prodname_pages %} 的分支
```yaml
on:
diff --git a/translations/zh-CN/data/reusables/actions/allow-specific-actions-intro.md b/translations/zh-CN/data/reusables/actions/allow-specific-actions-intro.md
index 66ee35577a..50662d81b5 100644
--- a/translations/zh-CN/data/reusables/actions/allow-specific-actions-intro.md
+++ b/translations/zh-CN/data/reusables/actions/allow-specific-actions-intro.md
@@ -1,29 +1,29 @@
-### Allowing select actions{% if actions-workflow-policy %} and reusable workflows{% endif %} to run
+### 允许所选操作{% if actions-workflow-policy %} 和可重启工作流程{% endif %} 运行
-When you choose {% data reusables.actions.policy-label-for-select-actions-workflows %}, local actions{% if actions-workflow-policy %} and reusable workflows{% endif %} are allowed, and there are additional options for allowing other specific actions{% if actions-workflow-policy %} and reusable workflows{% endif %}:
+选择 {% data reusables.actions.policy-label-for-select-actions-workflows %} 时,允许本地操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %} ,并且还有其他选项可用于允许其他特定操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}:
- **允许 {% data variables.product.prodname_dotcom %} 创建的操作:** 您可以允许 {% data variables.product.prodname_dotcom %} 创建的所有操作用于工作流程。 {% data variables.product.prodname_dotcom %} 创建的操作位于 `actions` 和 `github` 组织中。 更多信息请参阅 [`actions`](https://github.com/actions) 和 [`github`](https://github.com/github) 组织。{% ifversion fpt or ghes or ghae-issue-5094 or ghec %}
-- **Allow Marketplace actions by verified creators:** {% ifversion ghes or ghae-issue-5094 %}This option is available if you have {% data variables.product.prodname_github_connect %} enabled and configured with {% data variables.product.prodname_actions %}. For more information, see "[Enabling automatic access to GitHub.com actions using GitHub Connect](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)."{% endif %} You can allow all {% data variables.product.prodname_marketplace %} actions created by verified creators to be used by workflows. 如果 GitHub 验证该操作的创建者为合作伙伴组织,{% octicon "verified" aria-label="The verified badge" %} 徽章将显示在 {% data variables.product.prodname_marketplace %} 中的操作旁边。{% endif %}
-- **Allow specified actions{% if actions-workflow-policy %} and reusable workflows{% endif %}:** You can restrict workflows to use actions{% if actions-workflow-policy %} and reusable workflows{% endif %} in specific organizations and repositories.
+- **允许已验证的创建者执行市场操作:** {% ifversion ghes or ghae-issue-5094 %}此选项在您启用 {% data variables.product.prodname_github_connect %} 并配置了 {% data variables.product.prodname_actions %} 时可用。 更多信息请参阅“[使用 GitHub Connect 启用对 GitHub.com 操作的自动访问](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)”。{% endif %} 您可以允许工作流程使用由经过验证的创建者创建的所有 {% data variables.product.prodname_marketplace %} 操作。 如果 GitHub 验证该操作的创建者为合作伙伴组织,{% octicon "verified" aria-label="The verified badge" %} 徽章将显示在 {% data variables.product.prodname_marketplace %} 中的操作旁边。{% endif %}
+- **允许指定的操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}:** 可以将工作流程限制为使用特定组织和存储库中的操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}。
- To restrict access to specific tags or commit SHAs of an action{% if actions-workflow-policy %} or reusable workflow{% endif %}, use the same syntax used in the workflow to select the action{% if actions-workflow-policy %} or reusable workflow{% endif %}.
+ 要限制对特定标记的访问或者操作{% if actions-workflow-policy %} 或可重用工作流程{% endif %} 的提交 SHA,请使用工作流中使用的相同语法来选择操作{% if actions-workflow-policy %} 或可重用工作流程{% endif %}。
- - For an action, the syntax is `/@`. For example, use `actions/javascript-action@v1.0.1` to select a tag or `actions/javascript-action@172239021f7ba04fe7327647b213799853a9eb89` to select a SHA. 更多信息请参阅“[查找和自定义操作](/actions/learn-github-actions/finding-and-customizing-actions#using-release-management-for-your-custom-actions)”。
+ - 对于操作,语法为 `/@`。 例如,使用 `actions/javascript-action@v1.0.1` 选择标记,或使用 `actions/javascript-action@172239021f7ba04fe7327647b213799853a9eb89` 选择 SHA。 更多信息请参阅“[查找和自定义操作](/actions/learn-github-actions/finding-and-customizing-actions#using-release-management-for-your-custom-actions)”。
{%- if actions-workflow-policy %}
- - For a reusable workflow, the syntax is `///@`. For example, `octo-org/another-repo/.github/workflows/workflow.yml@v1`. 更多信息请参阅“[重用工作流程](/actions/using-workflows/reusing-workflows#calling-a-reusable-workflow)”。
+ - 对于可重用的工作流程,语法为 `///@`。 例如,`octo-org/another-repo/.github/workflows/workflow.yml@v1`。 更多信息请参阅“[重用工作流程](/actions/using-workflows/reusing-workflows#calling-a-reusable-workflow)”。
{%- endif %}
- 您可以使用 `*` 通配符来匹配模式。 For example, to allow all actions{% if actions-workflow-policy %} and reusable workflows{% endif %} in organizations that start with `space-org`, you can specify `space-org*/*`. To allow all actions{% if actions-workflow-policy %} and reusable workflows{% endif %} in repositories that start with octocat, you can use `*/octocat**@*`. 有关使用 `*` 通配符的更多信息,请参阅“[GitHub Actions 的工作流程语法](/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet)”。
+ 您可以使用 `*` 通配符来匹配模式。 例如,要允许以 `space-org` 开头的组织中的所有操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %},可以指定 `space-org*/*`。 要允许以 octocat 开头的存储库中的所有操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %} ,可以使用 `*/octocat**@*`。 有关使用 `*` 通配符的更多信息,请参阅“[GitHub Actions 的工作流程语法](/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet)”。
{% ifversion fpt or ghec %}
{% note %}
- **Note:** The **Allow specified actions{% if actions-workflow-policy %} and reusable workflows{% endif %}** option is only available in public repositories with the {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, or {% data variables.product.prodname_team %} plan.
+ **注:** **允许指定的操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %}**选项仅可用于具有 {% data variables.product.prodname_free_user %}、{% data variables.product.prodname_pro %}、组织的 {% data variables.product.prodname_free_team %} 或 {% data variables.product.prodname_team %} 计划的公共仓库。
{% endnote %}
{% endif %}
-This procedure demonstrates how to add specific actions{% if actions-workflow-policy %} and reusable workflows{% endif %} to the allow list.
+此过程演示如何将特定操作{% if actions-workflow-policy %} 和可重用工作流程{% endif %} 添加到允许列表中。
diff --git a/translations/zh-CN/data/reusables/actions/autoscaling-parameters.md b/translations/zh-CN/data/reusables/actions/autoscaling-parameters.md
index d9c4342b29..9fece3fc51 100644
--- a/translations/zh-CN/data/reusables/actions/autoscaling-parameters.md
+++ b/translations/zh-CN/data/reusables/actions/autoscaling-parameters.md
@@ -1,3 +1,3 @@
-- Optionally, autoscaling parameters for each pool.
- - Minimum number of idle runners for the pool
- - Active timeout: The number of minutes that a runner should remain active in the pool before the pool is reduced to the idle count
+- (可选)自动缩放每个池的参数。
+ - 池的最小空闲运行器数
+ - 活动超时:在池减少到空闲计数之前,运行器应在池中保持活动状态的分钟数
diff --git a/translations/zh-CN/data/reusables/actions/cache-default-size.md b/translations/zh-CN/data/reusables/actions/cache-default-size.md
new file mode 100644
index 0000000000..c52c4250b9
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/cache-default-size.md
@@ -0,0 +1 @@
+By default, the total cache storage that {% data variables.product.prodname_actions %} uses on the external storage for {% data variables.product.product_location %} is limited to a maximum of 10 GB per repository, and the maximum allowed size that can be set for a repository is 25 GB.
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/cache-eviction-process.md b/translations/zh-CN/data/reusables/actions/cache-eviction-process.md
new file mode 100644
index 0000000000..bd69ed40ab
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/cache-eviction-process.md
@@ -0,0 +1 @@
+If you exceed the limit, {% data variables.product.prodname_dotcom %} will save the new cache but will begin evicting caches until the total size is less than the repository limit.
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/cache-no-org-policy.md b/translations/zh-CN/data/reusables/actions/cache-no-org-policy.md
new file mode 100644
index 0000000000..b1d6e18823
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/cache-no-org-policy.md
@@ -0,0 +1,5 @@
+{% note %}
+
+**Note:** Unlike other {% data variables.product.prodname_actions %} policy settings, there is no organization-level policy for setting the {% data variables.product.prodname_actions %} cache size. The enterprise policy is applied directly to repositories.
+
+{% endnote %}
diff --git a/translations/zh-CN/data/reusables/actions/caching-availability.md b/translations/zh-CN/data/reusables/actions/caching-availability.md
new file mode 100644
index 0000000000..c1b10383b2
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/caching-availability.md
@@ -0,0 +1 @@
+{% data variables.product.prodname_actions %} caching is only available for repositories hosted on {% data variables.product.prodname_dotcom_the_website %} or {% data variables.product.prodname_ghe_server %} 3.5 and later. 更多信息请参阅“缓存依赖项以加快工作流程”。
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/cd-templates-actions.md b/translations/zh-CN/data/reusables/actions/cd-templates-actions.md
index 9ad1e090b0..6a54357858 100644
--- a/translations/zh-CN/data/reusables/actions/cd-templates-actions.md
+++ b/translations/zh-CN/data/reusables/actions/cd-templates-actions.md
@@ -1,3 +1,3 @@
-{% data variables.product.product_name %} offers deployment starter workflows for several popular services, such as Azure Web App. To learn how to get started using a starter workflow, see "[Using starter workflows](/actions/learn-github-actions/using-starter-workflows)" or [browse the full list of deployment starter workflows](https://github.com/actions/starter-workflows/tree/main/deployments). You can also check out our more detailed guides for specific deployment workflows, such as "[Deploying to Azure App Service](/actions/deployment/deploying-to-azure-app-service)."
+{% data variables.product.product_name %} 为几种流行的服务(如 Azure Web App)提供部署入门工作流程。 若要了解如何开始使用入门工作流程,请参阅“[使用入门工作流程](/actions/learn-github-actions/using-starter-workflows)”或[浏览部署入门工作流程的完整列表](https://github.com/actions/starter-workflows/tree/main/deployments)。 还可以查看有关特定部署工作流程的更详细指南,例如“[部署到 Azure App 服务](/actions/deployment/deploying-to-azure-app-service)”。
-Many service providers also offer actions on {% data variables.product.prodname_marketplace %} for deploying to their service. For the full list, see [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?category=deployment&type=actions).
+许多服务提供商还会在 {% data variables.product.prodname_marketplace %} 上提供用于部署其服务的操作。 有关完整列表,请参阅 [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?category=deployment&type=actions)。
diff --git a/translations/zh-CN/data/reusables/actions/comparing-artifacts-caching.md b/translations/zh-CN/data/reusables/actions/comparing-artifacts-caching.md
new file mode 100644
index 0000000000..08d7c6cea7
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/comparing-artifacts-caching.md
@@ -0,0 +1,6 @@
+## 比较构件和依赖项缓存
+
+构件与缓存类似,因为它们能够在 {% data variables.product.prodname_dotcom %} 上存储文件,但每项功能都提供不同的用例,不能互换使用。
+
+- Use caching when you want to reuse files that don't change often between jobs or workflow runs, such as build dependencies from a package management system.
+- Use artifacts when you want to save files produced by a job to view after a workflow run has ended, such as built binaries or build logs.
diff --git a/translations/zh-CN/data/reusables/actions/delete-env-key.md b/translations/zh-CN/data/reusables/actions/delete-env-key.md
index 14dad2237a..ef531ea5f4 100644
--- a/translations/zh-CN/data/reusables/actions/delete-env-key.md
+++ b/translations/zh-CN/data/reusables/actions/delete-env-key.md
@@ -1 +1 @@
-If you configured a deployment environment, change the value of `environment` to be the name of your environment. If you did not configure an environment{% ifversion fpt or ghec %} or if your workflow is in a private repository and you do not use {% data variables.product.prodname_ghe_cloud %}{% endif %}, delete the `environment` key.
+如果配置了部署环境,请将 `environment` 的值更改为环境的名称。 如果未配置环境{% ifversion fpt or ghec %} 或者工作流程位于私有存储库中,并且未使用 {% data variables.product.prodname_ghe_cloud %}{% endif %},则删除 `environment` 键。
diff --git a/translations/zh-CN/data/reusables/actions/enterprise-s3-permission.md b/translations/zh-CN/data/reusables/actions/enterprise-s3-permission.md
index 6cc0fb1dd5..8c609bebdc 100644
--- a/translations/zh-CN/data/reusables/actions/enterprise-s3-permission.md
+++ b/translations/zh-CN/data/reusables/actions/enterprise-s3-permission.md
@@ -7,5 +7,5 @@
* `s3:AbortMultipartUpload`
* `s3:DeleteObject`
* `s3:ListBucket`
-* `kms:GenerateDataKey` (if Key Management Service (KMS) encryption has been enabled)
+* `kms:GenerateDataKey`(如果已启用 Management Service (KMS) 加密)
diff --git a/translations/zh-CN/data/reusables/actions/environment-deployment-event.md b/translations/zh-CN/data/reusables/actions/environment-deployment-event.md
index efba2fe7bc..59bab01594 100644
--- a/translations/zh-CN/data/reusables/actions/environment-deployment-event.md
+++ b/translations/zh-CN/data/reusables/actions/environment-deployment-event.md
@@ -1 +1 @@
-When a workflow job that references an environment runs, it creates a deployment object with the `environment` property set to the name of your environment. As the workflow progresses, it also creates deployment status objects with the `environment` property set to the name of your environment, the `environment_url` property set to the URL for environment (if specified in the workflow), and the `state` property set to the status of the job.
+当引用环境的工作流程作业运行时,它会创建一个部署对象,并将 `environment` 属性设置为环境的名称。 随着工作流程的进行,它还会创建部署状态对象,其中 `environment` 属性设置为环境的名称,`environment_url` 属性设置为环境的 URL(如果在工作流程中指定), `state` 属性设置为作业的状态。
diff --git a/translations/zh-CN/data/reusables/actions/environment-example.md b/translations/zh-CN/data/reusables/actions/environment-example.md
index 21ddd4fa94..fbfb84d876 100644
--- a/translations/zh-CN/data/reusables/actions/environment-example.md
+++ b/translations/zh-CN/data/reusables/actions/environment-example.md
@@ -1,6 +1,6 @@
-You can specify an environment for each job in your workflow. To do so, add a `jobs..environment` key followed by the name of the environment.
+您可以为工作流程中的每个作业指定一个环境。 为此,请添加 `jobs..environment` 键,后跟环境的名称。
-For example, this workflow will use an environment called `production`.
+例如,此工作流程将使用名为 `production` 的环境。
```yaml
name: Deployment
@@ -19,9 +19,9 @@ jobs:
# ...deployment-specific steps
```
-When the above workflow runs, the `deployment` job will be subject to any rules configured for the `production` environment. For example, if the environment requires reviewers, the job will pause until one of the reviewers approves the job.
+运行上述工作流程时,`deployment` 作业将受为 `production` 环境配置的任何规则的约束。 例如,如果环境需要审查者,则作业将暂停,直到其中一个审查者批准该作业。
-You can also specify a URL for the environment. The specified URL will appear on the deployments page for the repository (accessed by clicking **Environments** on the home page of your repository) and in the visualization graph for the workflow run. If a pull request triggered the workflow, the URL is also displayed as a **View deployment** button in the pull request timeline.
+您还可以为环境指定 URL。 指定的 URL 将显示在存储库的部署页面上(通过单击存储库主页上的**环境**访问)以及工作流程运行的可视化图表中。 如果拉取请求触发了工作流程,则该 URL 还会在拉取请求时间线中显示为 **View deployment(查看部署)**按钮。
```yaml
name: Deployment
@@ -42,4 +42,4 @@ jobs:
# ...deployment-specific steps
```
-
+
diff --git a/translations/zh-CN/data/reusables/actions/example-github-runner.md b/translations/zh-CN/data/reusables/actions/example-github-runner.md
index 7cbfe52f67..d8e4bf8a7b 100644
--- a/translations/zh-CN/data/reusables/actions/example-github-runner.md
+++ b/translations/zh-CN/data/reusables/actions/example-github-runner.md
@@ -1,6 +1,6 @@
### 在其他操作系统上运行
-The starter workflow configures jobs to run on Linux, using the {% data variables.product.prodname_dotcom %}-hosted `ubuntu-latest` runners. 您可以更改 `runs-on` 键,让您的作业在其他操作系统上运行。 例如,您可以使用 {% data variables.product.prodname_dotcom %} 托管的 Windows 运行器。
+入门工作流程使用 {% data variables.product.prodname_dotcom %} 托管的 `ubuntu-latest` 运行器将作业配置为在 Linux 上运行。 您可以更改 `runs-on` 键,让您的作业在其他操作系统上运行。 例如,您可以使用 {% data variables.product.prodname_dotcom %} 托管的 Windows 运行器。
{% raw %}
```yaml
diff --git a/translations/zh-CN/data/reusables/actions/jobs/section-using-jobs-in-a-workflow-needs.md b/translations/zh-CN/data/reusables/actions/jobs/section-using-jobs-in-a-workflow-needs.md
index fde865bb22..3b211ad186 100644
--- a/translations/zh-CN/data/reusables/actions/jobs/section-using-jobs-in-a-workflow-needs.md
+++ b/translations/zh-CN/data/reusables/actions/jobs/section-using-jobs-in-a-workflow-needs.md
@@ -31,4 +31,4 @@ jobs:
needs: [job1, job2]
```
-在此示例中,`job3` 使用 `always()` 条件表达式,因此它始终在 `job1` 和 `job2` 完成后运行,不管它们是否成功。 For more information, see "[Expressions](/actions/learn-github-actions/expressions#job-status-check-functions)."
+在此示例中,`job3` 使用 `always()` 条件表达式,因此它始终在 `job1` 和 `job2` 完成后运行,不管它们是否成功。 更多信息请参阅“[表达式](/actions/learn-github-actions/expressions#status-check-functions)”。
diff --git a/translations/zh-CN/data/reusables/actions/message-annotation-explanation.md b/translations/zh-CN/data/reusables/actions/message-annotation-explanation.md
index fab91b5275..82dd7cc637 100644
--- a/translations/zh-CN/data/reusables/actions/message-annotation-explanation.md
+++ b/translations/zh-CN/data/reusables/actions/message-annotation-explanation.md
@@ -1 +1 @@
-This message will create an annotation, which can associate the message with a particular file in your repository. Optionally, your message can specify a position within the file.
+此消息将创建一个注释,该注释可以将该消息与存储库中的特定文件相关联。 (可选)您的消息可以指定文件中的位置。
diff --git a/translations/zh-CN/data/reusables/actions/message-parameters.md b/translations/zh-CN/data/reusables/actions/message-parameters.md
index fd9358b1a0..9e5eee6dd1 100644
--- a/translations/zh-CN/data/reusables/actions/message-parameters.md
+++ b/translations/zh-CN/data/reusables/actions/message-parameters.md
@@ -1 +1 @@
-| Parameter | Value | | :- | :- |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `title` | Custom title |{% endif %} | `file` | Filename | | `col` | Column number, starting at 1 |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `endColumn` | End column number |{% endif %} | `line` | Line number, starting at 1 |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `endLine` | End line number |{% endif %}
+| 参数 | 值 | | :- | :- |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `title` | 自定义标题 |{% endif %} | `file` | 文件名 | | `col` | 列号,从 1 开始 |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `endColumn` | 结束列号 |{% endif %} | `line` | 行号,从 1 开始 |{% ifversion fpt or ghes > 3.2 or ghae-issue-4929 or ghec %} | `endLine` | 结束行号 |{% endif %}
diff --git a/translations/zh-CN/data/reusables/actions/migrating-enterprise.md b/translations/zh-CN/data/reusables/actions/migrating-enterprise.md
index 25ffd37ce8..7824c01d17 100644
--- a/translations/zh-CN/data/reusables/actions/migrating-enterprise.md
+++ b/translations/zh-CN/data/reusables/actions/migrating-enterprise.md
@@ -1 +1 @@
-If you're migrating your enterprise to {% data variables.product.prodname_actions %} from another provider, there are additional considerations. For more information, see "[Migrating your enterprise to {% data variables.product.prodname_actions %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/migrating-your-enterprise-to-github-actions)."
+如果要将企业迁移到来自其他提供商的 {% data variables.product.prodname_actions %},还有其他注意事项。 更多信息请参阅“[将企业迁移到 {% data variables.product.prodname_actions %}](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/migrating-your-enterprise-to-github-actions)”。
diff --git a/translations/zh-CN/data/reusables/actions/minio-gateways-removal.md b/translations/zh-CN/data/reusables/actions/minio-gateways-removal.md
new file mode 100644
index 0000000000..987a58ed6d
--- /dev/null
+++ b/translations/zh-CN/data/reusables/actions/minio-gateways-removal.md
@@ -0,0 +1,5 @@
+{% warning %}
+
+**警告**:MinIO 已宣布删除 MinIO 网关。 从 2022 年 6 月 1 日开始,当前 MinIO NAS 网关实施的支持和错误修复将仅提供给通过其 LTS 支持合同的付费客户。 如果要继续将 MinIO 网关与 {% data variables.product.prodname_actions %} 配合使用,我们建议您迁移到 MinIO LTS 支持。 更多信息请参阅 minio/minio 存储库中[计划删除适用于 GCS、Azure、HDFS 的 MinIO 网关](https://github.com/minio/minio/issues/14331)。
+
+{% endwarning %}
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/oidc-link-to-intro.md b/translations/zh-CN/data/reusables/actions/oidc-link-to-intro.md
index 63333358b3..703fdbcd2f 100644
--- a/translations/zh-CN/data/reusables/actions/oidc-link-to-intro.md
+++ b/translations/zh-CN/data/reusables/actions/oidc-link-to-intro.md
@@ -1 +1 @@
-- To learn the basic concepts of how {% data variables.product.prodname_dotcom %} uses OpenID Connect (OIDC), and its architecture and benefits, see "[About security hardening with OpenID Connect](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)."
+- 要了解 {% data variables.product.prodname_dotcom %} 如何使用 OpenID Connect (OIDC) 的基本概念及其体系结构和优势,请参阅“[关于使用 OpenID Connect 进行安全强化](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect)”。
diff --git a/translations/zh-CN/data/reusables/actions/oidc-permissions-token.md b/translations/zh-CN/data/reusables/actions/oidc-permissions-token.md
index 5bbde1868d..489a8cc478 100644
--- a/translations/zh-CN/data/reusables/actions/oidc-permissions-token.md
+++ b/translations/zh-CN/data/reusables/actions/oidc-permissions-token.md
@@ -5,7 +5,7 @@ The `id-token: write` setting allows the JWT to be requested from {% data variab
- Using environment variables on the runner (`ACTIONS_ID_TOKEN_REQUEST_URL` and `ACTIONS_ID_TOKEN_REQUEST_TOKEN`).
- Using `getIDToken()` from the Actions toolkit.
-If you only need to fetch an OIDC token for a single job, then this permission can be set within that job. 例如:
+如果您只需要为单个作业获取 OIDC 令牌,则可以在该作业中设置此权限。 例如:
```yaml{:copy}
permissions:
diff --git a/translations/zh-CN/data/reusables/actions/oidc-security-notice.md b/translations/zh-CN/data/reusables/actions/oidc-security-notice.md
index 9b3881bf5d..3436d932ff 100644
--- a/translations/zh-CN/data/reusables/actions/oidc-security-notice.md
+++ b/translations/zh-CN/data/reusables/actions/oidc-security-notice.md
@@ -1 +1 @@
-- Before proceeding, you must plan your security strategy to ensure that access tokens are only allocated in a predictable way. To control how your cloud provider issues access tokens, you **must** define at least one condition, so that untrusted repositories can’t request access tokens for your cloud resources. For more information, see "[Configuring the OIDC trust with the cloud](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#configuring-the-oidc-trust-with-the-cloud)."
+- 在继续之前,必须规划安全策略,以确保仅以可预测的方式分配访问令牌。 要控制云提供商颁发访问令牌的方式,**必须**至少定义一个条件,使不受信任的存储库无法为云资源请求访问令牌。 更多信息请参阅“[使用云配置 OIDC 信任](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#configuring-the-oidc-trust-with-the-cloud)”。
diff --git a/translations/zh-CN/data/reusables/actions/oidc-updating-workflow-overview.md b/translations/zh-CN/data/reusables/actions/oidc-updating-workflow-overview.md
index fbbabdca65..8a0bff9319 100644
--- a/translations/zh-CN/data/reusables/actions/oidc-updating-workflow-overview.md
+++ b/translations/zh-CN/data/reusables/actions/oidc-updating-workflow-overview.md
@@ -1,6 +1,6 @@
-To add OIDC integration to your cloud deployment workflows, you will need to add the following code changes:
+要将 OIDC 集成添加到您的云部署工作流程,您需要添加以下代码更改:
-- Grant permission to fetch the token from the {% data variables.product.prodname_dotcom %} OIDC provider:
- - The workflow needs a `permissions` setting with a defined `id-token` value. This lets you fetch the OIDC token from every job in the workflow. If you only need to fetch an OIDC token for a single job, then this permission can be set within that job.
-- Request the JSON Web Token (JWT) from the {% data variables.product.prodname_dotcom %} OIDC provider, and present it to your cloud provider to receive an access token:
- - You could use the Actions toolkit to fetch the tokens in your job, or you can use the official action created by your cloud provider to fetch the JWT and receive the access token from the cloud.
+- 授予从 {% data variables.product.prodname_dotcom %} OIDC 提供商获取令牌的权限:
+ - 工作流程需要定义了 `id-token` 值的 `permissions` 设置。 这使您可以从工作流程中的每个作业中获取 OIDC 令牌。 如果您只需要为单个作业获取 OIDC 令牌,则可以在该作业中设置此权限。
+- 从 {% data variables.product.prodname_dotcom %} OIDC 提供商处请求 JSON Web 令牌 (JWT),并将其提供给您的云提供商以接收访问令牌:
+ - 您可以使用 Actions 工具包来获取作业中的令牌,也可以使用云提供商创建的官方操作来获取 JWT 并从云接收访问令牌。
diff --git a/translations/zh-CN/data/reusables/actions/on-multiple-example.md b/translations/zh-CN/data/reusables/actions/on-multiple-example.md
index 66a7708123..504bfca7fc 100644
--- a/translations/zh-CN/data/reusables/actions/on-multiple-example.md
+++ b/translations/zh-CN/data/reusables/actions/on-multiple-example.md
@@ -1,7 +1,7 @@
-You can specify a single event or multiple events. For example, a workflow with the following `on` value will run when a push is made to any branch in the repository or when someone forks the repository:
+您可以指定单个事件或多个事件。 例如,当向存储库中的任何分支进行推送或有人复刻存储库时,将运行具有以下 `on` 值的工作流程:
```yaml
on: [push, fork]
```
-If you specify multiple events, only one of those events needs to occur to trigger your workflow. If multiple triggering events for your workflow occur at the same time, multiple workflow runs will be triggered.
+如果指定多个事件,则只需发生其中一个事件即可触发工作流程。 如果工作流程的多个触发事件同时发生,则将触发多个工作流程运行。
diff --git a/translations/zh-CN/data/reusables/actions/on-single-example.md b/translations/zh-CN/data/reusables/actions/on-single-example.md
index b8c7046c3e..a7a14ed76d 100644
--- a/translations/zh-CN/data/reusables/actions/on-single-example.md
+++ b/translations/zh-CN/data/reusables/actions/on-single-example.md
@@ -1,4 +1,4 @@
-For example, a workflow with the following `on` value will run when a push is made to any branch in the workflow's repository:
+例如,推送到工作流程存储库中的任何分支时,将运行具有以下 `on` 值的工作流程:
```yaml
on: push
diff --git a/translations/zh-CN/data/reusables/actions/outside-collaborators-internal-actions.md b/translations/zh-CN/data/reusables/actions/outside-collaborators-internal-actions.md
index 9e8e56c217..b7da729f3e 100644
--- a/translations/zh-CN/data/reusables/actions/outside-collaborators-internal-actions.md
+++ b/translations/zh-CN/data/reusables/actions/outside-collaborators-internal-actions.md
@@ -1 +1 @@
-If you make an internal repository in your enterprise accessible to {% data variables.product.prodname_actions %} workflows in other repositories, outside collaborators on the other repositories can indirectly access the internal repository, even though they do not have direct access to the internal repository. The outside collaborators can view logs for workflow runs when actions or workflows from the internal repository are used.
+如果使企业中的内部存储库可供其他存储库中的 {% data variables.product.prodname_actions %} 工作流程访问,则其他存储库上的外部协作者可以间接访问内部存储库,即使他们没有直接访问内部存储库的权限。 外部协作者可以在使用内部存储库中的操作或工作流程时查看工作流程运行的日志。
diff --git a/translations/zh-CN/data/reusables/actions/pass-inputs-to-reusable-workflows.md b/translations/zh-CN/data/reusables/actions/pass-inputs-to-reusable-workflows.md
index ce6074f0c9..98f2a19af9 100644
--- a/translations/zh-CN/data/reusables/actions/pass-inputs-to-reusable-workflows.md
+++ b/translations/zh-CN/data/reusables/actions/pass-inputs-to-reusable-workflows.md
@@ -1,4 +1,4 @@
-To pass named inputs to a called workflow, use the `with` keyword in a job. Use the `secrets` keyword to pass named secrets. For inputs, the data type of the input value must match the type specified in the called workflow (either boolean, number, or string).
+要将具名输入传递给被调用的工作流程,请在作业中使用 `with` 关键字。 使用 `secrets` 关键字传递具名机密。 对于输入,输入值的数据类型必须与被调用工作流程中指定的类型(布尔值、数字或字符串)匹配。
{% raw %}
```yaml
@@ -11,3 +11,19 @@ jobs:
envPAT: ${{ secrets.envPAT }}
```
{% endraw %}
+
+{% if actions-inherit-secrets-reusable-workflows %}
+在同一组织或企业中调用可重用工作流程的工作流程可以使用 `inherit` 关键字来隐式传递机密。
+
+{% raw %}
+```yaml
+jobs:
+ call-workflow-passing-data:
+ uses: octo-org/example-repo/.github/workflows/reusable-workflow.yml@main
+ with:
+ username: mona
+ secrets: inherit
+```
+{% endraw %}
+
+{%endif%}
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/perform-blob-storage-precheck.md b/translations/zh-CN/data/reusables/actions/perform-blob-storage-precheck.md
index a63d79c3b8..c631f94d4e 100644
--- a/translations/zh-CN/data/reusables/actions/perform-blob-storage-precheck.md
+++ b/translations/zh-CN/data/reusables/actions/perform-blob-storage-precheck.md
@@ -1 +1 @@
-1. Run the `ghe-actions-precheck` command to test your blob storage configuration. 更多信息请参阅“[命令行实用程序](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-actions-precheck)”。
+1. 运行 `ghe-actions-precheck` 命令来测试 blob 存储配置。 更多信息请参阅“[命令行实用程序](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-actions-precheck)”。
diff --git a/translations/zh-CN/data/reusables/actions/permissions-statement-environment.md b/translations/zh-CN/data/reusables/actions/permissions-statement-environment.md
index c70c6952c8..610090fa0e 100644
--- a/translations/zh-CN/data/reusables/actions/permissions-statement-environment.md
+++ b/translations/zh-CN/data/reusables/actions/permissions-statement-environment.md
@@ -1 +1 @@
-To configure an environment in a personal account repository, you must be the repository owner. 要在组织仓库中配置环境,您必须具有`管理员`访问权限。
+要在个人帐户仓库中配置环境,您必须是仓库所有者。 要在组织仓库中配置环境,您必须具有`管理员`访问权限。
diff --git a/translations/zh-CN/data/reusables/actions/permissions-statement-secrets-environment.md b/translations/zh-CN/data/reusables/actions/permissions-statement-secrets-environment.md
index 4c54317fa8..8e3313cc79 100644
--- a/translations/zh-CN/data/reusables/actions/permissions-statement-secrets-environment.md
+++ b/translations/zh-CN/data/reusables/actions/permissions-statement-secrets-environment.md
@@ -1 +1 @@
-To create secrets for an environment in a personal account repository, you must be the repository owner. 要为组织仓库中的环境创建密码,您必须具有`管理员`访问权限。
+要为个人帐户仓库中的环境创建密码,您必须是仓库所有者。 要为组织仓库中的环境创建密码,您必须具有`管理员`访问权限。
diff --git a/translations/zh-CN/data/reusables/actions/proxy-considerations.md b/translations/zh-CN/data/reusables/actions/proxy-considerations.md
index 82ac79fcf8..13510010bb 100644
--- a/translations/zh-CN/data/reusables/actions/proxy-considerations.md
+++ b/translations/zh-CN/data/reusables/actions/proxy-considerations.md
@@ -1 +1 @@
-If {% data variables.product.prodname_actions %} is enabled for your enterprise, only HTTP proxies are supported. SOCK5 and HTTPS proxies and Polipo are not supported.
+如果为企业启用了 {% data variables.product.prodname_actions %} ,则仅支持 HTTP 代理。 不支持 SOCK5 和 HTTPS 代理以及 Polipo。
diff --git a/translations/zh-CN/data/reusables/actions/registry-credentials.md b/translations/zh-CN/data/reusables/actions/registry-credentials.md
index eddafb114b..64cb5b4b70 100644
--- a/translations/zh-CN/data/reusables/actions/registry-credentials.md
+++ b/translations/zh-CN/data/reusables/actions/registry-credentials.md
@@ -1 +1 @@
-If the image's container registry requires authentication to pull the image, you can use `jobs..container.credentials` to set a `map` of the `username` and `password`. 凭据与您提供给 [`Docker 登录`](https://docs.docker.com/engine/reference/commandline/login/) 命令的值相同。
+如果映像的容器注册表需要身份验证才能拉取映像,可以使用 `jobs..container.credentials` 设置 `username` 和 `password` 的 `map`。 凭据与您提供给 [`Docker 登录`](https://docs.docker.com/engine/reference/commandline/login/) 命令的值相同。
diff --git a/translations/zh-CN/data/reusables/actions/release-trigger-workflow.md b/translations/zh-CN/data/reusables/actions/release-trigger-workflow.md
index 0fb62ab01b..99d9a3b700 100644
--- a/translations/zh-CN/data/reusables/actions/release-trigger-workflow.md
+++ b/translations/zh-CN/data/reusables/actions/release-trigger-workflow.md
@@ -1 +1 @@
-每次在 {% data variables.product.prodname_dotcom %} 上创建新版本时,都可以触发工作流程来发布映像。 以下示例中的工作流程在活动类型为 `created` 的 `release` 事件触发时运行。 有关 `release` 事件的更多信息,请参阅“[触发工作流程的事件](/actions/reference/events-that-trigger-workflows#release)”。
+每次在 {% data variables.product.product_name %} 上创建新版本时,都可以触发工作流程来发布映像。 以下示例中的工作流程在活动类型为 `created` 的 `release` 事件触发时运行。 有关 `release` 事件的更多信息,请参阅“[触发工作流程的事件](/actions/reference/events-that-trigger-workflows#release)”。
diff --git a/translations/zh-CN/data/reusables/actions/reusable-workflow-artifacts.md b/translations/zh-CN/data/reusables/actions/reusable-workflow-artifacts.md
index 0c435e46ea..1c9dc033e7 100644
--- a/translations/zh-CN/data/reusables/actions/reusable-workflow-artifacts.md
+++ b/translations/zh-CN/data/reusables/actions/reusable-workflow-artifacts.md
@@ -1,3 +1,3 @@
{% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %}
-All actions and workflows called within a run have write access to that run's artifacts.
+在运行中调用的所有操作和工作流程都具有对该运行项目的写入访问权限。
{% endif %}
diff --git a/translations/zh-CN/data/reusables/actions/reusable-workflows.md b/translations/zh-CN/data/reusables/actions/reusable-workflows.md
index 81a4a7dfea..fd870a4754 100644
--- a/translations/zh-CN/data/reusables/actions/reusable-workflows.md
+++ b/translations/zh-CN/data/reusables/actions/reusable-workflows.md
@@ -1,4 +1,4 @@
{% ifversion fpt or ghes > 3.3 or ghae-issue-4757 or ghec %}
-{% ifversion ghes or ghec or ghae %}You can share workflows with your organization, publicly or privately, by calling{% else %} You can call{% endif %} one workflow from within another workflow. This allows you to reuse workflows, avoiding duplication and making your workflows easier to maintain. For more information, see "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
+{% ifversion ghes or ghec or ghae %}您可以公开或私下在一个工作流程中调用{% else %}您可以在一个工作流程中调用{% endif %}另一个工作流程,以与组织分享工作流程。 这使您可以重复使用工作流程,避免重复并使您的工作流程更易于维护。 更多信息请参阅“[重用工作流程](/actions/learn-github-actions/reusing-workflows)”。
{% endif %}
diff --git a/translations/zh-CN/data/reusables/actions/runner-name-description.md b/translations/zh-CN/data/reusables/actions/runner-name-description.md
index c3955e46ec..862531a1a0 100644
--- a/translations/zh-CN/data/reusables/actions/runner-name-description.md
+++ b/translations/zh-CN/data/reusables/actions/runner-name-description.md
@@ -1 +1 @@
-The name of the runner executing the job.
+执行作业的运行器的名称。
diff --git a/translations/zh-CN/data/reusables/actions/runner-tool-cache-description.md b/translations/zh-CN/data/reusables/actions/runner-tool-cache-description.md
index e6761681e8..c467631ec9 100644
--- a/translations/zh-CN/data/reusables/actions/runner-tool-cache-description.md
+++ b/translations/zh-CN/data/reusables/actions/runner-tool-cache-description.md
@@ -1 +1 @@
-包含 {% data variables.product.prodname_dotcom %} 托管运行器预安装工具的目录路径。 For more information, see "[About {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/specifications-for-github-hosted-runners/#supported-software)".
+包含 {% data variables.product.prodname_dotcom %} 托管运行器预安装工具的目录路径。 更多信息请参阅“[关于 {% data variables.product.prodname_dotcom %} 托管的运行器](/actions/reference/specifications-for-github-hosted-runners/#supported-software)”。
diff --git a/translations/zh-CN/data/reusables/actions/self-hosted-runner-security.md b/translations/zh-CN/data/reusables/actions/self-hosted-runner-security.md
index f674d36b96..c0f3eeedff 100644
--- a/translations/zh-CN/data/reusables/actions/self-hosted-runner-security.md
+++ b/translations/zh-CN/data/reusables/actions/self-hosted-runner-security.md
@@ -1,5 +1 @@
建议仅将自托管运行器用于私有仓库。 这是因为,通过创建在工作流程中执行代码的拉取请求,仓库的复刻可能会在您的自托管运行器上运行危险代码。
-
-{%- ifversion fpt or ghec %}
-To help mitigate this risk for public repositories, you can require approvals for workflow runs from first-time contributors. 更多信息请参阅“[批准公共复刻中的工作流程运行](/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks)”。
-{%- endif %}
\ No newline at end of file
diff --git a/translations/zh-CN/data/reusables/actions/supported-github-runners.md b/translations/zh-CN/data/reusables/actions/supported-github-runners.md
index 6382a882d0..812bda443b 100644
--- a/translations/zh-CN/data/reusables/actions/supported-github-runners.md
+++ b/translations/zh-CN/data/reusables/actions/supported-github-runners.md
@@ -30,13 +30,22 @@ Windows Server 2019
|