From 0cf2dc1c6ec76de5926a883ac6d0e089a583213a Mon Sep 17 00:00:00 2001 From: hubwriter Date: Mon, 15 Apr 2024 15:06:55 +0100 Subject: [PATCH 1/2] Use space in callout syntax --- .../style-guide-and-content-model/style-guide.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/contributing/style-guide-and-content-model/style-guide.md b/content/contributing/style-guide-and-content-model/style-guide.md index 0534fddf9e..907d4cdcd5 100644 --- a/content/contributing/style-guide-and-content-model/style-guide.md +++ b/content/contributing/style-guide-and-content-model/style-guide.md @@ -55,7 +55,7 @@ Recommendations, best practices or product hints. Tips contain non-essential inf For example, "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile)" uses a tip callout to help users understand what to expect when they @mention an organization. ->[!TIP] When you @mention an organization, only those that you're a member of will autocomplete. You can still @mention organizations that you're not a member of, like a previous employer, but the organization name won't autocomplete for you. +> [!TIP] When you @mention an organization, only those that you're a member of will autocomplete. You can still @mention organizations that you're not a member of, like a previous employer, but the organization name won't autocomplete for you. #### Note @@ -67,7 +67,7 @@ Notes are particularly useful for communicating parenthetical information that i For example, "[AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning#reviewing-github-token-metadata)" uses a note to inform users that metadata for {% data variables.product.prodname_dotcom %} tokens is currently in beta. ->[!NOTE] Metadata for {% data variables.product.prodname_dotcom %} tokens is currently in public beta and subject to change. +> [!NOTE] Metadata for {% data variables.product.prodname_dotcom %} tokens is currently in public beta and subject to change. #### Warning @@ -77,7 +77,7 @@ Warning callouts are particularly relevant for processes that occur outside the For example, "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities)" includes instructions for the command line, and uses a warning callout to alert users that once issued, certificates cannot be revoked: ->[!WARNING] After a certificate has been signed and issued, the certificate cannot be revoked. Make sure to use the -V flag to configure a lifetime for the certificate, or the certificate can be used indefinitely. +> [!WARNING] After a certificate has been signed and issued, the certificate cannot be revoked. Make sure to use the -V flag to configure a lifetime for the certificate, or the certificate can be used indefinitely. #### Danger @@ -94,25 +94,25 @@ Callouts are rendered using Markdown. Tip: ```markdown ->[!TIP] Here's a suggestion. +> [!TIP] Here's a suggestion. ``` Note: ```markdown ->[!NOTE] Keep this in mind. +> [!NOTE] Keep this in mind. ``` Warning: ```markdown ->[!WARNING] Be careful. +> [!WARNING] Be careful. ``` Danger: ```markdown ->[!DANGER] Be extremely careful. +> [!DANGER] Be extremely careful. ``` Liquid syntax for callouts is still supported and may still appear in older articles, but should not be used for new callouts. From 2801490fd09ade566851da24bb5abba478320ac4 Mon Sep 17 00:00:00 2001 From: Laura Coursen Date: Mon, 15 Apr 2024 09:07:55 -0500 Subject: [PATCH 2/2] Enterprise bug fixes for the week of April 8, 2024 (#50125) --- .../configuring-scim-provisioning-with-okta.md | 3 +++ ...am-synchronization-for-organizations-in-your-enterprise.md | 2 ++ .../migrating-to-internal-repositories.md | 2 +- content/admin/overview/about-github-enterprise-cloud.md | 4 ++-- .../managing-team-synchronization-for-your-organization.md | 2 ++ data/reusables/saml/okta-enable-api-integration.md | 2 ++ data/reusables/saml/team-sync-pending-invites.md | 1 + data/reusables/scim/import-groups-unsupported.md | 1 + data/reusables/support/scope-of-support.md | 3 ++- 9 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 data/reusables/saml/team-sync-pending-invites.md create mode 100644 data/reusables/scim/import-groups-unsupported.md diff --git a/content/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/configuring-scim-provisioning-with-okta.md b/content/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/configuring-scim-provisioning-with-okta.md index e482935db1..ae6b2783bf 100644 --- a/content/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/configuring-scim-provisioning-with-okta.md +++ b/content/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/configuring-scim-provisioning-with-okta.md @@ -83,6 +83,9 @@ To configure provisioning, the setup user with the **@SHORT-CODE_admin* 1. To make changes, click **Edit**. 1. Select **Enable API integration**. 1. In the "API Token" field, enter the {% data variables.product.pat_v1 %} with the **admin:enterprise** scope belonging to the setup user. + + {% data reusables.scim.import-groups-unsupported %} + 1. Click **Test API Credentials**. If the test is successful, a verification message will appear at the top of the screen. 1. To save the token, click **Save**. 1. In the settings menu, click **To App**. diff --git a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md index 3e3d43bcbd..2de8d66b20 100644 --- a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md +++ b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/managing-team-synchronization-for-organizations-in-your-enterprise.md @@ -62,6 +62,8 @@ You can also configure and manage team synchronization for an individual organiz ## Managing whether team synchronization can re-invite non-members to organizations +{% data reusables.saml.team-sync-pending-invites %} + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.security-tab %} diff --git a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md index 9f0335bfa4..292492c729 100644 --- a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md +++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/migrating-to-internal-repositories.md @@ -8,7 +8,7 @@ redirect_from: - /admin/user-management/managing-repositories-in-your-enterprise//migrating-to-internal-repositories permissions: Site administrators can migrate to internal repositories. versions: - ghes: '*' + ghes: '<3.10' type: how_to topics: - Enterprise diff --git a/content/admin/overview/about-github-enterprise-cloud.md b/content/admin/overview/about-github-enterprise-cloud.md index 0075c228cb..dccdf243fc 100644 --- a/content/admin/overview/about-github-enterprise-cloud.md +++ b/content/admin/overview/about-github-enterprise-cloud.md @@ -17,7 +17,7 @@ One of the main differences between {% data variables.product.product_name %} an {% data reusables.enterprise.ghe-includes-ghec-and-ghes %} For more information about {% data variables.product.prodname_ghe_server %} and how it differs from {% data variables.product.prodname_ghe_cloud %}, see "[AUTOTITLE](/admin/overview/about-github-for-enterprises#about-deployment-options)." -## About identity and access management +## About enterprise types Before you start using {% data variables.product.product_name %}, you must decide whether you want to allow your developers to create and manage their own personal accounts, or whether you want to use {% data variables.product.prodname_emus %}, which allows you to create and manage the user accounts for your developers through your IdP. @@ -25,7 +25,7 @@ If you choose {% data variables.product.prodname_emus %}, all user accounts must If you choose not to use {% data variables.product.prodname_emus %}, your developers will create their own personal accounts on {% data variables.product.prodname_dotcom_the_website %}, but you can optionally require SAML authentication before those personal accounts can access your enterprise's resources. -To help you decide which choice is best for your enterprise, see "[AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise)." +To help you decide which choice is best for your enterprise, see "[AUTOTITLE](/admin/identity-and-access-management/understanding-iam-for-enterprises/choosing-an-enterprise-type-for-github-enterprise-cloud)." ## About documentation diff --git a/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md index 4d9c40e825..eb1fa47e7d 100644 --- a/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md @@ -98,6 +98,8 @@ For help on provisioning users that have missing a missing SCIM linked identity, ## Managing whether team sync can re-invite non-members to your organization +{% data reusables.saml.team-sync-pending-invites %} + {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.security %} diff --git a/data/reusables/saml/okta-enable-api-integration.md b/data/reusables/saml/okta-enable-api-integration.md index f11080d9fa..9a8b622eb5 100644 --- a/data/reusables/saml/okta-enable-api-integration.md +++ b/data/reusables/saml/okta-enable-api-integration.md @@ -1 +1,3 @@ 1. Select **Enable API integration**. + + {% data reusables.scim.import-groups-unsupported %} diff --git a/data/reusables/saml/team-sync-pending-invites.md b/data/reusables/saml/team-sync-pending-invites.md new file mode 100644 index 0000000000..43f42840bb --- /dev/null +++ b/data/reusables/saml/team-sync-pending-invites.md @@ -0,0 +1 @@ +Changes to this setting do **not** impact pending invitations. Any invitation generated while team sync was allowed to re-invite past members to the organization can result in the member being re-added to the organization, even if re-invitation has since been disallowed. diff --git a/data/reusables/scim/import-groups-unsupported.md b/data/reusables/scim/import-groups-unsupported.md new file mode 100644 index 0000000000..c2972c6a16 --- /dev/null +++ b/data/reusables/scim/import-groups-unsupported.md @@ -0,0 +1 @@ +>[!NOTE] "Import Groups" is **not** supported by {% data variables.product.prodname_dotcom %}. Selecting or deselecting the checkbox has no impact on your configuration. diff --git a/data/reusables/support/scope-of-support.md b/data/reusables/support/scope-of-support.md index 98e483e936..72822da419 100644 --- a/data/reusables/support/scope-of-support.md +++ b/data/reusables/support/scope-of-support.md @@ -1,6 +1,7 @@ If your support request is outside of the scope of what our team can help you with, we may recommend next steps to resolve your issue outside of {% data variables.contact.github_support %}. Your support request is possibly out of {% data variables.contact.github_support %}'s scope if the request is primarily about: -- Third party integrations, such as Jira{% ifversion ghes %} +- Third party integrations, such as Jira +- Enterprise Cloud Importer (available only with expert-led migrations){% ifversion ghes %} - Hardware setup{% endif %} - CI/CD, such as Jenkins - Writing scripts