diff --git a/assets/images/help/marketplace/marketplace-add-payment-method-org.png b/assets/images/help/marketplace/marketplace-add-payment-method-org.png deleted file mode 100644 index 4a1339ebaf..0000000000 Binary files a/assets/images/help/marketplace/marketplace-add-payment-method-org.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-add-payment-method-personal.png b/assets/images/help/marketplace/marketplace-add-payment-method-personal.png deleted file mode 100644 index 5755d5b008..0000000000 Binary files a/assets/images/help/marketplace/marketplace-add-payment-method-personal.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-buy-with-github-button.png b/assets/images/help/marketplace/marketplace-buy-with-github-button.png deleted file mode 100644 index d2f38ac7bf..0000000000 Binary files a/assets/images/help/marketplace/marketplace-buy-with-github-button.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-new-plan.png b/assets/images/help/marketplace/marketplace-choose-new-plan.png deleted file mode 100644 index 02c87f10d1..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-new-plan.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-plan.png b/assets/images/help/marketplace/marketplace-choose-plan.png deleted file mode 100644 index bf11cac236..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-plan.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-choose-repo-install-option.png b/assets/images/help/marketplace/marketplace-choose-repo-install-option.png deleted file mode 100644 index dbadc41aa0..0000000000 Binary files a/assets/images/help/marketplace/marketplace-choose-repo-install-option.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png b/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png deleted file mode 100644 index a76b07ff70..0000000000 Binary files a/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png b/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png new file mode 100644 index 0000000000..bba3d27346 Binary files /dev/null and b/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png differ diff --git a/assets/images/help/marketplace/marketplace-confirm-org.png b/assets/images/help/marketplace/marketplace-confirm-org.png index 3dec038701..e7baa9651a 100644 Binary files a/assets/images/help/marketplace/marketplace-confirm-org.png and b/assets/images/help/marketplace/marketplace-confirm-org.png differ diff --git a/assets/images/help/marketplace/marketplace-confirm-personal-account.png b/assets/images/help/marketplace/marketplace-confirm-personal-account.png deleted file mode 100644 index ed85582f6c..0000000000 Binary files a/assets/images/help/marketplace/marketplace-confirm-personal-account.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png b/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png deleted file mode 100644 index 57ede84aa3..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-payment-method-org.png b/assets/images/help/marketplace/marketplace-edit-payment-method-org.png deleted file mode 100644 index 0cc69c6fe4..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-payment-method-org.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png b/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png deleted file mode 100644 index b9a214eaea..0000000000 Binary files a/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-issue-plan-changes.png b/assets/images/help/marketplace/marketplace-issue-plan-changes.png deleted file mode 100644 index c50266bb22..0000000000 Binary files a/assets/images/help/marketplace/marketplace-issue-plan-changes.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-link-global-navigation.png b/assets/images/help/marketplace/marketplace-link-global-navigation.png index d43bf6553b..f19634901f 100644 Binary files a/assets/images/help/marketplace/marketplace-link-global-navigation.png and b/assets/images/help/marketplace/marketplace-link-global-navigation.png differ diff --git a/assets/images/help/marketplace/marketplace-new-quantity.png b/assets/images/help/marketplace/marketplace-new-quantity.png deleted file mode 100644 index c6b3f84738..0000000000 Binary files a/assets/images/help/marketplace/marketplace-new-quantity.png and /dev/null differ diff --git a/assets/images/help/marketplace/marketplace-report-app.png b/assets/images/help/marketplace/marketplace-report-app.png index 25b6c9b0f5..fe5fdb1871 100644 Binary files a/assets/images/help/marketplace/marketplace-report-app.png and b/assets/images/help/marketplace/marketplace-report-app.png differ diff --git a/assets/images/help/marketplace/marketplace-select-repo-field.png b/assets/images/help/marketplace/marketplace-select-repo-field.png deleted file mode 100644 index 2d984d8cda..0000000000 Binary files a/assets/images/help/marketplace/marketplace-select-repo-field.png and /dev/null differ diff --git a/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md b/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md index 7232f8f65d..b100934f84 100644 --- a/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md +++ b/content/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise.md @@ -137,6 +137,8 @@ If you use an external directory or identity provider (IdP) to centralize access - "[AUTOTITLE](/admin/identity-and-access-management/using-ldap-for-enterprise-iam)" - "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam)" +{% data reusables.enterprise.saml-or-ldap %} + 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 "[AUTOTITLE](/admin/identity-and-access-management/managing-iam-for-your-enterprise/allowing-built-in-authentication-for-users-outside-your-provider)." {% ifversion scim-for-ghes %} diff --git a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md index 23aa406ccb..70ba89132b 100644 --- a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md +++ b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/managing-team-memberships-with-identity-provider-groups.md @@ -20,7 +20,7 @@ topics: ## About team management with {% data variables.product.prodname_emus %} -With {% data variables.product.prodname_emus %}, you can manage team and organization membership within your enterprise through your IdP by connecting {% data variables.product.prodname_dotcom %} teams with IdP groups. When you connect a team in one of your enterprise's organizations to an IdP group, changes to membership from the IdP group are reflected in your enterprise automatically, reducing the need for manual updates and custom scripts. +With {% data variables.product.prodname_emus %}, you can manage team and organization membership within your enterprise through your IdP by connecting {% data variables.product.prodname_dotcom %} teams with IdP groups. When you connect a team in one of your enterprise's organizations to an IdP group, changes to membership from the IdP group are reflected in your enterprise automatically, reducing the need for manual updates and custom scripts. When a change to an IdP group or a new team connection results in a {% data variables.enterprise.prodname_managed_user %} joining a team in an organization they were not already a member of, the {% data variables.enterprise.prodname_managed_user %} will automatically be added to the organization. When you disconnect a group from a team, users who became members of the organization via team membership are removed from the organization if they are not assigned membership in the organization by any other means. @@ -44,9 +44,11 @@ You can connect a team in your enterprise to one IdP group. You can assign the s If you are connecting an existing team to an IdP group, you must first remove any members that were added manually. After you connect a team in your enterprise to an IdP group, your IdP administrator must make team membership changes through the identity provider. You cannot manage team membership on {% data variables.product.prodname_dotcom_the_website %}. +If you use Azure AD as your IdP, you can only connect a team to a security group. Nested group memberships and Microsoft 365 groups are not supported. + ## Creating a new team connected to an IdP group -Any member of an organization can create a new team and connect the team to an IdP group. +Any member of an organization can create a new team and connect the team to an IdP group. {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} @@ -73,7 +75,7 @@ Organization owners and team maintainers can manage the existing connection betw {% data reusables.profile.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_settings %} -1. Optionally, under "Identity Provider Group", to the right of the IdP group you want to disconnect, click {% octicon "x" aria-label="X symbol" %}. +1. Optionally, under "Identity Provider Group", to the right of the IdP group you want to disconnect, click {% octicon "x" aria-label="X symbol" %}. ![Unselect a connected IdP group from the GitHub team](/assets/images/enterprise/github-ae/teams/unselect-idp-group.png) 1. To connect an IdP group, under "Identity Provider Group", select the drop-down menu, and click an identity provider group from the list. ![Drop-down menu to choose identity provider group](/assets/images/enterprise/github-ae/teams/choose-an-idp-group.png) @@ -88,5 +90,5 @@ You can review a list of IdP groups, see any teams connected to an IdP group, an ![Screenshot showing "Identity provider" tab in enterprise sidebar](/assets/images/help/enterprises/enterprise-account-identity-provider-tab.png) 2. To see the members and teams connected to an IdP group, click the group's name. ![Screenshot showing list of IdP groups, the group name is highlighted](/assets/images/help/enterprises/select-idp-group.png) -4. To view the teams connected to the IdP group, click **Teams**. +4. To view the teams connected to the IdP group, click **Teams**. ![Screenshot showing the "Teams" button](/assets/images/help/enterprises/idp-groups-team-switcher.png) diff --git a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md index 317d57f1b5..4eb35942fe 100644 --- a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md +++ b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/migrating-from-saml-to-oidc.md @@ -32,13 +32,19 @@ If you're new to {% data variables.product.prodname_emus %} and haven't yet conf 1. Before you begin the migration, sign in to Azure and disable provisioning in the existing {% data variables.product.prodname_emu_idp_application %} application. 1. If you use [Conditional Access (CA) network location policies](https://docs.microsoft.com/en-us/azure/active-directory/conditional-access/location-condition) in Azure AD, and you're currently using an IP allow list with your enterprise account or any of the organizations owned by the enterprise account on {% data variables.product.prodname_dotcom_the_website %}, disable the IP allow lists. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise#managing-allowed-ip-addresses-for-organizations-in-your-enterprise)" and "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization)." -1. Sign into {% data variables.product.prodname_dotcom_the_website %} as the setup user for your enterprise with the username **@SHORT-CODE_admin**. +1. Sign into {% data variables.product.prodname_dotcom_the_website %} as the setup user for your enterprise with the username **@SHORT-CODE_admin**. 1. When prompted to continue to your identity provider, click **Use a recovery code** and sign in using one of your enterprise's recovery codes. + + {% note %} + + **Note:** You must use a recovery code for your enterprise, not your user account. For more information, see "[Downloading your enterprise account's single sign-on recovery codes](/admin/identity-and-access-management/managing-recovery-codes-for-your-enterprise/downloading-your-enterprise-accounts-single-sign-on-recovery-codes)." + + {% endnote %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.security-tab %} -1. At the bottom of the page, next to "Migrate to OpenID Connect single sign-on", click **Configure with Azure**. - {% warning %} +1. At the bottom of the page, next to "Migrate to OpenID Connect single sign-on", click **Configure with Azure**. + {% warning %} **Warning:** The migration can take up to an hour, and it is important that no users are provisioned during the migration. You can confirm if the migration is still in progress by returning to your enterprise's security settings page; if "Require SAML authentication" is still checked, the migration is still in progress. @@ -48,8 +54,8 @@ If you're new to {% data variables.product.prodname_emus %} and haven't yet conf 1. Read both warnings and click to continue. {% data reusables.enterprise-accounts.emu-azure-admin-consent %} 1. In a new tab or window, while signed in as the setup user on {% data variables.product.prodname_dotcom_the_website %}, create a {% data variables.product.pat_v1 %} with the **admin:enterprise** scope and **no expiration** and copy it to your clipboard. For more information about creating a new token, see "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-scim-provisioning-for-enterprise-managed-users#creating-a-personal-access-token)." -1. In the settings for the {% data variables.product.prodname_emu_idp_oidc_application %} application in Azure Portal, under "Tenant URL", type `https://api.github.com/scim/v2/enterprises/YOUR_ENTERPRISE`, replacing YOUR_ENTERPRISE with the name of your enterprise account. - +1. In the settings for the {% data variables.product.prodname_emu_idp_oidc_application %} application in Azure Portal, under "Tenant URL", type `https://api.github.com/scim/v2/enterprises/YOUR_ENTERPRISE`, replacing YOUR_ENTERPRISE with the name of your enterprise account. + For example, if your enterprise account's URL is `https://github.com/enterprises/octo-corp`, the name of the enterprise account is `octo-corp`. 1. Under "Secret token", paste the {% data variables.product.pat_v1 %} with the **admin:enterprise** scope that you created earlier. 1. To test the configuration, click **Test Connection**. diff --git a/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md b/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md index 25245b7e83..da0342142c 100644 --- a/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md +++ b/content/admin/identity-and-access-management/using-ldap-for-enterprise-iam/using-ldap.md @@ -28,6 +28,8 @@ LDAP is a popular application protocol for access and maintenance of directory i If you use an LDAP directory for centralized authentication, you can configure LDAP authentication for the people who use {% data variables.location.product_location %}. +{% data reusables.enterprise.saml-or-ldap %} + {% data reusables.enterprise_user_management.built-in-authentication %} ## Supported LDAP services diff --git a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md index ff2b14033e..ed1e9be2d9 100644 --- a/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md +++ b/content/admin/identity-and-access-management/using-saml-for-enterprise-iam/about-saml-for-enterprise-iam.md @@ -56,6 +56,8 @@ SAML SSO allows people to authenticate and access {% data variables.location.pro SAML is an XML-based standard for authentication and authorization. When you configure SAML for {% data variables.location.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. +{% data reusables.enterprise.saml-or-ldap %} + {% elsif ghae %} {% data reusables.saml.ae-uses-saml-sso %} {% data reusables.saml.ae-enable-saml-sso-during-bootstrapping %} diff --git a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md index c3b262f4de..06f0502d6a 100644 --- a/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md +++ b/content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md @@ -56,7 +56,9 @@ Enterprise owners who create an organization owned by the enterprise account aut ## Inviting an organization to join your enterprise account -Enterprise owners can invite existing organizations to join their enterprise account. If the organization you want to invite is already owned by another enterprise account, you must be an owner of both enterprise accounts, or the previous enterprise must give up ownership of the organization first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)." +Enterprise owners can invite existing organizations to join their enterprise account. + +If the organization you want to invite is already owned by another enterprise account, you must be an owner of both enterprise accounts. If you're not, you can ask an owner of the enterprise account that currently owns the organization to transfer the organization to your enterprise account instead. For more information, see "[Transferring an organization between enterprise accounts](#transferring-an-organization-between-enterprise-accounts)." When you invite an organization to join your enterprise account, at least one owner needs to accept the invitation. Then, you must give a final approval for the transfer. diff --git a/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md b/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md index 8d33c01175..f6ab6eb5ac 100644 --- a/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md +++ b/content/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md @@ -91,7 +91,7 @@ Each time a user sees a mandatory message, an audit log event is created. The ev {% ifversion display-mandatory-message-again %} {% else %} {% note %} -**Note:** If you change the mandatory message for {% data variables.location.product_location %}, users who have already acknowledged the message will not see the new message. +**Note:** If you change the mandatory message for {% data variables.location.product_location %}, users who have already acknowledged the message will not see the new message. {% endnote %} {% endif %} @@ -103,7 +103,7 @@ Each time a user sees a mandatory message, an audit log event is created. The ev ![Add mandatory message button](/assets/images/enterprise/site-admin-settings/add-mandatory-message-button.png) 1. Under "Mandatory message", in the text box, type your message. ![Screenshot of the mandatory message text box](/assets/images/enterprise/site-admin-settings/mandatory-message-text-box.png) -{%- ifversion display-mandatory-message-again %} +{%- ifversion display-mandatory-message-again %} 1. Optionally, select **Show updated message to all users even if they dismissed the previous one**. ![Screenshot of checkbox that when selected pushes mandatory messages to all users](/assets/images/enterprise/site-admin-settings/push-mandatory-message-checkbox.png) {% endif %} @@ -132,12 +132,13 @@ You can also set an announcement banner{% ifversion ghes %} in the administrativ ![Screenshot of the text field to enter announcement](/assets/images/enterprise/site-admin-settings/announcement-text-field.png) 2. Optionally, under "Expires on", select the calendar drop-down menu and click an expiration date. - + {% ifversion ghe-announce-dismiss %} {% note %} **Note:** Announcements must either have an expiration date, be user dismissible, or both. {% endnote %} + {% endif %} ![Screenshot of the calendar drop-down menu to choose expiration date](/assets/images/enterprise/site-admin-settings/expiration-drop-down.png){% ifversion ghe-announce-dismiss %} 3. Optionally, to allow each user to dismiss the announcement, select **User dismissible**. diff --git a/content/apps/using-github-apps/installing-an-app-in-your-organization.md b/content/apps/using-github-apps/installing-an-app-in-your-organization.md index db81c287b1..ef515c51bd 100644 --- a/content/apps/using-github-apps/installing-an-app-in-your-organization.md +++ b/content/apps/using-github-apps/installing-an-app-in-your-organization.md @@ -28,8 +28,7 @@ If you choose a paid plan, you'll pay for your app subscription on your organiza {% data reusables.marketplace.confirm-install-account-org %} {% data reusables.marketplace.add-payment-method-org %} {% data reusables.marketplace.complete-order-begin-installation %} -8. If the app requires access to repositories, decide whether to give the app access to all of your repositories or to certain repositories, then select **All repositories** or **Only select repositories**. - ![Radio buttons with options to install an app on all of your repositories or certain repositories](/assets/images/help/marketplace/marketplace-choose-repo-install-option.png) +1. If the app requires access to repositories, select **All repositories** or **Only select repositories**. {% data reusables.marketplace.select-installation-repos %} {% data reusables.marketplace.review-app-perms-install %} diff --git a/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md b/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md index ab66c84e76..2b71440fdc 100644 --- a/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md +++ b/content/apps/using-github-apps/installing-an-app-in-your-personal-account.md @@ -27,7 +27,6 @@ If you choose a paid plan, you'll pay for your app subscription on your personal {% data reusables.marketplace.add-payment-method-personal %} {% data reusables.marketplace.complete-order-begin-installation %} 8. Decide whether to give the app access to all of your repositories, or to certain repositories, then select **All repositories** or **Only select repositories**. - ![Radio buttons with options to install an app on all of your repositories or certain repositories](/assets/images/help/marketplace/marketplace-choose-repo-install-option.png) {% data reusables.marketplace.select-installation-repos %} {% data reusables.marketplace.review-app-perms-install %} diff --git a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md index b4e2ba6714..85c91f89bd 100644 --- a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md +++ b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md @@ -23,7 +23,7 @@ shortTitle: Advanced Security billing {% ifversion fpt %} -If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license, available with {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}. +If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license, available with {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}. For information about billing for {% data variables.product.prodname_GH_advanced_security %}, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security). @@ -56,7 +56,11 @@ You can determine how many licenses you'll need for {% data variables.product.pr {% endif %} {% ifversion ghec %} -Enterprise account customers on GitHub Enterprise Cloud who pay with a credit card can purchase a GitHub Advanced Security license from their enterprise account settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)." For customers who pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise. +If you use {% data variables.product.prodname_ghe_cloud %} with an enterprise account and pay with a credit card, you can purchase a {% data variables.product.prodname_GH_advanced_security %} license from your enterprise account settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)." + +If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise. + +For other billing-related questions, contact {% data variables.contact.github_support %}. {% endif %} ## About committer numbers for {% data variables.product.prodname_GH_advanced_security %} @@ -88,7 +92,7 @@ As soon as you free up some {% ifversion ghas-billing-UI-update %}licenses{% els You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise]({% ifversion fpt %}/enterprise-cloud@latest/{% endif %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% ifversion fpt or ghes or ghec %} -For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)." +For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)." {% endif %} {% ifversion ghec %} @@ -99,12 +103,12 @@ For more information on managing the number of committers, see "[AUTOTITLE](/bil The following example timeline demonstrates how active committer count for {% data variables.product.prodname_GH_advanced_security %} could change over time in an enterprise. For each month, you will find events, along with the resulting committer count. -| Date | Events during the month | Total committers | -| :- | :- | -: | -| April 15 | A member of your enterprise enables {% data variables.product.prodname_GH_advanced_security %} for repository **X**. Repository **X** has 50 committers over the past 90 days. | **50** | +| Date | Events during the month | Total committers | +| :- | :- | -: | +| April 15 | A member of your enterprise enables {% data variables.product.prodname_GH_advanced_security %} for repository **X**. Repository **X** has 50 committers over the past 90 days. | **50** | | May 1 | Developer **A** leaves the team working on repository **X**. Developer **A**'s contributions continue to count for 90 days. | **50** | **50** | -| August 1 | Developer **A**'s contributions no longer count towards the licenses required, because 90 days have passed. | _50 - 1_
**49** | -| August 15 | A member of your enterprise enables {% data variables.product.prodname_GH_advanced_security %} for a second repository, repository **Y**. In the last 90 days, a total of 20 developers contributed to that repository. Of those 20 developers, 10 also recently worked on repo **X** and do not require additional licenses. | _49 + 10_
**59** | +| August 1 | Developer **A**'s contributions no longer count towards the licenses required, because 90 days have passed. | _50 - 1_
**49** | +| August 15 | A member of your enterprise enables {% data variables.product.prodname_GH_advanced_security %} for a second repository, repository **Y**. In the last 90 days, a total of 20 developers contributed to that repository. Of those 20 developers, 10 also recently worked on repo **X** and do not require additional licenses. | _49 + 10_
**59** | | August 16 | A member of your enterprise disables {% data variables.product.prodname_GH_advanced_security %} for repository **X**. Of the 49 developers who were working on repository **X**, 10 still also work on repository **Y**, which has a total of 20 developers contributing in the last 90 days. | _49 - 29_
**20** | {% note %} diff --git a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md index 447a2066d6..2f6df72cae 100644 --- a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md +++ b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md @@ -32,32 +32,33 @@ Users in India can contact GitHub's Grievance Officer for India [here](https://s ## Reporting an issue or pull request 1. Navigate to the issue or pull request you'd like to report. -2. In the upper-right corner of the issue or pull request, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. +1. In the upper-right corner of the issue or pull request, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. ![Button to report a comment](/assets/images/help/repository/menu-report-issue-or-pr.png) {% data reusables.community.report-content %} ## Reporting a comment 1. Navigate to the comment you'd like to report. -2. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. +1. In the upper-right corner of the comment, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. ![Kebab menu with option to report a comment](/assets/images/help/repository/menu-report-comment.png) {% data reusables.community.report-content %} ## Reporting an app in {% data variables.product.prodname_marketplace %} {% data reusables.marketplace.visit-marketplace %} -2. Browse to the app you'd like to report. -3. In the left sidebar, under the "Developer links" section, click {% octicon "report" aria-label="The report symbol" %} **Report abuse**. - ![Button to report an app in {% data variables.product.prodname_marketplace %}](/assets/images/help/marketplace/marketplace-report-app.png) -4. Complete the contact form to tell {% data variables.contact.contact_support %} about the app's behavior, then click **Send request**. +1. Browse to the app you'd like to report. +1. In the left sidebar, under the "Developer links" section, click **Report abuse**. + + ![Screenshot of the sidebar of a {% data variables.product.prodname_marketplace %} app. A link, labeled "Report abuse", is outlined in dark orange.](/assets/images/help/marketplace/marketplace-report-app.png) +1. Complete the contact form to tell {% data variables.contact.contact_support %} about the app's behavior, then click **Send request**. ## Reporting contact link abuse in the template chooser 1. Navigate to the repository that contains the contact link you'd like to report. -2. Under the repository name, click {% octicon "issue-opened" aria-label="The issues icon" %} **Issues**. -3. In the lower-right corner of the template chooser, click **Report abuse**. +1. Under the repository name, click {% octicon "issue-opened" aria-label="The issues icon" %} **Issues**. +1. In the lower-right corner of the template chooser, click **Report abuse**. ![Link to report an abuse](/assets/images/help/repository/template-chooser-report-abuse.png) -4. Complete the contact form to tell {% data variables.contact.contact_support %} about the contact link's behavior, then click **Send request**. +1. Complete the contact form to tell {% data variables.contact.contact_support %} about the contact link's behavior, then click **Send request**. ## Further reading diff --git a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index 43c2116721..3062057b7a 100644 --- a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -15,6 +15,8 @@ topics: shortTitle: Set collaborator policy --- +{% data reusables.organizations.about-outside-collaborators %} For more information, see "[Adding outside collaborators to repositories in your organization](/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)." + By default, anyone with admin access to a repository can invite outside collaborators to work on the repository. You can choose to restrict the ability to add outside collaborators to organization owners only. {% ifversion ghec %} diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index c44f561ab9..0d1c626df3 100644 --- a/content/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/content/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -19,7 +19,7 @@ permissions: People with admin access to a repository can add an outside collabo ## About outside collaborators -An outside collaborator is a person who is not a member of your organization, but has access to one or more of your organization's repositories. You can choose the level of access to grant for each outside collaborator. {% data reusables.organizations.outside_collaborator_forks %} +{% data reusables.organizations.about-outside-collaborators %} You can choose the level of access to grant for each outside collaborator. {% data reusables.organizations.outside_collaborator_forks %} {% data reusables.organizations.outside-collaborators-use-seats %} diff --git a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository.md index aa2ded745b..dc32dc7918 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository.md @@ -8,8 +8,8 @@ redirect_from: - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/licensing-a-repository versions: fpt: '*' - ghes: '*' ghec: '*' + ghes: '*' topics: - Repositories --- @@ -84,9 +84,13 @@ If your repository is using a license that is listed on the Choose a License web ## Applying a license to a repository with an existing license -The license picker is only available when you create a new project on GitHub. You can manually add a license using the browser. For more information on adding a license to a repository, see "[AUTOTITLE](/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository)." +{% ifversion fpt or ghec %} +The license picker is only available when you create a new project on GitHub. ![Screenshot of license picker on GitHub.com](/assets/images/help/repository/repository-license-picker.png) +{% endif %} + +You can manually add a license using the browser. For more information on adding a license to a repository, see "[AUTOTITLE](/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository)." ## Disclaimer diff --git a/data/reusables/enterprise/saml-or-ldap.md b/data/reusables/enterprise/saml-or-ldap.md new file mode 100644 index 0000000000..b6b76ac1e5 --- /dev/null +++ b/data/reusables/enterprise/saml-or-ldap.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** You can use either SAML or LDAP, but not both. + +{% endnote %} \ No newline at end of file diff --git a/data/reusables/marketplace/add-payment-method-org.md b/data/reusables/marketplace/add-payment-method-org.md index 2333ce3f96..c17e60e543 100644 --- a/data/reusables/marketplace/add-payment-method-org.md +++ b/data/reusables/marketplace/add-payment-method-org.md @@ -1,5 +1,3 @@ 1. If you chose a paid plan, review your payment method. - - To change the existing payment method on file for the organization, click **Edit...**, then complete the form to add a new payment method. After you successfully add a new payment method, you will automatically return to the order page. - ![Link to add a payment method to your organization](/assets/images/help/marketplace/marketplace-edit-payment-method-org.png) + - To change the existing payment method on file for the organization, click **Edit**, then complete the form to add a new payment method. - If there isn't a payment method on file for the organization, click **Add a Payment Method**, then complete the form to add a credit card or PayPal account. - ![Link to add a payment method to your organization](/assets/images/help/marketplace/marketplace-add-payment-method-org.png) diff --git a/data/reusables/marketplace/add-payment-method-personal.md b/data/reusables/marketplace/add-payment-method-personal.md index 06de54b358..981998d4d6 100644 --- a/data/reusables/marketplace/add-payment-method-personal.md +++ b/data/reusables/marketplace/add-payment-method-personal.md @@ -1,5 +1,3 @@ -1. If you chose a paid plan, review your payment method. - - To change the existing payment method on file for your personal account, click **Edit...**, then complete the form to add a new payment method. After you successfully add a new payment method, you will automatically return to the order page. - ![Link to add a payment method to your personal account](/assets/images/help/marketplace/marketplace-edit-payment-method-personal.png) - - If there isn't a payment method on file for your personal account, click **Add a Payment Method**, then complete the form to add a credit card or PayPal account. - ![Link to add a payment method to your personal account](/assets/images/help/marketplace/marketplace-add-payment-method-personal.png) +1. If you chose a paid plan, in the "Payment Method" section, review your payment method. + - To change the existing payment method on file for your personal account, click **Edit**, then complete the form to add a new payment method. + - If there isn't a payment method on file for your personal account, complete the form to add a credit card or PayPal account. diff --git a/data/reusables/marketplace/cancel-app-billing-settings.md b/data/reusables/marketplace/cancel-app-billing-settings.md index 4f3df262f2..0dedde4d94 100644 --- a/data/reusables/marketplace/cancel-app-billing-settings.md +++ b/data/reusables/marketplace/cancel-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you want to cancel, use the **Edit** drop-down and click **Cancel plan**. - ![Cancel link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you want to cancel, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Cancel plan**. diff --git a/data/reusables/marketplace/choose-new-plan.md b/data/reusables/marketplace/choose-new-plan.md index 6871a7dbe5..2682ad5f41 100644 --- a/data/reusables/marketplace/choose-new-plan.md +++ b/data/reusables/marketplace/choose-new-plan.md @@ -1,2 +1 @@ -1. Under "Edit your plan," use the drop-down menu, and click on a new plan. - ![Drop-down menu listing all of the app's available plans](/assets/images/help/marketplace/marketplace-choose-new-plan.png) +1. Under "Edit your plan," select the dropdown menu, then click a new plan. diff --git a/data/reusables/marketplace/choose-new-quantity.md b/data/reusables/marketplace/choose-new-quantity.md index 8384c6b84f..6905ab9c77 100644 --- a/data/reusables/marketplace/choose-new-quantity.md +++ b/data/reusables/marketplace/choose-new-quantity.md @@ -1,2 +1 @@ 1. If you chose a unit plan, type a new quantity. - ![Field to enter a new quantity for a unit plan](/assets/images/help/marketplace/marketplace-new-quantity.png) diff --git a/data/reusables/marketplace/choose-plan.md b/data/reusables/marketplace/choose-plan.md index f5e02aff10..ae3cc3dbce 100644 --- a/data/reusables/marketplace/choose-plan.md +++ b/data/reusables/marketplace/choose-plan.md @@ -1,2 +1 @@ -1. On the app's page, under "Pricing and setup," click on the pricing plan you'd like to use. - ![List of the app's available pricing plans](/assets/images/help/marketplace/marketplace-choose-plan.png) +1. On the app's page, under "Pricing and setup," click the pricing plan you'd like to use. diff --git a/data/reusables/marketplace/complete-order-begin-installation.md b/data/reusables/marketplace/complete-order-begin-installation.md index a1e78a6a20..80c1aa5f4e 100644 --- a/data/reusables/marketplace/complete-order-begin-installation.md +++ b/data/reusables/marketplace/complete-order-begin-installation.md @@ -1,2 +1 @@ 1. Click **Complete order and begin installation**. - ![Complete order and begin installation button](/assets/images/help/marketplace/marketplace-complete-order-begin-installation-button.png) diff --git a/data/reusables/marketplace/confirm-install-account-org.md b/data/reusables/marketplace/confirm-install-account-org.md index 0b260c8b48..47d93cdda4 100644 --- a/data/reusables/marketplace/confirm-install-account-org.md +++ b/data/reusables/marketplace/confirm-install-account-org.md @@ -1,2 +1,9 @@ -1. Under "Billing information," use the Switch billing account drop-down menu, and choose the organization in which you'd like to install the app. - ![Drop-down menu to switch the billing account, and your chosen organization's name and avatar](/assets/images/help/marketplace/marketplace-confirm-org.png) +1. Choose an installation organization for the app. Depending on your organization's terms of service, this process will be slightly different. + + - If you have given {% data variables.product.prodname_dotcom %} permission to collect name and address information for your organization, in the "Billing information" section, select the **Switch billing account** {% octicon "triangle-down" aria-label="The downwards-facing triangle icon" %} dropdown menu, then click the organization in which you'd like to install the app. + + ![Screenshot of the {% data variables.product.prodname_marketplace %} app purchase screen. A collapsed blue dropdown menu labeled "Switch billing account" is outlined in dark orange.](/assets/images/help/marketplace/marketplace-confirm-org.png) + + - Otherwise, under "Review your order," select the **Account** dropdown menu, then click the organization in which you'd like to install the app. + + ![Screenshot of the {% data variables.product.prodname_marketplace %} app purchase screen. A collapsed gray dropdown menu labeled "Account" is outlined in dark orange.](/assets/images/help/marketplace/marketplace-confirm-org-no-org-details.png) diff --git a/data/reusables/marketplace/confirm-install-account-personal.md b/data/reusables/marketplace/confirm-install-account-personal.md index 3f365dd152..13e82a5eec 100644 --- a/data/reusables/marketplace/confirm-install-account-personal.md +++ b/data/reusables/marketplace/confirm-install-account-personal.md @@ -1,2 +1 @@ -1. Under "Billing information," confirm that you're installing the app for your personal account. - ![Your name, your avatar, the text "Personal account," and a drop-down menu to switch the billing account](/assets/images/help/marketplace/marketplace-confirm-personal-account.png) +1. Under "Review your order," in the **Account** dropdown menu, confirm that you're installing the app for your personal account. diff --git a/data/reusables/marketplace/downgrade-app-billing-settings.md b/data/reusables/marketplace/downgrade-app-billing-settings.md index 7aac24b6c0..88c0e0da3a 100644 --- a/data/reusables/marketplace/downgrade-app-billing-settings.md +++ b/data/reusables/marketplace/downgrade-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you'd like to downgrade, use the **Edit** drop-down and click **Change plan** or **Cancel plan**. - ![Edit link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you'd like to downgrade, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Change plan** or **Cancel plan**. diff --git a/data/reusables/marketplace/install-buy.md b/data/reusables/marketplace/install-buy.md index 3fb9a930e9..9596c68b11 100644 --- a/data/reusables/marketplace/install-buy.md +++ b/data/reusables/marketplace/install-buy.md @@ -1,2 +1 @@ 1. Click **Install it for free**, **Buy with {% data variables.product.prodname_dotcom %}**, or **Try free for 14 days**. - ![Buy with {% data variables.product.prodname_dotcom %} button](/assets/images/help/marketplace/marketplace-buy-with-github-button.png) diff --git a/data/reusables/marketplace/issue-plan-changes.md b/data/reusables/marketplace/issue-plan-changes.md index 2dfc03b3ac..bca3334f73 100644 --- a/data/reusables/marketplace/issue-plan-changes.md +++ b/data/reusables/marketplace/issue-plan-changes.md @@ -1,2 +1 @@ 1. Review the information about your new plan and billing information, then click **Issue plan changes**. - ![Summary of your old plan, new plan, and billing information, and Issue plan changes button](/assets/images/help/marketplace/marketplace-issue-plan-changes.png) diff --git a/data/reusables/marketplace/select-installation-repos.md b/data/reusables/marketplace/select-installation-repos.md index a0673d48eb..5991f9d286 100644 --- a/data/reusables/marketplace/select-installation-repos.md +++ b/data/reusables/marketplace/select-installation-repos.md @@ -1,2 +1 @@ 1. If you chose to give the app access to limited repositories instead of all of your repositories, type the name of each repository you'd like to give the app access to, then click on the repository name to select it. - ![Field to select repositories you'd like to give to app access to](/assets/images/help/marketplace/marketplace-select-repo-field.png) diff --git a/data/reusables/marketplace/upgrade-app-billing-settings.md b/data/reusables/marketplace/upgrade-app-billing-settings.md index b6f6b04c03..2a9f337d13 100644 --- a/data/reusables/marketplace/upgrade-app-billing-settings.md +++ b/data/reusables/marketplace/upgrade-app-billing-settings.md @@ -1,2 +1 @@ -1. Next to the app you want to upgrade, use the **Edit** drop-down and click **Change plan**. - ![Edit drop-down in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png) +1. Next to the app you want to upgrade, select the **Edit** {% octicon "triangle-down" aria-label="" %} dropdown menu, then click **Change plan**. diff --git a/data/reusables/marketplace/visit-marketplace.md b/data/reusables/marketplace/visit-marketplace.md index 01acf2f8ce..43812a650c 100644 --- a/data/reusables/marketplace/visit-marketplace.md +++ b/data/reusables/marketplace/visit-marketplace.md @@ -1,2 +1,3 @@ -1. At the top of any page, click **Marketplace**. - ![Marketplace link in the global navigation menu at the top of every page](/assets/images/help/marketplace/marketplace-link-global-navigation.png) +1. In the navigation bar, at the top of any page, click **Marketplace**. + + ![Screenshot of the {% data variables.product.prodname_dotcom %} navigation bar. A link to {% data variables.product.prodname_marketplace %} is outlined in dark orange.](/assets/images/help/marketplace/marketplace-link-global-navigation.png) diff --git a/data/reusables/organizations/about-outside-collaborators.md b/data/reusables/organizations/about-outside-collaborators.md new file mode 100644 index 0000000000..19165c1f28 --- /dev/null +++ b/data/reusables/organizations/about-outside-collaborators.md @@ -0,0 +1 @@ +An outside collaborator is a person who is not a member of your organization, but has access to one or more of your organization's repositories. \ No newline at end of file