Address billing documentation issues reported by support (2) (#55722)

Co-authored-by: Felicity Chapman <[email protected]>
Co-authored-by: mc <[email protected]>

Author: 3 people

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md

@@ -32,11 +32,11 @@ You need pay to use {% data variables.product.prodname_AS %} features in private
 
 ## License types for {% data variables.product.prodname_AS %} products
 
-Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. {% ifversion ghec or ghes %}You can buy volume/subscription licenses for any combination of the following products or use metered billing to pay for your use:{% endif %}
+{% data variables.product.prodname_AS %} consists of two main products:
 
 {% data reusables.advanced-security.ghas-products-bullets+ghas %}
 
-For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You {% ifversion ghec or ghes %}buy or {% endif %}pay only for the products you need, and expand as you see the benefits to the security of your code.
+Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You buy or pay only for the products you need, and expand as you see the benefits to the security of your code.
 
 For more information, see [feature summary and pricing information](https://github.com/enterprise/advanced-security#pricing) and [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
 
@@ -51,7 +51,7 @@ Each active committer to at least one repository with an {% data variables.produ
 
 There are two different ways to pay for licenses.
 
-* **Metered billing** {% ifversion ghec %}introduced from June 2024 onward{% elsif ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %}
+* **Metered billing** {% ifversion ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %}
 
   * Users can enable {% data variables.product.prodname_GH_cs_or_sp %} independently.
   * Monthly bill for the number of licenses used by active committers.
@@ -64,10 +64,11 @@ There are two different ways to pay for licenses.
 
 * **Volume/subscription billing** available for {% data variables.product.prodname_enterprise %} plans only
 
-  * Users must ask the sales team to set up billing.
   * Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year.
   * If the usage of {% data variables.product.prodname_AS %} by active committers exceeds the number of licenses purchased, you need to purchase additional licenses to cover this overage usage.
 
+   If you want to purchase volume/subscription-based licenses, contact your account manager in {% data variables.contact.contact_enterprise_sales %} or contact {% data variables.contact.contact_support_page %}.
+
 ## Managing committers and costs
 
 {% ifversion fpt %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md

@@ -63,9 +63,7 @@ If you already pay to use {% data variables.product.prodname_AS %} features, the
 
 {% ifversion ghec %}
 
-If you are an existing self-serve customer, instructions on how to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %} SKUs will be announced over the next 30 days.
-
-You'll receive an email notification when the new plans are available to your enterprise. Transitioning to the two separate products will be self-serve and optional.
+If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:[email protected]).
 
 {% elsif ghes %}
 
@@ -77,7 +75,8 @@ If you have a hybrid {% data variables.product.prodname_ghe_cloud %} and {% data
 
 ### Volume/subscription billing users
 
-When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing.
+* **Invoiced**: When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing.
+* **Self-serve**: If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:[email protected]).
 
 ### Questions?
 

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md

@@ -30,7 +30,6 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho
 ## Setting up your trial of {% data variables.product.prodname_GHAS %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
 1. To the right of "{% data variables.product.prodname_GHAS %}", click **Start free trial**.
 1. Click **Start trial**.

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md

@@ -38,14 +38,27 @@ If you use volume/subscription billing, then you will need to purchase licenses
 
 If your enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the enterprise, organization, and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes.
 
-## Purchasing licenses for {% data variables.product.prodname_GH_cs_or_sp %}
+{% endif %}
+
+## Purchasing licenses for organizations
+
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+{% data reusables.organizations.billing_plans_or_licensing %}
+1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**.
+
+   ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
+
+{% ifversion ghec %}
+
+## Purchasing licenses for enterprises
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
-1. To the right of "GitHub Advanced Security", click **Buy Advanced Security**.
+1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**.
 
-   ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy Advanced Security" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
+   ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
 
 {% data reusables.advanced-security.purchase-ghas %}
 

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

@@ -99,14 +99,14 @@ You can use this information for insights into your {% data variables.product.pr
 
 You can download a CSV report of license usage through the {% data variables.product.github %} user interface or the REST API.
 
-### Downloading license usage information from the UI
+## Using the UI to download license and metered usage
 
 {% ifversion fpt %}You can download a CSV report for a repository or an organization.{% endif %}
 {% ifversion ghec %}You can download a CSV report for a repository, an organization, or an enterprise.{% endif %}
 
 {% ifversion fpt or ghec %}
 
-#### For a repository
+### For a repository
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
@@ -115,32 +115,38 @@ You can download a CSV report of license usage through the {% data variables.pro
 
    ![Screenshot of the table for {% data variables.product.prodname_GH_secret_protection %} usage. The horizontal kebab icon and "Download CSV report" button are outlined in orange.](/assets/images/help/billing/ghas-billing-table-repository-csv.png)
 
-#### For an organization
+### For an organization
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** and then **Usage**.
-1. Filter the metered usage to show `product:ghas` and choose "Group: SKU".
-1. Optionally, use the "Time Frame" field to set the period to report on.
-1. Click **{% octicon "download" aria-hidden="true" aria-label="download" %}Get usage report** to download the report.
+1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** to display an overview.
+1. For metered usage, in the sidebar click **Usage**.
+   1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**.
+   1. To further filter the usage graph, use the dropdown menus:
+      * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}.
+      * To filter by time, select **Time Frame**, then click a time period.
+      * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged).
+   1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**.
+1. For license consumption, in the sidebar click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**.
+   1. Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**.
 
 {% endif %}
 
 {% ifversion ghec %}
 
-#### For an enterprise
+### For an enterprise
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** to display an overview.
-
-   **License consumption:**
-   1. Click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**.
-   1. Under "{% data variables.product.prodname_GHAS %}," click the **Download report** dropdown and then click either **{% octicon "download" aria-hidden="true" aria-label="download" %} {% data variables.product.prodname_code_security %}** or **{% octicon "download" aria-hidden="true" aria-label="download" %} {% data variables.product.prodname_secret_protection %}**.
-
-   **Metered usage:**
-   1. Scroll to the tabbed usage information at the bottom of the "Overview" page and click **{% data variables.product.prodname_AS %}** to show usage.
-   1. In the summary box, click "View details" to show metered usage for {% data variables.product.prodname_AS %} grouped by SKU.
-   1. Select a time frame and click **{% octicon "download" aria-hidden="true" aria-label="download" %}Get usage report** to download a detailed report.
+1. For metered usage, click {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Usage**.
+   1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**.
+   1. To further filter the usage graph, use the dropdown menus:
+        * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}.
+        * To filter by time, select **Time Frame**, then click a time period.
+        * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged).
+   1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**.  
+1. For license consumption, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**.
+   * Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**.
 
 {% elsif ghes %}
 
@@ -152,7 +158,7 @@ You can download a CSV report of license usage through the {% data variables.pro
 
 {% endif %}
 
-### Downloading {% data variables.product.prodname_AS %} license usage information through the REST API
+## Using the REST API to download license and metered usage
 
 You can retrieve {% data variables.product.prodname_AS %} usage information via the billing API.
 

data/reusables/advanced-security/ghas-products-bullets+ghas.md

@@ -1,2 +1,4 @@
-{% data reusables.advanced-security.ghas-products-bullets %}{% ifversion ghec or ghes %}
-* **{% data variables.product.prodname_GHAS %}**, which includes all features in {% data variables.product.prodname_GH_secret_protection %} and {% data variables.product.prodname_GH_code_security %}.{% endif %}
+{% data reusables.advanced-security.ghas-products-bullets %}
+
+{% ifversion ghec or ghes %}
+Alternatively, you may have a {% data variables.product.prodname_GHAS %} license that includes all features in {% data variables.product.prodname_GH_secret_protection %} and {% data variables.product.prodname_GH_code_security %}.{% endif %}

data/reusables/enterprise-accounts/licensing-tab-both-platforms.md

@@ -1,2 +1,2 @@
-1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** (visible if you use the new billing platform). Alternatively, click **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**.{% else %}On the left side of the page, in the enterprise account sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** (visible if you use the new billing platform). Alternatively, click **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**.{% endif %}
+1. At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.
 1. Click **Licensing** to show detailed information on license use.

data/reusables/organizations/billing_plans_or_licensing.md

@@ -1 +1 @@
-1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** and then **Licensing** (new platform). Alternatively, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans** (original platform).
+1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** and then **Licensing**.