Merge pull request #10076 from github/repo-sync

repo sync

content/admin/configuration/configuring-your-enterprise/configuring-data-encryption-for-your-enterprise.md

@@ -1,25 +0,0 @@
----
-title: Configuring data encryption for your enterprise
-shortTitle: Configuring data encryption
-intro: 'For encryption at rest, you can provide your own encryption key to encrypt your data under your encryption policies.'
-versions:
-  ghae: '*'
-type: how_to
-topics:
-  - Enterprise
-  - Fundamentals
-  - Security
-redirect_from:
-  - /admin/configuration/configuring-data-encryption-for-your-enterprise
----
-{% note %}
-
-**Note:** Configuring encryption at rest with a customer-managed key is currently in beta and subject to change.
-
-{% endnote %}
-
-## About data encryption
-
-To provide a high level of security, {% data variables.product.product_name %} encrypts your data while at rest in the data centers and while your data is in transit between users' machines and the data centers.
-
-For encryption in transit, {% data variables.product.product_name %} uses Transport Layer Security (TLS). For encryption at rest, {% data variables.product.product_name %} provides a default RSA key.

content/admin/configuration/configuring-your-enterprise/index.md

@@ -18,7 +18,6 @@ children:
   - /initializing-github-ae
   - /accessing-the-management-console
   - /accessing-the-administrative-shell-ssh
-  - /configuring-data-encryption-for-your-enterprise
   - /enabling-and-scheduling-maintenance-mode
   - /configuring-backups-on-your-appliance
   - /site-admin-dashboard

content/admin/index.md

@@ -62,6 +62,7 @@ redirect_from:
   - /insights/installing-and-configuring-github-insights/managing-data-in-github-insights/managing-goals
   - /insights/installing-and-configuring-github-insights/managing-data-in-github-insights/managing-organizations
   - /insights/installing-and-configuring-github-insights/managing-data-in-github-insights/managing-repositories
+  - /admin/configuration/configuring-your-enterprise/configuring-data-encryption-for-your-enterprise
 introLinks:
   overview: '{% ifversion ghes %}/admin/overview/system-overview{% elsif ghae %}/admin/overview/about-github-ae{% endif %}'
 changelog:

content/admin/overview/about-github-ae.md

@@ -23,10 +23,6 @@ topics:
 
 All of your data is stored within the geographic region of your choosing. You can comply with GDPR and global data protection standards by keeping all of your data within your chosen region.
 
-## Encryption on your terms 
-
-All customer data is encrypted at rest. For more information, see "[Configuring data encryption for your enterprise](/admin/configuration/configuring-data-encryption-for-your-enterprise)."
-
 ## Isolated accounts
 
 All developer accounts are fully isolated in {% data variables.product.prodname_ghe_managed %}. You can fully control the accounts through your identity provider, with SAML single sign on as mandatory. SCIM enables you to ensure that employees only have access to the resources they should, as defined in your central identity management system. For more information, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)."