Merge branch 'main' into codespaces-universe-megabranch

content/actions/guides.md

@@ -10,9 +10,6 @@ versions:
   ghec: '*'
 learningTracks:
   - getting_started
-  - continuous_integration
-  - continuous_deployment
-  - deploy_to_the_cloud
   - adopting_github_actions_for_your_enterprise_ghec
   - adopting_github_actions_for_your_enterprise_ghes_and_ghae
   - hosting_your_own_runners

content/actions/index.md

@@ -26,14 +26,8 @@ featuredLinks:
     - /actions/learn-github-actions/expressions
     - /actions/learn-github-actions/environment-variables
     - /actions/security-guides/encrypted-secrets
-  videos:
-    - title: 'Inside GitHub: How we use GitHub Actions – Brian Douglas'
-      href: 'https://www.youtube-nocookie.com/embed/MW0V5Q9WJu4'
-    - title: Advanced GitHub Actions – Jennifer Schelkopf
-      href: 'https://www.youtube-nocookie.com/embed/wWOH44Lscoc'
-    - title: GitHub Actions in action – Karan MV
-      href: 'https://www.youtube-nocookie.com/embed/4SWO0Pc76CU'
-  videosHeading: GitHub Universe 2021 videos
+changelog:
+  label: actions
 product_video: 'https://www.youtube-nocookie.com/embed/cP0I9w2coGU'
 redirect_from:
   - /articles/automating-your-workflow-with-github-actions

data/learning-tracks/actions.yml

@@ -9,33 +9,6 @@ getting_started:
     - /actions/learn-github-actions/reusing-workflows
     - /actions/security-guides/security-hardening-for-github-actions
   featured_track: true
-continuous_integration:
-  title: 'Build and test code'
-  description: 'You can create custom continuous integration (CI) workflows right in your repository.'
-  guides:
-    - /actions/automating-builds-and-tests/about-continuous-integration
-    - /actions/automating-builds-and-tests/building-and-testing-powershell
-    - /actions/automating-builds-and-tests/building-and-testing-ruby
-    - /actions/automating-builds-and-tests/building-and-testing-java-with-maven
-    - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-    - /actions/automating-builds-and-tests/building-and-testing-java-with-ant
-    - /actions/automating-builds-and-tests/building-and-testing-swift
-continuous_deployment:
-  title: 'Automate your deployments'
-  description: 'Learn how to automate release publishing for your project with a custom continuous deployment (CD) workflow in {% data variables.product.prodname_actions %}.'
-  guides:
-    - /actions/publishing-packages/about-packaging-with-github-actions
-    - /actions/publishing-packages/publishing-nodejs-packages
-    - /actions/publishing-packages/publishing-java-packages-with-maven
-    - /actions/publishing-packages/publishing-java-packages-with-gradle
-    - /actions/publishing-packages/publishing-docker-images
-deploy_to_the_cloud:
-  title: 'Deploy to the cloud'
-  description: 'Learn how to use {% data variables.product.prodname_actions %} to build an application and deploy it to various cloud-based platforms.'
-  guides:
-    - /actions/deployment/deploying-to-amazon-elastic-container-service
-    - /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.'

translations/zh-CN/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/index.md

@@ -22,6 +22,7 @@ children:
   - /managing-team-memberships-with-identity-provider-groups
   - /about-support-for-your-idps-conditional-access-policy
   - /migrating-from-saml-to-oidc
+  - /migrating-your-enterprise-to-a-new-identity-provider-or-tenant
 ms.openlocfilehash: 0d8cc71db11e7eb094b0771f8e03a690f449e380
 ms.sourcegitcommit: 47bd0e48c7dba1dde49baff60bc1eddc91ab10c5
 ms.translationtype: HT

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

@@ -44,7 +44,7 @@ To configure authentication and user provisioning for {% data variables.product.
 
 {% ifversion ghae %}
 
-1. In Azure AD, add {% data variables.product.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs.
+1. In Azure AD, add the {% data variables.enterprise.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs.
 
 1. In {% data variables.product.prodname_ghe_managed %}, enter the details for your Azure AD tenant.
 

translations/zh-CN/content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md

@@ -35,6 +35,7 @@ If you have multiple GPG keys, you need to tell Git which one to use.
 {% data reusables.gpg.list-keys-with-note %}
 {% data reusables.gpg.copy-gpg-key-id %}
 {% data reusables.gpg.paste-gpg-key-id %}
+{% data reusables.gpg.set-auto-sign %}
 1. If you aren't using the GPG suite, run the following command in the `zsh` shell to add the GPG key to your `.zshrc` file, if it exists, or your `.zprofile` file:
   ```shell
   $ if [ -r ~/.zshrc ]; then echo 'export GPG_TTY=$(tty)' >> ~/.zshrc; \
@@ -73,6 +74,7 @@ If you have multiple GPG keys, you need to tell Git which one to use.
 {% data reusables.gpg.list-keys-with-note %}
 {% data reusables.gpg.copy-gpg-key-id %}
 {% data reusables.gpg.paste-gpg-key-id %}
+{% data reusables.gpg.set-auto-sign %}
 
 {% endwindows %}
 
@@ -95,6 +97,7 @@ If you have multiple GPG keys, you need to tell Git which one to use.
 {% data reusables.gpg.list-keys-with-note %}
 {% data reusables.gpg.copy-gpg-key-id %}
 {% data reusables.gpg.paste-gpg-key-id %}
+{% data reusables.gpg.set-auto-sign %}
 1. To add your GPG key to your `.bashrc` startup file, run the following command:
   ```bash
   $ [ -f ~/.bashrc ] && echo 'export GPG_TTY=$(tty)' >> ~/.bashrc

translations/zh-CN/data/variables/product.yml

@@ -110,9 +110,6 @@ prodname_oauth_apps: 'OAuth Apps'
 prodname_enterprise_api: '{% ifversion ghes %}GitHub Enterprise Server{% elsif ghae %}GitHub AE{% endif %} APIs'
 prodname_unfurls: 'Content Attachments'
 
-# Azure AD
-ae_azure_ad_app_link: 'the [GitHub AE application](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/aad.githubenterpriseserver)'
-
 # GitHub Actions
 ## Use this variable only when referring to GitHub Actions the product. When referring to the thing that someone creates using the product, call it an action (small a). See the terminology page of the Brand Guide for more.
 prodname_actions: 'GitHub Actions'