diff --git a/content/admin/data-residency/network-details-for-ghecom.md b/content/admin/data-residency/network-details-for-ghecom.md index c850517c7831..2763ac235e5d 100644 --- a/content/admin/data-residency/network-details-for-ghecom.md +++ b/content/admin/data-residency/network-details-for-ghecom.md @@ -73,7 +73,7 @@ If you use Azure private networking for {% data variables.product.company_short | Runner type | Supported regions | | ----------- | ----------------- | -| x64 | `francecentral`, `swedencentral`, `germanywestcentral` | +| x64 | `francecentral`, `swedencentral`, `germanywestcentral`, `northeurope` | | arm64 | `francecentral`, `northeurope`, `germanywestcentral` | | GPU | `italynorth`, `swedencentral` | @@ -83,7 +83,7 @@ If you use Azure private networking for {% data variables.product.company_short | ----------- | ----------------- | | x64 | `australiaeast`, `australiacentral` | | arm64 | `australiaeast`, `australiacentral` | -| GPU | N/A | +| GPU | `australiaeast`, `australiacentral` | ### Supported regions in the US diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md index 64708a66c12b..9844e698678c 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md @@ -14,48 +14,22 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage --- -{% data reusables.billing.enhanced-billing-platform %} - ## Viewing {% data variables.product.prodname_github_codespaces %} usage for your personal account -You can see how much of the usage included in your personal account you have used so far in the current monthly billing cycle. If you have set up a payment method, set a spending limit, and used all of your included usage, you can also check your bill for the current month. +Anyone can view {% data variables.product.prodname_github_codespaces %} usage for their own personal account. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.billing_plans %} -1. Under "{% data variables.product.prodname_codespaces %}," you can see how many core hours of {% data variables.product.prodname_github_codespaces %} compute usage and GB-months of storage you have used so far in the current billing month. - - ![Screenshot of the "{% data variables.product.prodname_codespaces %}" section of the billing page showing figures for "Usage hours" and "Storage."](/assets/images/help/codespaces/view-personal-usage-collapsed.png) - - For information about "core hours" and "GB-months," see [AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces). - -1. Optionally, click **Usage hours** and **Storage** to see more details. - - ![Screenshot of the "{% data variables.product.prodname_codespaces %}" section of the billing page, expanded to show more details for "Usage hours" and "Storage."](/assets/images/help/codespaces/view-personal-usage-expanded.png) - - The **Included** column shows how many of the core hours of compute usage, or GB-months of storage, included free with your account, you have used so far this month. The **Paid** column shows how many billed core hours of usage, or GB-months of storage, you have used. The figures are updated once every hour. - - In the screenshot above, the entire quota of included storage for the month has been used. When you've used all of either the included compute usage or storage (whichever is reached first), you must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. See [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information) and [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-personal-account). - - {% data reusables.codespaces.tips-included-usage %} - -{% data reusables.codespaces.usage-report-download %} +{% data reusables.dotcom_billing.codespaces-view-usage %} +{% data reusables.dotcom_billing.codespaces-report-download %} ## Viewing {% data variables.product.prodname_github_codespaces %} usage for your organization account -Organization owners and billing managers can view {% data variables.product.prodname_github_codespaces %} usage for the organization. +Organization owners and billing managers can view {% data variables.product.prodname_github_codespaces %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_github_codespaces %} usage in the organization billing page. {% data reusables.organizations.billing-settings %} -1. Under "Usage this month", under "{% data variables.product.prodname_codespaces %}", view the details of the compute hours and storage used so far this month. - - > [!NOTE] - > * The costs shown here are the cumulative costs within the current billing month. The usage-based costs for {% data variables.product.prodname_github_codespaces %} shown on this page are reset to zero at the start of each billing month. Outstanding costs from previous months are not shown. - > * The figures on this page are updated every hour. - - You can also see and update your current spending limit. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces). - - The **Projected usage** figure gives an estimate of the total usage for the current billing month, assuming the compute and storage usage for the past seven days continues unchanged for the remainder of the billing month. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#viewing-projected-usage-for-an-organization). - -{% data reusables.codespaces.usage-report-download %} +{% data reusables.dotcom_billing.codespaces-view-usage %} +{% data reusables.dotcom_billing.codespaces-report-download %} {% ifversion ghec %} @@ -64,10 +38,9 @@ Organization owners and billing managers can view {% data variables.product.prod Enterprise owners and billing managers can view {% data variables.product.prodname_github_codespaces %} usage for an enterprise account. {% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} -1. Under "{% data variables.product.prodname_codespaces %} monthly usage", view the usage details of each organization in your enterprise account. -{% data reusables.codespaces.usage-report-download %} +{% data reusables.dotcom_billing.codespaces-view-usage %} +{% data reusables.dotcom_billing.codespaces-report-download %} {% endif %} ## Further reading diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md index 5e731a9d2dbb..a91fd93d48c9 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md @@ -18,26 +18,23 @@ topics: shortTitle: View your usage --- -{% data reusables.billing.enhanced-billing-platform %} - ## Viewing {% data variables.product.prodname_registry %} usage for your personal account Anyone can view {% data variables.product.prodname_registry %} usage for their own personal account. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.packages-data %} -{% data reusables.dotcom_billing.actions-packages-storage %} -{% data reusables.dotcom_billing.actions-packages-report-download %} +{% data reusables.dotcom_billing.packages-view-usage %} +{% data reusables.dotcom_billing.packages-report-download %} ## Viewing {% data variables.product.prodname_registry %} usage for your organization Organization owners and billing managers can view {% data variables.product.prodname_registry %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_registry %} usage in the organization billing page. {% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.packages-data %} -{% data reusables.dotcom_billing.actions-packages-storage %} -{% data reusables.dotcom_billing.actions-packages-report-download-org-account %} + +{% data reusables.dotcom_billing.packages-view-usage %} +{% data reusables.dotcom_billing.packages-report-download-org-account %} {% ifversion ghec %} @@ -45,13 +42,8 @@ Organization owners and billing managers can view {% data variables.product.prod Enterprise owners and billing managers can view {% data variables.product.prodname_registry %} usage for an enterprise account. -> [!NOTE] -> Billing details for enterprise accounts only summarize the storage data usage per organization. {% data reusables.actions.enterprise-billing-details %} - {% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. Under "{% data variables.product.prodname_registry %}", view details of usage of data transfer by each organization in your enterprise account. -{% data reusables.dotcom_billing.actions-packages-storage-enterprise-account %} -{% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %} +{% data reusables.billing.enterprise-billing-menu %} +{% data reusables.dotcom_billing.packages-view-usage %} +{% data reusables.enterprise-accounts.packages-report-download-enterprise-accounts %} {% endif %} diff --git a/content/billing/managing-your-billing/adding-a-sales-tax-certificate.md b/content/billing/managing-your-billing/adding-a-sales-tax-certificate.md new file mode 100644 index 000000000000..0533ad7cc936 --- /dev/null +++ b/content/billing/managing-your-billing/adding-a-sales-tax-certificate.md @@ -0,0 +1,59 @@ +--- +title: Adding a sales tax certificate +intro: If you're a customer in the United States with a {% data variables.product.company_short %} Customer Agreement and you're exempt from sales tax, you can upload a certificate to ensure the correct sales tax amount is calculated. +redirect_from: + - /billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate + - /billing/using-the-billing-platform/adding-a-sales-tax-certificate +versions: + feature: us-sales-tax +type: how_to +topics: + - Organizations + - User account +shortTitle: Add a sales tax certificate +--- + +If you're a {% data variables.product.company_short %} customer in the United States, you need to ensure that your account is set up to calculate sales tax correctly. If you're exempt from sales tax, you can upload a certificate to your account. The format of the certificate you upload must be one of the following: + +* JPEG (`.jpg`, `.jpeg`) +* PNG (`.png`) +* PDF (`.pdf`) + +Your account is marked as tax exempt while your certificate is reviewed. If your certificate is not approved, you will need to upload a new one. + +## Adding a sales tax exemption certificate to your organization account + +You can upload a sales tax exemption certificate to your organization account if your account uses the {% data variables.product.company_short %} Customer Agreement. + +{% ifversion fpt or ghec %} + +> [!NOTE] +> This option is not available for accounts that use the {% data variables.product.company_short %} Standard Terms of Service. For information about updating your organization, see [AUTOTITLE](/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement). +{% endif %} + +{% data reusables.organizations.billing-settings %} +1. At the top of the page, click **Payment information**. + + ![Screenshot of the "Billing Summary" section of the settings page. A link, labeled "Payment information," is highlighted with an orange outline.](/assets/images/help/settings/payment-info-link.png) +1. Review your "Billing information" and update any incorrect data. You must ensure that the address fields are correct and that the "City" and "Postal/Zip code" fields are accepted. If there is any missing information or any errors are reported, the option to upload a sales tax certificate is hidden. +1. At the bottom of the page, next to "Sales Tax" in the "Additional information" section, click Upload certificate, and select the certificate file you want to upload. +1. To remove a sales tax certificate, click {% octicon "trash" aria-label="Delete sales tax certificate" %} next to the certificate you want to remove. + +{% ifversion ghec or ghes %} + +## Adding a sales tax exemption certificate to your enterprise account + +Enterprise owners and billing managers can upload a sales tax exemption certificate to an enterprise account if the account uses the {% data variables.product.company_short %} Customer Agreement. + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.billing-tab %} +1. At the top of the page, click **Payment information**. + + ![Screenshot of the "Billing Summary" section of the settings page. A link, labeled "Payment information," is highlighted with an orange outline.](/assets/images/help/settings/payment-info-link.png) + +1. Review your "Billing information" and update any incorrect data. You must ensure that the address fields are correct and that the "City" and "Postal/Zip code" fields are accepted. If there is any missing information or any errors are reported, the option to upload a sales tax certificate is hidden. +1. At the bottom of the page, in the "Sales Tax" section, click **Upload certificate**, and select the certificate file you want to upload. +1. To remove a sales tax certificate, click {% octicon "trash" aria-label="Delete sales tax certificate" %} next to the certificate you want to remove. + +{% endif %} diff --git a/content/billing/managing-your-billing/index.md b/content/billing/managing-your-billing/index.md index 7db43eb19a90..cdad208c2020 100644 --- a/content/billing/managing-your-billing/index.md +++ b/content/billing/managing-your-billing/index.md @@ -24,6 +24,7 @@ children: - /preventing-overspending - /managing-your-payment-and-billing-information - /automating-usage-reporting + - /adding-a-sales-tax-certificate - /redeeming-a-coupon - /troubleshooting-a-declined-credit-card-charge - /unlocking-a-locked-account diff --git a/content/billing/managing-your-billing/managing-your-payment-and-billing-information.md b/content/billing/managing-your-billing/managing-your-payment-and-billing-information.md index 371532f164af..0bea16e76a31 100644 --- a/content/billing/managing-your-billing/managing-your-payment-and-billing-information.md +++ b/content/billing/managing-your-billing/managing-your-payment-and-billing-information.md @@ -8,7 +8,6 @@ redirect_from: - /billing/using-the-billing-platform/adding-or-editing-a-payment-method - /billing/using-the-billing-platform/viewing-your-payment-history-and-receipts - /billing/using-the-billing-platform/adding-information-to-your-receipts - - /billing/using-the-billing-platform/adding-a-sales-tax-certificate - /billing/using-the-billing-platform/setting-your-billing-email - /billing/using-the-new-billing-platform/managing-your-payment-and-billing-information type: how_to diff --git a/data/reusables/actions/larger-runners-table.md b/data/reusables/actions/larger-runners-table.md index 70e9d28c5722..f64aaa99f990 100644 --- a/data/reusables/actions/larger-runners-table.md +++ b/data/reusables/actions/larger-runners-table.md @@ -1,4 +1,4 @@ | Runner Size | Architecture| Processor (CPU)| Memory (RAM) | Storage (SSD) | Workflow label | | ------------| ------------| -------------- | ------------- | ------------- |--------------------------------------------------------------------------------------------------------------------------------------------------| -| Large | Intel | 12 | 30 GB | 14 GB | macos-latest-large, macos-13-large, macos-14-large [latest], macos-15-large [{% data variables.release-phases.public_preview_caps %}] | -| XLarge | arm64 (M1) | 6 (+ 8 GPU hardware acceleration) | 14 GB | 14 GB | macos-latest-xlarge, macos-13-xlarge , macos-14-xlarge [latest], macos-15-xlarge [{% data variables.release-phases.public_preview_caps %}] | +| Large | Intel | 12 | 30 GB | 14 GB | macos-latest-large, macos-13-large, macos-14-large [latest], macos-15-large | +| XLarge | arm64 (M1) | 6 (+ 8 GPU hardware acceleration) | 14 GB | 14 GB | macos-latest-xlarge, macos-13-xlarge , macos-14-xlarge [latest], macos-15-xlarge | diff --git a/data/reusables/billing/actions-usage-delay.md b/data/reusables/billing/actions-usage-delay.md index 12a99e704a91..9f8fd24315f2 100644 --- a/data/reusables/billing/actions-usage-delay.md +++ b/data/reusables/billing/actions-usage-delay.md @@ -1 +1 @@ -> [!NOTE] When you enable {% data variables.product.prodname_GHAS_cs_or_sp %}, there is a delay of up to two hours before the change is shown in the usage data on the "Billing & Licensing" tab. +> [!NOTE] When you enable {% data variables.product.prodname_GHAS_cs_or_sp %}, there is a delay of up to two hours before the change is shown in the usage data on the "Billing and licensing" tab. diff --git a/data/reusables/billing/enterprise-billing-menu.md b/data/reusables/billing/enterprise-billing-menu.md index 55f6b4839d01..45a0252e0bff 100644 --- a/data/reusables/billing/enterprise-billing-menu.md +++ b/data/reusables/billing/enterprise-billing-menu.md @@ -1 +1 @@ -1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.{% 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**.{% endif %} +1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.{% 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 and licensing**.{% endif %} diff --git a/data/reusables/billing/us-sales-tax.md b/data/reusables/billing/us-sales-tax.md index ec64267f0f0a..e2cce2d7fbc8 100644 --- a/data/reusables/billing/us-sales-tax.md +++ b/data/reusables/billing/us-sales-tax.md @@ -1 +1 @@ -If you're a customer in the United States and you're exempt from sales tax, you will need to upload a sales tax exemption certificate to your account. See [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information). +If you're a customer in the United States and you're exempt from sales tax, you will need to upload a sales tax exemption certificate to your account. See [AUTOTITLE](/billing/managing-your-billing/adding-a-sales-tax-certificate). diff --git a/data/reusables/dotcom_billing/codespaces-report-download.md b/data/reusables/dotcom_billing/codespaces-report-download.md new file mode 100644 index 000000000000..3d9075244e4f --- /dev/null +++ b/data/reusables/dotcom_billing/codespaces-report-download.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Codespaces usage data. diff --git a/data/reusables/dotcom_billing/codespaces-view-usage.md b/data/reusables/dotcom_billing/codespaces-view-usage.md new file mode 100644 index 000000000000..6e7e272d33ac --- /dev/null +++ b/data/reusables/dotcom_billing/codespaces-view-usage.md @@ -0,0 +1,6 @@ +1. Under **Billing and licensing**, click **Usage**. +1. To display only Codespaces usage within the graph, click the search bar, then click **Product**. Within the list of products that generates, click **Codespaces**. +1. To further filter the usage graph, use the dropdown menus: + * To view usage by SKU, select the **Group** dropdown, then click **SKU**. + * 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). diff --git a/data/reusables/dotcom_billing/packages-report-download-org-account.md b/data/reusables/dotcom_billing/packages-report-download-org-account.md new file mode 100644 index 000000000000..0651c979f978 --- /dev/null +++ b/data/reusables/dotcom_billing/packages-report-download-org-account.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Packages usage data. diff --git a/data/reusables/dotcom_billing/packages-report-download.md b/data/reusables/dotcom_billing/packages-report-download.md new file mode 100644 index 000000000000..0651c979f978 --- /dev/null +++ b/data/reusables/dotcom_billing/packages-report-download.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Packages usage data. diff --git a/data/reusables/dotcom_billing/packages-view-usage.md b/data/reusables/dotcom_billing/packages-view-usage.md new file mode 100644 index 000000000000..92ac5f4f747d --- /dev/null +++ b/data/reusables/dotcom_billing/packages-view-usage.md @@ -0,0 +1,6 @@ +1. Under **Billing and licensing**, click **Usage**. +1. To display only Packages usage in the graph, click the search bar, then click **Product**. Within the list of products that generates, click **Packages**. +1. To further filter the usage graph, use the dropdown menus: + * To view usage by SKU, select the **Group** dropdown, then click **SKU**. + * 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). diff --git a/data/reusables/enterprise-accounts/packages-report-download-enterprise-accounts.md b/data/reusables/enterprise-accounts/packages-report-download-enterprise-accounts.md new file mode 100644 index 000000000000..0651c979f978 --- /dev/null +++ b/data/reusables/enterprise-accounts/packages-report-download-enterprise-accounts.md @@ -0,0 +1 @@ +1. Optionally, above the usage graph, click **Get usage report** and select the desired timeframe to generate a CSV report of your usage. This report will include Packages usage data. diff --git a/data/reusables/organizations/billing-settings.md b/data/reusables/organizations/billing-settings.md index c5dd31377342..32cb43026ef7 100644 --- a/data/reusables/organizations/billing-settings.md +++ b/data/reusables/organizations/billing-settings.md @@ -1,4 +1,4 @@ {% data reusables.user-settings.access_settings %} 1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-hidden="true" aria-label="organization" %} Organizations**. {% data reusables.profile.org_settings %} -1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="credit-card" aria-hidden="true" %} Billing and licensing**. +1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**.