Merge pull request #14249 from github/repo-sync

repo sync
github · Jan 18, 2022 · 2dbfa4b · 2dbfa4b
2 parents 25a2f0f + e6f214f
commit 2dbfa4b
Show file tree

Hide file tree

Showing 361 changed files with 10,599 additions and 8,516 deletions.
diff --git a/assets/images/help/enterprises/emu-login-submit.png b/assets/images/help/enterprises/emu-login-submit.png
diff --git a/assets/images/help/enterprises/emu-login-username.png b/assets/images/help/enterprises/emu-login-username.png
diff --git a/assets/images/help/enterprises/idp-groups-team-switcher.png b/assets/images/help/enterprises/idp-groups-team-switcher.png
diff --git a/assets/images/help/enterprises/select-idp-group.png b/assets/images/help/enterprises/select-idp-group.png
diff --git a/assets/images/help/enterprises/view-suspended-members.png b/assets/images/help/enterprises/view-suspended-members.png
diff --git a/...ging-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/...ging-your-github-profile/customizing-your-profile/personalizing-your-profile.md
@@ -25,11 +25,14 @@ Your profile picture helps identify you across {% data variables.product.product
 
 When you sign up for an account, {% data variables.product.product_name %} provides you with a randomly generated "identicon". [Your identicon](https://github.com/blog/1586-identicons) generates from a hash of your user ID, so there's no way to control its color or pattern. You can replace your identicon with an image that represents you.
 
-{% tip %}
+{% note %}
+
+**Note{% ifversion ghec %}s{% endif %}**: {% ifversion ghec %}
 
-**Tip**: Your profile picture should be a PNG, JPG, or GIF file under 1 MB in size. For the best quality rendering, we recommend keeping the image at about 500 by 500 pixels.
+* {% endif %}Your profile picture should be a PNG, JPG, or GIF file under 1 MB in size. For the best quality rendering, we recommend keeping the image at about 500 by 500 pixels.
+{% ifversion ghec %}* Gravatar profile pictures are not supported with {% data variables.product.prodname_emus %}.{% endif %}
 
-{% endtip %}
+{% endnote %}
 
 ### Setting a profile picture
 

diff --git a/...b-user-account/managing-user-account-settings/merging-multiple-user-accounts.md b/...b-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
@@ -16,7 +16,15 @@ shortTitle: Merge multiple user accounts
 ---
 {% tip %}
 
-**Tip:** We recommend using only one user account to manage both personal and professional repositories.
+{% ifversion ghec %}
+
+**Tip:** {% data variables.product.prodname_emus %} allow an enterprise to provision unique user accounts for its members through an identity provider (IdP). For more information, see "[About Enterprise Managed Users](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/about-enterprise-managed-users)." For other use cases, we recommend using only one user account to manage both personal and professional repositories.
+
+{% else %}
+
+**Tip:** We recommend using only one user account to manage both personal and professional repositories. 
+
+{% endif %}
 
 {% endtip %}
 

diff --git a/...n/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md b/...n/authenticating-users-for-your-github-enterprise-server-instance/using-saml.md
diff --git a/content/admin/authentication/index.md b/content/admin/authentication/index.md
diff --git a/.../admin/authentication/managing-identity-and-access-for-your-enterprise/index.md b/.../admin/authentication/managing-identity-and-access-for-your-enterprise/index.md
diff --git a/...r-users-outside-your-identity-provider.md → ...r-users-outside-your-identity-provider.md b/...r-users-outside-your-identity-provider.md → ...r-users-outside-your-identity-provider.md
@@ -5,6 +5,7 @@ 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
   - /admin/authentication/allowing-built-in-authentication-for-users-outside-your-identity-provider
+  - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/allowing-built-in-authentication-for-users-outside-your-identity-provider
 versions:
   ghes: '*'
 type: how_to

diff --git a/...stance/changing-authentication-methods.md → ...stance/changing-authentication-methods.md b/...stance/changing-authentication-methods.md → ...stance/changing-authentication-methods.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/user-management/changing-authentication-methods
   - /enterprise/admin/authentication/changing-authentication-methods
   - /admin/authentication/changing-authentication-methods
+  - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/changing-authentication-methods
 versions:
   ghes: '*'
 type: overview

diff --git a/...nce/disabling-unauthenticated-sign-ups.md → ...nce/disabling-unauthenticated-sign-ups.md b/...nce/disabling-unauthenticated-sign-ups.md → ...nce/disabling-unauthenticated-sign-ups.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/user-management/disabling-unauthenticated-sign-ups
   - /enterprise/admin/authentication/disabling-unauthenticated-sign-ups
   - /admin/authentication/disabling-unauthenticated-sign-ups
+  - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/disabling-unauthenticated-sign-ups
 intro: 'If you''re using built-in authentication, you can block unauthenticated people from being able to create an account.'
 versions:
   ghes: '*'

diff --git a/...ithub-enterprise-server-instance/index.md → ...ithub-enterprise-server-instance/index.md b/...ithub-enterprise-server-instance/index.md → ...ithub-enterprise-server-instance/index.md
diff --git a/...instance/using-built-in-authentication.md → ...instance/using-built-in-authentication.md b/...instance/using-built-in-authentication.md → ...instance/using-built-in-authentication.md
@@ -5,6 +5,7 @@ redirect_from:
   - /enterprise/admin/user-management/using-built-in-authentication
   - /enterprise/admin/authentication/using-built-in-authentication
   - /admin/authentication/using-built-in-authentication
+  - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-built-in-authentication
 versions:
   ghes: '*'
 type: how_to

diff --git a/...b-enterprise-server-instance/using-cas.md → ...b-enterprise-server-instance/using-cas.md b/...b-enterprise-server-instance/using-cas.md → ...b-enterprise-server-instance/using-cas.md
@@ -6,6 +6,7 @@ redirect_from:
   - /enterprise/admin/user-management/using-cas
   - /enterprise/admin/authentication/using-cas
   - /admin/authentication/using-cas
+  - /enterprise/admin/authentication/authenticating-users-for-your-github-enterprise-server-instance/using-cas
 intro: 'CAS is a single sign-on (SSO) protocol for multiple web applications. A CAS user account does not take up a {% ifversion ghes %}user license{% else %}seat{% endif %} until the user signs in.'
 versions:
   ghes: '*'