Skip to content

Commit

Permalink
Merge branch 'main' into fix/unify-docs-alerts-part-3
Browse files Browse the repository at this point in the history
  • Loading branch information
heiskr authored Nov 8, 2024
2 parents 32ad841 + b1a68cb commit 169ace7
Show file tree
Hide file tree
Showing 292 changed files with 1,232 additions and 2,751 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@ shortTitle: Upgrade Git LFS storage

{% data reusables.enterprise-accounts.billing-perms %}

{% note %}

**Note:** If your enterprise account is invoiced, you may not be able to purchase Git LFS data packs on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.

{% endnote %}
> [!NOTE]
> If your enterprise account is invoiced, you may not be able to purchase Git LFS data packs on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ shortTitle: View Git LFS usage
## Viewing storage and bandwidth usage for an organization

{% ifversion billing-beta-enterprise %}
{% note %}

**Note:** If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
> [!NOTE]
> If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
{% endnote %}
{% endif %}

{% data reusables.dotcom_billing.org-billing-perms %}
Expand All @@ -53,11 +52,10 @@ shortTitle: View Git LFS usage
## Viewing storage and bandwidth for an enterprise account

{% ifversion billing-beta-enterprise %}
{% note %}

**Note:** If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
> [!NOTE]
> If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
{% endnote %}
{% endif %}

{% data reusables.enterprise-accounts.access-enterprise %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,9 @@ Organizations owners and billing managers can manage the spending limit for {% d
{% data reusables.dotcom_billing.manage-spending-limit %}
1. Under "Monthly spending limit", choose to limit spending or allow unlimited spending.

{% note %}
> [!NOTE]
> If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending.
**Note:** If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending.

{% endnote %}
{% data reusables.dotcom_billing.update-spending-limit %}

{% ifversion ghec %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ Anyone can view {% data variables.product.prodname_actions %} usage for their ow
## Viewing {% data variables.product.prodname_actions %} usage for your organization

{% ifversion billing-beta-enterprise %}
{% note %}

**Note:** If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
> [!NOTE]
> If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
{% endnote %}
{% endif %}

Organization owners and billing managers can view {% data variables.product.prodname_actions %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_actions %} usage in the organization billing page.
Expand All @@ -57,20 +56,16 @@ Organization owners and billing managers can view {% data variables.product.prod
## Viewing {% data variables.product.prodname_actions %} usage for your enterprise account

{% ifversion billing-beta-enterprise %}
{% note %}

**Note:** If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
> [!NOTE]
> If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
{% endnote %}
{% endif %}

Enterprise owners and billing managers can view {% data variables.product.prodname_actions %} usage for an enterprise account.

{% note %}

**Note:** Billing details for enterprise accounts don't summarize the usage minutes for each operating system. {% data reusables.actions.enterprise-billing-details %}

{% endnote %}
> [!NOTE]
> Billing details for enterprise accounts don't summarize the usage minutes for each operating system. {% data reusables.actions.enterprise-billing-details %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,8 @@ If you have further questions about using {% data variables.product.prodname_GH_

{% data reusables.advanced-security.ghas-license-info-for-fpt %}

{% note %}

**Note:** If you change the visibility of a public repository to private then {% data variables.product.prodname_GH_advanced_security %} will be disabled for that repository.

{% endnote %}
> [!NOTE]
> If you change the visibility of a public repository to private then {% data variables.product.prodname_GH_advanced_security %} will be disabled for that repository.
For pricing details for {% data variables.product.prodname_GH_advanced_security %}, see our [pricing information](https://github.com/enterprise/advanced-security#pricing).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ You can set a spending limit for {% data variables.product.prodname_github_codes

Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an organization.

{% note %}

**Note**: Organizations that are owned by an enterprise account cannot specify their own spending limit as this is specified in the enterprise settings.

{% endnote %}
> [!NOTE]
> Organizations that are owned by an enterprise account cannot specify their own spending limit as this is specified in the enterprise settings.
{% data reusables.organizations.billing-settings %}
{% data reusables.dotcom_billing.manage-spending-limit %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,9 @@ Organization owners and billing managers can view {% data variables.product.prod
{% 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 %}

**Notes**:
* 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.

{% endnote %}
> [!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)."

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,8 @@ When you choose a paid plan with a free trial:

{% data reusables.user-settings.context_switcher %}

{% note %}

**Note:** When you transfer an organization with paid {% data variables.product.prodname_marketplace %} apps into an enterprise account, you may receive a second receipt but you will not be charged twice.

{% endnote %}
> [!NOTE]
> When you transfer an organization with paid {% data variables.product.prodname_marketplace %} apps into an enterprise account, you may receive a second receipt but you will not be charged twice.
## Unit plan limits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,8 @@ Organizations owners and billing managers can manage the spending limit for {% d
{% data reusables.dotcom_billing.manage-spending-limit %}
1. Under "Monthly spending limit", choose to limit spending or allow unlimited spending.

{% note %}

**Note:** If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending.

{% endnote %}
> [!NOTE]
> If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending.
{% data reusables.dotcom_billing.update-spending-limit %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,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 %}

**Note:** Billing details for enterprise accounts only summarize the storage data usage per organization. {% data reusables.actions.enterprise-billing-details %}

{% endnote %}
> [!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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,10 @@ One person may be able to complete the tasks because the person has all of the r

1. An organization owner must invite the subscriber to the organization on {% data variables.location.product_location %} from step 1. The subscriber can accept the invitation with an existing personal account or create a new account. After the subscriber joins the organization, the subscriber becomes an enterprise member. For more information, see "[AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)."

{% tip %}

**Tips**:

* While not required, we recommend that the organization owner sends an invitation to the same email address used for the subscriber's User Primary Name (UPN). When the email address on {% data variables.location.product_location %} matches the subscriber's UPN, you can ensure that another enterprise does not claim the subscriber's license.
* If the subscriber accepts the invitation to the organization with an existing personal account on {% data variables.location.product_location %}, we recommend that the subscriber add the email address they use for {% data variables.product.prodname_vs %} to their personal account on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
* If the organization owner must invite a large number of subscribers, a script may make the process faster. For more information, see [the sample PowerShell script](https://github.com/github/platform-samples/blob/master/api/powershell/invite_members_to_org.ps1) in the `github/platform-samples` repository.

{% endtip %}
> [!TIP]
> * While not required, we recommend that the organization owner sends an invitation to the same email address used for the subscriber's User Primary Name (UPN). When the email address on {% data variables.location.product_location %} matches the subscriber's UPN, you can ensure that another enterprise does not claim the subscriber's license.
> * If the subscriber accepts the invitation to the organization with an existing personal account on {% data variables.location.product_location %}, we recommend that the subscriber add the email address they use for {% data variables.product.prodname_vs %} to their personal account on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
> * If the organization owner must invite a large number of subscribers, a script may make the process faster. For more information, see [the sample PowerShell script](https://github.com/github/platform-samples/blob/master/api/powershell/invite_members_to_org.ps1) in the `github/platform-samples` repository.
After {% data variables.visual_studio.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,5 @@ You can purchase other subscriptions and usage-based billing with your existing

{% data reusables.user-settings.context_switcher %}

{% tip %}

**Tip:** {% data variables.product.prodname_dotcom %} has programs for verified students and academic faculty, which include academic discounts. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).

{% endtip %}
> [!TIP]
> {% data variables.product.prodname_dotcom %} has programs for verified students and academic faculty, which include academic discounts. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,10 @@ If you currently pay for your {% data variables.product.prodname_enterprise %} l
* Anyone with a pending invitation to become an outside collaborator on private or internal repositories owned by your organization, excluding forks
* Dormant users

{% note %}

**Notes:**
* {% data variables.product.company_short %} counts each outside collaborator once for billing purposes, even if the user account has access to multiple repositories owned by your organization.
* {% data reusables.organizations.org-invite-scim %}
* Inviting an outside collaborator to a repository using their email address temporarily uses an available seat, even if they already have access to other repositories. After they accept the invite, the seat will be freed up again. However, inviting them using their username does not temporarily use a seat.

{% endnote %}
> [!NOTE]
> * {% data variables.product.company_short %} counts each outside collaborator once for billing purposes, even if the user account has access to multiple repositories owned by your organization.
> * {% data reusables.organizations.org-invite-scim %}
> * Inviting an outside collaborator to a repository using their email address temporarily uses an available seat, even if they already have access to other repositories. After they accept the invite, the seat will be freed up again. However, inviting them using their username does not temporarily use a seat.
{% data variables.product.company_short %} does not bill for the following people:

Expand All @@ -95,14 +91,10 @@ If your enterprise does not use {% data variables.product.prodname_emus %}, you
* Anyone with a pending invitation to become an organization owner or member
* Anyone with a pending invitation to become an outside collaborator on private or internal repositories owned by your organization, excluding forks

{% note %}

**Notes:**
* {% data variables.product.company_short %} counts each member or outside collaborator once for billing purposes, even if the user account has membership in multiple organizations in an enterprise or access to multiple repositories owned by your organization.
* {% data reusables.organizations.org-invite-scim %}
* Inviting an outside collaborator to a repository using their email address temporarily uses an available seat, even if they already have access to other repositories. After they accept the invite, the seat will be freed up again. However, inviting them using their username does not temporarily use a seat.

{% endnote %}
> [!NOTE]
> * {% data variables.product.company_short %} counts each member or outside collaborator once for billing purposes, even if the user account has membership in multiple organizations in an enterprise or access to multiple repositories owned by your organization.
> * {% data reusables.organizations.org-invite-scim %}
> * Inviting an outside collaborator to a repository using their email address temporarily uses an available seat, even if they already have access to other repositories. After they accept the invite, the seat will be freed up again. However, inviting them using their username does not temporarily use a seat.
{% data variables.product.company_short %} does not bill for any of the following accounts:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,8 @@ To see a demo of the process from beginning to end, see [Billing GitHub consumpt

To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an organization owner on {% data variables.product.prodname_dotcom %}.

{% note %}

**Note**: If your organization account on {% data variables.location.product_location %} belongs an enterprise account, you must connect your Azure subscription to the enterprise account instead of the organization account. See "[Connecting your Azure subscription to your enterprise account](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} version of this article.

{% endnote %}
> [!NOTE]
> If your organization account on {% data variables.location.product_location %} belongs an enterprise account, you must connect your Azure subscription to the enterprise account instead of the organization account. See "[Connecting your Azure subscription to your enterprise account](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} version of this article.
{% data reusables.profile.access_org %}
{% data reusables.profile.org_settings %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ topics:
- User account
shortTitle: Discounted plans
---
{% tip %}

**Tip**: Discounts for an account's plan do not apply to other subscriptions or usage-based billing.

{% endtip %}
> [!TIP]
> Discounts for an account's plan do not apply to other subscriptions or usage-based billing.
## Discounts for personal accounts

Expand Down
Loading

0 comments on commit 169ace7

Please sign in to comment.