Committer-based billing M2 (phase 2)-specific work (#17730)

felicitymay · web-flow · commit 5404eb1f66db · 2021-02-17T15:50:14.000Z
diff --git a/assets/images/help/enterprises/ghas-orgs-list-click-org.png b/assets/images/help/enterprises/ghas-orgs-list-click-org.png
diff --git a/assets/images/help/enterprises/ghas-orgs-list.png b/assets/images/help/enterprises/ghas-orgs-list.png
diff --git a/assets/images/help/organizations/ghas-repos-list.png b/assets/images/help/organizations/ghas-repos-list.png
diff --git a/assets/images/help/repository/enable-ghas-confirmation-dotcom.png b/assets/images/help/repository/enable-ghas-confirmation-dotcom.png
diff --git a/content/github/administering-a-repository/configuring-secret-scanning-for-your-repositories.md b/content/github/administering-a-repository/configuring-secret-scanning-for-your-repositories.md
@@ -28,7 +28,7 @@ versions:
 {% data reusables.repositories.navigate-to-security-and-analysis %}
 
 {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
-4. If "{% data variables.product.prodname_secret_scanning_caps %}" is not shown on the page, you need to enable {% data variables.product.prodname_GH_advanced_security %} first. To the right of "{% data variables.product.prodname_GH_advanced_security %}", click **Enable**.
+4. You may need to enable {% data variables.product.prodname_GH_advanced_security %} to activate the button for "{% data variables.product.prodname_secret_scanning_caps %}". To the right of "{% data variables.product.prodname_GH_advanced_security %}", click **Enable**.
    ![Enable {% data variables.product.prodname_GH_advanced_security %} for your repository](/assets/images/help/repository/enable-ghas-dotcom.png)
 5. Click **Enable {% data variables.product.prodname_GH_advanced_security %} for this repository** to confirm the action.
    ![Confirm enabling {% data variables.product.prodname_GH_advanced_security %} for your repository](/assets/images/help/repository/enable-ghas-confirmation-dotcom.png)
diff --git a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md
@@ -33,7 +33,7 @@ You can manage the security and analysis features for your {% if currentVersion
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.repositories.navigate-to-security-and-analysis %}
-4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**. {% if currentVersion == "free-pro-team@latest"  or currentVersion ver_gt "enterprise-server@3.0" %}If "{% data variables.product.prodname_secret_scanning_caps %}" is not displayed, you may need to enable {% data variables.product.prodname_GH_advanced_security %} first.
+4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If the control for "{% data variables.product.prodname_secret_scanning_caps %}" is not active, you need to enable {% data variables.product.prodname_GH_advanced_security %} first.
   !["Enable" or "Disable" button for "Configure security and analysis" features](/assets/images/help/repository/security-and-analysis-disable-or-enable-dotcom-private.png)
   {% note %}
 
diff --git a/content/github/getting-started-with-github/about-github-advanced-security.md b/content/github/getting-started-with-github/about-github-advanced-security.md
@@ -26,6 +26,16 @@ A {% data variables.product.prodname_GH_advanced_security %} license provides th
 
 For information about {% data variables.product.prodname_advanced_security %} features that are in development, see "[{% data variables.product.prodname_dotcom %} public roadmap](https://github.com/github/roadmap)."
 
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
+
+### About {% data variables.product.prodname_advanced_security %} licensing
+
+{% data reusables.advanced-security.license-overview %}
+
+{% data reusables.advanced-security.enable-disable-committer-info %}
+
+{% endif %}
+
 {% if currentVersion ver_gt "enterprise-server@2.22" %}
 ### Enabling {% data variables.product.prodname_advanced_security %} features on {% data variables.product.prodname_ghe_server %}
 
@@ -40,7 +50,13 @@ For information about purchasing a license for {% data variables.product.prodnam
 
 For public repositories on {% data variables.product.prodname_dotcom_the_website %}, these features are permanently on and are only disabled if you change the visibility of the project so that the code is no longer public.
 
-For all other repositories, once you have a license, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."
+For other repositories, once you have a license for your organization or enterprise, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."
+
+{% if currentVersion == "free-pro-team@latest" %}
+
+If you have an enterprise account, license use for the enterprise is shown on your billing page. For more information, see "[Managing use of Advanced Security for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account)."
+
+{% endif %}
 
 For information about purchasing a license for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}.
 {% endif %}
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md
@@ -25,13 +25,9 @@ versions:
 
 The page that's displayed allows you to enable or disable all security and analysis features for the repositories in your organization.
 
-{% if currentVersion == "free-pro-team@latest" %}If your organization, or the enterprise that owns it, has a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features.{% endif %}
+{% if currentVersion == "free-pro-team@latest" %}If your organization, or the enterprise that owns it, has a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %}
 
-{% if currentVersion ver_gt "enterprise-server@3.0" %}If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features.{% endif %}
-
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
-![{% data variables.product.prodname_GH_advanced_security %} features](/assets/images/help/organizations/security-and-analysis-highlight-ghas.png)
-{% endif %}
+{% if currentVersion ver_gt "enterprise-server@3.0" %}If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the page will also contain options to enable and disable {% data variables.product.prodname_advanced_security %} features. Any repositories that use {% data variables.product.prodname_GH_advanced_security %} are listed at the bottom of the page.{% endif %}
 
 ### Enabling or disabling a feature for all existing repositories
 
@@ -96,6 +92,27 @@ By default, {% data variables.product.prodname_dependabot %} can't update depend
 1. Click **Select repositories**.
 {% endif %}
 
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
+
+### Removing access to {% data variables.product.prodname_GH_advanced_security %} from individual repositories in an organization
+
+You can manage the use of {% data variables.product.prodname_GH_advanced_security %} for a repository using the "Security & analysis" page, on the "Settings" tab. You can also disable the use of {% data variables.product.prodname_GH_advanced_security %} for any repository in an organization from the "Security & analysis" page of the organization.
+
+1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)."
+1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section.
+  ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/ghas-repos-list.png)
+  The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}.
+1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository, click the adjacent {% octicon "x" aria-label="X symbol" %}.
+1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}.
+
+{% note %}
+
+**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. Otherwise they may assume that the change was a mistake and re-enable access.
+
+{% endnote %}
+
+{% endif %}
+
 ### Further reading
 
 - "[About securing your repository](/github/administering-a-repository/about-securing-your-repository)"
diff --git a/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md b/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
@@ -16,7 +16,7 @@ versions:
 An enterprise account allows you to manage multiple {% data variables.product.prodname_dotcom %} organizations and {% data variables.product.prodname_ghe_server %} instances. Your enterprise account must have a handle, like an organization or personal account on {% data variables.product.prodname_dotcom %}. Enterprise administrators can manage settings and preferences, like:
 
 - Member access and management (organization members, outside collaborators)
-- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs)
+- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs{% if currentVersion == "free-pro-team@latest" or ver_gt "enterprise-server@3.0" %}, {% data variables.product.prodname_GH_advanced_security %} usage{% endif %})
 - Security (single sign-on, two factor authentication)
 - Requests and support bundle sharing with {% data variables.contact.enterprise_support %}
 
diff --git a/content/github/setting-up-and-managing-your-enterprise/index.md b/content/github/setting-up-and-managing-your-enterprise/index.md
@@ -29,6 +29,7 @@ versions:
     {% link_in_list /managing-unowned-organizations-in-your-enterprise-account %}
     {% link_in_list /viewing-the-audit-logs-for-organizations-in-your-enterprise-account %}
     {% link_in_list /configuring-webhooks-for-organization-events-in-your-enterprise-account %}
+    {% link_in_list /managing-use-of-advanced-security-for-organizations-in-your-enterprise-account %}
 {% topic_link_in_list /configuring-identity-and-access-management-for-your-enterprise-account %}
     {% link_in_list /about-identity-and-access-management-for-your-enterprise-account %}
     {% link_in_list /enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account %}
diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account.md
@@ -0,0 +1,42 @@
+---
+title: Managing use of Advanced Security for organizations in your enterprise account
+intro: 'You can review and manage the use of {% data variables.product.prodname_GH_advanced_security %} for organizations owned by an enterprise account.'
+shortTitle: Managing use of Advanced Security
+product: '{% data reusables.gated-features.enterprise-accounts %}'
+permissions: Enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for organizations and repositories in an enterprise account.
+versions:
+  free-pro-team: '*'
+---
+
+### About {% data variables.product.prodname_GH_advanced_security %} for enterprise accounts
+
+{% data variables.product.prodname_dotcom %} makes additional security features available to private repositories owned by enterprise accounts with a license for {% data variables.product.prodname_GH_advanced_security %}. {% data reusables.advanced-security.more-info-ghas %}
+
+{% data reusables.advanced-security.license-overview %}
+
+You can see a summary of your current license usage for each organization on the billing page for the enterprise account (see below).
+
+### About committer numbers for enterprise accounts
+
+The {% data variables.product.prodname_GH_advanced_security %} summary for an enterprise account reports two numbers of committers for each organization:
+
+- **Committers** is the number of committers who contributed to at least one private repository in the organization and who use a seat in your enterprise license. That is, they are an organization member, external collaborator to a repository, or have a pending invitation to join your enterprise account.
+- **Unique to this organization** is the number of committers who contributed only to repositories in that organization. This number shows how many license seats you can free up by disabling {% data variables.product.prodname_GH_advanced_security %} for that organization.
+
+{% data reusables.advanced-security.enable-disable-committer-info %}
+
+### Managing the use of {% data variables.product.prodname_GH_advanced_security %} for an enterprise account
+
+If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the enterprise billing page includes a "{% data variables.product.prodname_GH_advanced_security %}" section that lists the organizations that use the feature.
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.billing-tab %}
+1. In the "{% data variables.product.prodname_GH_advanced_security %}" section you can see the number of committers and unique committers for each organization.
+  ![{% data variables.product.prodname_GH_advanced_security %} in enterprise billing settings](/assets/images/help/enterprises/ghas-orgs-list.png)
+1. If you are an organization owner, you can click the name to display the billings and plans for the organization.
+  ![Owned organization in {% data variables.product.prodname_GH_advanced_security %} section of enterprise billing settings](/assets/images/help/enterprises/ghas-orgs-list-click-org.png)
+
+For detailed information of which repositories in an organization use {% data variables.product.prodname_GH_advanced_security %}, view the "Security & analysis" page for an organization.
+
+For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)."
diff --git a/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md
@@ -13,7 +13,7 @@ versions:
 
 ### About billing for enterprise accounts
 
-Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account are aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs, and subscriptions for {% data variables.product.prodname_marketplace %} apps).
+Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account are aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs,{% if currentVersion == "free-pro-team@latest" or ver_gt "enterprise-server@3.0" %} {% data variables.product.prodname_GH_advanced_security %} usage,{% endif %} and subscriptions for {% data variables.product.prodname_marketplace %} apps).
 
 {% if currentVersion == "free-pro-team@latest" %}{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."{% endif %}
 
@@ -29,3 +29,14 @@ For more information about managing billing managers, see "[Inviting people to m
   ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprise-server/enterprise-server-billing-license-info.png){% endif %}
 1. Optionally, to view details for license usage or download a {% if currentVersion == "free-pro-team@latest" %}CSV{% elsif enterpriseServerVersions contains currentVersion %}JSON{% endif %} file with license details{% if currentVersion == "free-pro-team@latest" %}, to the right of "User Licenses"{% endif %}, click **View {% if currentVersion == "free-pro-team@latest" %}details{% elsif enterpriseServerVersions contains currentVersion %}users{% endif %}** or {% if currentVersion == "free-pro-team@latest" %}{% octicon "download" aria-label="The download icon" %}{% elsif enterpriseServerVersions contains currentVersion %}**Export license usage**{% endif %}.{% if currentVersion == "free-pro-team@latest" %}
   !["View details" button and button with download icon to the right of "User Licenses"](/assets/images/help/business-accounts/billing-license-info-click-view-details-or-download.png){% endif %}
+{% if currentVersion == "free-pro-team@latest" or ver_gt "enterprise-server@3.0" %}
+1. Optionally, to view usage details for other features, in the left sidebar, click **Billing**.
+  ![Billing tab in the enterprise account settings sidebar](/assets/images/help/business-accounts/settings-billing-tab.png)
+
+### Further reading
+
+- "[About billing for GitHub Actions](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions#about-billing-for-github-actions)"
+- "[About billing for Git Large File Storage](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage)"
+- "[Managing use of Advanced Security for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account)"
+
+{% endif %}
diff --git a/data/reusables/advanced-security/enable-disable-committer-info.md b/data/reusables/advanced-security/enable-disable-committer-info.md
@@ -0,0 +1 @@
+When you enable {% data variables.product.prodname_GH_advanced_security %}, {% data variables.product.prodname_dotcom %} shows how many extra committers this will add and prompts for confirmation. If you disable access to {% data variables.product.prodname_GH_advanced_security %}, you can see how many seats this will free before you confirm the change. This makes it easy to see the impact of your changes on the use of your license.
diff --git a/data/reusables/advanced-security/license-overview.md b/data/reusables/advanced-security/license-overview.md
@@ -0,0 +1 @@
+Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of committers whose work can use these features. A committer is someone who authored at least one commit that was pushed to the repository in the last 90 days. Each committer is counted once, no matter how many repositories they contribute to.
