diff --git a/.github/workflows/changelog-prompt.yml b/.github/workflows/changelog-prompt.yml new file mode 100644 index 000000000000..834fa4087c97 --- /dev/null +++ b/.github/workflows/changelog-prompt.yml @@ -0,0 +1,66 @@ +name: Changelog prompt when a PR is closed + +on: + pull_request: + types: [closed] + +permissions: + contents: read + pull-requests: write + +jobs: + comment-on-pr: + # This workflow should only run on the 'github/docs-internal' repository because it posts changelog instructions + # and links that are specific to the internal documentation process and resources. + # It also only runs if PR is merged into the main branch. + if: github.repository == 'github/docs-internal' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' + + runs-on: ubuntu-latest + + steps: + - name: Check if PR author is in docs-content team + id: check_team + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + github-token: ${{ secrets.DOCS_BOT_PAT_BASE }} + script: | + try { + const pr = context.payload.pull_request; + await github.rest.teams.getMembershipForUserInOrg({ + org: 'github', + team_slug: 'docs-content', + username: pr.user.login, + }); + core.exportVariable('CONTINUE_WORKFLOW', 'true'); + } catch(err) { + core.info("Workflow triggered by a merged PR, but the PR author is not a member of the docs-content team."); + core.exportVariable('CONTINUE_WORKFLOW', 'false'); + } + + - name: Post changelog instructions comment + + if: env.CONTINUE_WORKFLOW == 'true' + + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + github-token: ${{ secrets.DOCS_BOT_PAT_BASE }} + script: | + // Get PR author username + const pr = context.payload.pull_request; + const prAuthor = pr.user.login; + + // Compose the comment body with readable YAML and correct formatting + const commentBody = + "👋 @" + prAuthor + + " - Did this PR add noteworthy changes to the GitHub docs? If so, you might want to publicize this by adding an entry to " + + "the [Docs changelog](https://github.com/github/docs-internal/blob/main/CHANGELOG.md).\n\n" + + "To do this, type `/changelog` in a new comment on this PR and complete the fields.\n\n" + + "A message will be posted to the **#docs-changelog** channel and a PR will be raised to update the [CHANGELOG.md](/CHANGELOG.md) file."; + + // Post the comment + await github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: pr.number, + body: commentBody + }); diff --git a/CHANGELOG.md b/CHANGELOG.md index 99cd985f87ad..69c8a115c599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Docs changelog +**12 August 2025** + +We have added a tutorial for using Copilot to create Mermaid diagrams at [Creating Diagrams](https://docs.github.com/en/copilot/tutorials/copilot-chat-cookbook/communicate-effectively/creating-diagrams). + +
+ **4 August 2025** To address common pain points that developers face when remediating a leaked secret, we created a new article, "[Remediating a leaked secret](https://docs.github.com/en/code-security/secret-scanning/working-with-secret-scanning-and-push-protection/remediating-a-leaked-secret)". diff --git a/content/billing/concepts/enterprise-billing/billing-for-enterprises.md b/content/billing/concepts/enterprise-billing/billing-for-enterprises.md index b608b3041aa9..ec9cc76bab9c 100644 --- a/content/billing/concepts/enterprise-billing/billing-for-enterprises.md +++ b/content/billing/concepts/enterprise-billing/billing-for-enterprises.md @@ -1,6 +1,6 @@ --- title: Billing for GitHub Enterprise -intro: 'You can view billing information for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.' +intro: 'Learn how your bill is calculated based on how many {% data variables.product.prodname_enterprise %} licenses you use.' redirect_from: - /admin/overview/managing-billing-for-your-enterprise - /enterprise/admin/installation/managing-billing-for-github-enterprise @@ -36,10 +36,24 @@ If you have an enterprise account on {% data variables.product.prodname_ghe_clou > {% data reusables.billing.ghes-with-no-enterprise-account %} > {% endif %} +To learn which people consume a license in your enterprise, see [AUTOTITLE](/billing/reference/license-consumption). + ## Invoiced customers For invoiced customers, each invoice includes a single bill that covers the cost of {% data variables.product.prodname_enterprise %} licenses used, as well as your use of paid services. For example, in addition to your usage for {% data variables.product.prodname_enterprise %}, you may also use {% data variables.product.prodname_GH_secret_protection %}. +## Billing models for {% data variables.product.prodname_enterprise %} licenses + +There are two billing models for {% data variables.product.prodname_enterprise %} licenses: **usage-based** and **volume**. + +{% data reusables.billing.do-i-have-usage-based %} + +## License usage across deployments + +{% data reusables.enterprise-licensing.unique-user-licensing-model %} + +To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. See [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise). + ## Further reading * [AUTOTITLE](/admin/overview/about-enterprise-accounts) diff --git a/content/billing/concepts/enterprise-billing/visual-studio-subs.md b/content/billing/concepts/enterprise-billing/visual-studio-subs.md index 94c879224c79..6967be5824e0 100644 --- a/content/billing/concepts/enterprise-billing/visual-studio-subs.md +++ b/content/billing/concepts/enterprise-billing/visual-studio-subs.md @@ -34,7 +34,7 @@ For more information about the setup of {% data variables.visual_studio.prodname After you assign a license for {% data variables.visual_studio.prodname_vss_ghec %} to a subscriber, the subscriber will use the {% data variables.product.prodname_enterprise %} portion of the license by joining an organization in your enterprise with a personal account on {% data variables.product.prodname_dotcom %}. If the verified email address for the personal account of an enterprise member on {% data variables.product.prodname_dotcom %} matches the User Principal Name (UPN) for a subscriber to your {% data variables.product.prodname_vs %} account, the {% data variables.product.prodname_vs %} subscriber will automatically consume one license for {% data variables.visual_studio.prodname_vss_ghec %}. -> [!NOTE] For {% data variables.product.prodname_emu %} only, to make sure a user account consumes a {% data variables.product.prodname_vs %} license, ensure the {% data variables.product.prodname_vs %} UPN matches the SCIM `userName` attribute or the email address from the linked identity on the {% data variables.product.prodname_dotcom %} account. +> [!NOTE] For {% data variables.product.prodname_emus %} only, to make sure a user account consumes a {% data variables.product.prodname_vs %} license, ensure the {% data variables.product.prodname_vs %} UPN matches the SCIM `userName` attribute or the email address from the linked identity on the {% data variables.product.prodname_dotcom %} account. Unaffiliated users are included in the automatic matching behavior and can consume a license for {% data variables.visual_studio.prodname_vss_ghec %} while remaining unaffiliated. The total quantity of your licenses for your enterprise on {% data variables.product.prodname_dotcom %} is the sum of any standard {% data variables.product.prodname_enterprise %} licenses and the number of {% data variables.product.prodname_vs %} subscription licenses that include access to {% data variables.product.prodname_dotcom %}. diff --git a/content/billing/concepts/impact-of-plan-changes.md b/content/billing/concepts/impact-of-plan-changes.md index c86e9eb54ca8..bfbc61b61cb2 100644 --- a/content/billing/concepts/impact-of-plan-changes.md +++ b/content/billing/concepts/impact-of-plan-changes.md @@ -19,25 +19,37 @@ topics: shortTitle: Impact of plan changes contentType: concepts --- + +## Upgrades and downgrades + When you upgrade the subscription for your personal account or organization, changes are applied immediately. When you downgrade your subscription, changes are applied at the end of your current billing cycle. +{% data reusables.accounts.accounts-billed-separately %} + Making a change to your paid personal account, organization, or enterprise account does not affect billing for use of {% data variables.product.github %} features, such as {% data variables.product.prodname_copilot_short %} or paid apps purchased in {% data variables.product.prodname_marketplace %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github). -## Example of canceling a paid subscription for a personal account or organization +## Examples of plan changes + +* [Example of canceling a paid subscription for a personal account or organization](#example-of-canceling-a-paid-subscription-for-a-personal-account-or-organization) +* [Example of changing from a yearly to a monthly subscription for a personal account or organization](#example-of-changing-from-a-yearly-to-a-monthly-subscription-for-a-personal-account-or-organization) +* [Example of adding paid seats to your organization](#example-of-adding-paid-seats-to-your-organization) +* [Example of removing paid seats from your organization](#example-of-removing-paid-seats-from-your-organization) + +### Example of canceling a paid subscription for a personal account or organization Kumiko pays for a monthly subscription on the 5th of every month. If Kumiko downgrades from the paid subscription to {% data variables.product.prodname_free_user %} on October 10th, her paid subscription will remain in effect until the end of her current billing cycle on November 4th. On November 5th, her account will move to {% data variables.product.prodname_free_user %}. -## Example of changing from a yearly to a monthly subscription for a personal account or organization +### Example of changing from a yearly to a monthly subscription for a personal account or organization Ravi pays for a yearly subscription on October 5th every year. If Ravi switches from a yearly to monthly billing on December 10th, his account remains on the yearly subscription until the end of its current billing cycle on October 4th the next year. On October 5th of the next year, Ravi will be charged for a month of service. His next billing date will be November 5th. -## Example of adding paid seats to your organization +### Example of adding paid seats to your organization Mada's organization pays for 25 seats on the 15th of every month. If Mada adds ten paid seats on June 4th, her organization is immediately charged a prorated amount for ten additional seats for the time between June 4th and June 14th, and the seats are available to use immediately. On June 15th, Mada's organization will pay for 35 seats. -## Example of removing paid seats from your organization +### Example of removing paid seats from your organization Stefan's organization pays for 50 seats every year on May 20th. If Stefan removes 20 seats and downgrades to a new total of 30 paid seats on September 30, his organization can still access its 50 paid seats until the end of its current billing cycle on May 19th. On May 20th, the downgrade will take effect - Stefan's organization will pay for 30 seats and will have access to 30 paid seats. diff --git a/content/billing/concepts/index.md b/content/billing/concepts/index.md index e5448e7649df..0f15385639d1 100644 --- a/content/billing/concepts/index.md +++ b/content/billing/concepts/index.md @@ -10,7 +10,6 @@ topics: - Billing children: - /billing-cycles - - /license-consumption - /azure-subscriptions - /impact-of-plan-changes - /discounted-plans @@ -19,3 +18,4 @@ children: - /third-party-payments contentType: concepts --- + diff --git a/content/billing/concepts/license-consumption.md b/content/billing/concepts/license-consumption.md deleted file mode 100644 index 08371b565a0c..000000000000 --- a/content/billing/concepts/license-consumption.md +++ /dev/null @@ -1,169 +0,0 @@ ---- -title: License consumption by organization members -intro: 'Learn how consumption of licenses for {% data variables.product.github %} by users is determined for organizations and enterprises.' -shortTitle: License consumption -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing - - /articles/about-per-user-pricing - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing - - /github/billing/managing-billing-for-your-github-account/about-per-user-pricing - - /billing/managing-the-plan-for-your-github-account/about-per-user-pricing -versions: - fpt: '*' - ghec: '*' - ghes: '*' -topics: - - Downgrades - - Enterprise - - Licensing - - Organizations - - Billing -contentType: concepts ---- - -{% ifversion fpt %} - -{% data reusables.billing.about-billing %} For organizations, the "plan" component of the bill is based on the number of licensed seats you choose to purchase. - -New organizations on {% data variables.product.prodname_dotcom %} can build public and open-source projects with {% data variables.product.prodname_free_team %}, or upgrade to a paid plan. See [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan). - ->[!NOTE] Organizations who upgraded to a paid plan before May 11, 2016 can choose to stay on their existing per-repository plan or switch to per-user pricing. {% data variables.product.company_short %} will notify you twelve months before any mandated change to your subscription. For more information on switching your subscription, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan). - -{% else %} - -The foundation of your bill is the number of user accounts using your{% ifversion ghec %} organization or{% endif %} enterprise. - -{% data reusables.enterprise-licensing.unique-user-licensing-model %} - -To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. See [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise). - -In addition to {% ifversion enterprise-licensing-language %}showing billable {% data variables.product.prodname_enterprise %} licenses{% else %}licensed seats{% endif %}, your bill may include other charges, such as {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise). -{% endif %} - -## Two billing models for {% data variables.product.prodname_enterprise %} licenses - -With usage-based billing, you pay for the number of licenses you use each month. You do not need to buy a predefined number of licenses in advance. See, [AUTOTITLE](/billing/managing-your-billing/about-usage-based-billing-for-licenses). - -{% data reusables.billing.do-i-have-usage-based %} - -## People that consume a license - -{% data reusables.enterprise-managed.repo-collaborators-note %} - -{% ifversion fpt %} - -{% data variables.product.company_short %} bills for the following people: - -* Organization members, including owners -* Outside collaborators on private repositories owned by your organization, excluding forks -* Anyone with a pending invitation to become an outside collaborator on private or internal repositories owned by your organization, excluding forks -* Dormant users - -> [!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. -> * If a user receives a {% data variables.product.prodname_copilot_short %} license from multiple organizations in the same enterprise, the enterprise will only be billed once per billing cycle for that user. One of the organizations that assigned {% data variables.product.prodname_copilot_short %} to the user will be chosen at random each month to be billed for the seat. - -{% data variables.product.company_short %} does not bill for the following people: - -* Billing managers -* Anyone with a pending invitation to become a billing manager -* Anyone with a pending invitation to become an outside collaborator on a public repository owned by your organization - -{% else %} - -{% data variables.product.company_short %} bills for the following accounts for each deployment of {% data variables.product.prodname_enterprise %}. - -### Accounts that consume a license on {% data variables.product.prodname_ghe_cloud %} - -{% data variables.product.company_short %} bills for each of the following accounts on {% data variables.product.prodname_ghe_cloud %}: - -* Enterprise owners who are a member or owner of at least one organization in the enterprise -* Organization members, including owners -* Outside collaborators on private or internal repositories owned by your organization, excluding forks -* Dormant users who are a member or owner of at least one organization in the enterprise - -If your enterprise does not use {% data variables.product.prodname_emus %}, you will also be billed for each of the following accounts: - -* 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] -> * {% 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 {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}, even if they already have access to other repositories. After they accept the invite, the {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} will be freed up again. However, inviting them using their username does not temporarily use a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}. - -{% data variables.product.company_short %} does not bill for any of the following accounts: - -* {% data variables.enterprise.prodname_managed_users_caps %} that are suspended -* Enterprise owners who are not a member or owner of at least one organization in the enterprise, except for the user who set up the enterprise -* Enterprise billing managers -* Billing managers for individual organizations -* Anyone with a pending invitation to become a billing manager -* Anyone with a pending invitation to become an outside collaborator on a public repository owned by your organization -* Guest collaborators who are not organization members or repository collaborators (see [AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#guest-collaborators)) -* Users of {% data variables.visual_studio.prodname_vss_ghe %} whose accounts on {% data variables.product.prodname_dotcom %} are not linked, and who do not meet any of the other criteria for per-user pricing -* Users who have been provisioned with a {% data variables.enterprise.prodname_managed_user %}, but are not members of any organizations in the enterprise -* The `scim-admin` setup user, when SCIM is enabled on your {% data variables.product.prodname_ghe_server %} appliance. For more information, see the SCIM configuration guide [AUTOTITLE](/enterprise-server@latest/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users#1-create-a-built-in-setup-user). - -### Accounts that consume a license on {% data variables.product.prodname_ghe_server %} - -After a user successfully authenticates to a {% data variables.product.prodname_ghe_server %} instance for the first time, the user consumes a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}. - -Suspended users are not counted when calculating the number of {% ifversion enterprise-licensing-language %}consumed licenses{% else %}licensed users consuming seats{% endif %}. For more information, see [Suspending and unsuspending users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %} - -Dormant users do occupy a {% ifversion enterprise-licensing-language %}license{% else %}seat license{% endif %}. Administrators can suspend dormant users to free licenses. For more information, see [Managing dormant users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %} - -{% endif %} - -## About changes to your subscription - -{% ifversion fpt %} - -You can change your {% data variables.product.prodname_dotcom %} subscription at any time. - -### About changes for organizations on per-user plans - -{% endif %} - -{% ifversion ghec %}If you use usage-based billing, you can reduce the number of licenses you use by removing users from your enterprise account. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise). - -{% else %}You can add more {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} than are being used, you can also reduce the number of {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %}. This only applies if you currently pay for your {% data variables.product.prodname_enterprise %} licenses through a volume, subscription, or prepaid agreement.{% endif %}{% ifversion fpt %} See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan). - -If you have questions about your subscription, you can contact {% data variables.contact.contact_support %}. - -To further support your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like SAML single sign-on and advanced auditing. {% data reusables.enterprise.link-to-ghec-trial %} - -For more information about per-user pricing for {% data variables.product.prodname_ghe_cloud %}, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). - -{% else %} - -If you use an enterprise account and have questions about changes to your subscription, contact {% data variables.contact.contact_enterprise_sales %}. - -{% endif %} - -{% ifversion ghec %} - -If you use an individual organization on {% data variables.product.prodname_ghe_cloud %}, you can upgrade or downgrade your subscription. See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan) or [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan). If you have questions about your subscription, you can contact {% data variables.contact.contact_support %}. - -{% endif %} - -{% ifversion fpt %} - -### About changes for organizations on per-repository plans - -You can upgrade or downgrade between legacy paid plans in your organization's billing settings. When you upgrade to a plan with more private repositories, {% data variables.product.company_short %} immediately moves your account to your new plan and bills you for the difference in price, prorated for the number of days left in your billing cycle. - -When you downgrade to a legacy paid plan with fewer private repositories, your new plan will take effect on your next billing date. If you have more private repositories than your new plan allows for, your private repositories will be locked when your new plan takes effect. To reduce your number of private repositories, you can make some of your private repositories public, or you can clone your private repositories locally and delete the copies on {% data variables.product.prodname_dotcom %}. - -{% endif %} - -## Further reading - -{%- ifversion not fpt %} -* [AUTOTITLE](/admin/overview/about-enterprise-accounts) -* [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise) -{%- endif %} -* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) -* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/adding-outside-collaborators-to-repositories-in-your-organization) diff --git a/content/billing/how-tos/manage-plan-and-licenses/add-licenses.md b/content/billing/how-tos/manage-plan-and-licenses/add-licenses.md deleted file mode 100644 index 75aaeff67685..000000000000 --- a/content/billing/how-tos/manage-plan-and-licenses/add-licenses.md +++ /dev/null @@ -1,52 +0,0 @@ ---- -title: Adding licenses to an organization -intro: 'Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %} personal or organization{% elsif ghec %}enterprise{% endif %} account using the new billing platform.' -versions: - feature: enhanced-billing-platform -redirect_from: - - /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account - - /billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account - - /billing/using-the-new-billing-platform/adding-seats-to-your-account - - /billing/using-the-new-billing-platform/adding-licenses-to-your-account - - /billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account - - /billing/managing-your-billing/adding-licenses-to-an-organization -topics: - - Billing - - Enterprise - - Team -permissions: '{% data reusables.permissions.enhanced-billing-platform %}' -shortTitle: Add licenses -contentType: how-tos ---- - -{% ifversion ghec %} ->[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add licenses to your enterprise account. -{% endif %} - -With the new billing platform{% ifversion fpt %} with an organization on a {% data variables.product.prodname_team %} plan, or a personal account on a {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %} plan{% endif %}, you can add {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} to your account{% ifversion fpt %} or update your plan{% endif %} through the "Licensing" page. - -{% ifversion fpt %} - -## Adding licenses to an organization - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.billing.org-billing-menu %} -1. Click **Licensing**. -1. In the {% data variables.product.prodname_team %} banner, click **Edit** and select **Add seats** to display the "Billing / Add seats" view. -1. Define the number of new seats you require. The details of the prorated cost for the remainder of the billing cycle and the total for your next bill are updated automatically. -1. When you have defined the number of additional seats to add, click **Add seats**. - -You can also use the **Edit** option to remove seats and see which users are using seats in your account. - -{% elsif ghec %} - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.billing.enterprise-billing-menu %} -1. Click **Licensing**. -1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage licenses**. -1. Under "Total licenses," enter a number of licenses. -1. Click **Update licenses**. - -{% endif %} diff --git a/content/billing/how-tos/manage-plan-and-licenses/downgrade-plan.md b/content/billing/how-tos/manage-plan-and-licenses/downgrade-plan.md index f7cf67ddbf38..9129e4197da8 100644 --- a/content/billing/how-tos/manage-plan-and-licenses/downgrade-plan.md +++ b/content/billing/how-tos/manage-plan-and-licenses/downgrade-plan.md @@ -33,12 +33,6 @@ shortTitle: Downgrade plan contentType: how-tos --- -{% data reusables.billing.enhanced-billing-platform-personal-accounts %} - -## About downgrades - -When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Downgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see [AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process). - ## Downgrading your personal account's plan If you downgrade your personal account from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, the account will lose access to advanced code review tools on private repositories. {% data reusables.gated-features.more-info %} @@ -78,43 +72,20 @@ Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SA 1. Under "Billing/Plans", next to the plan you want to change, click **Downgrade**. 1. Enter the reason you're downgrading your account, then click **Downgrade plan**. -## Removing paid seats from your organization - -To reduce the number of paid seats your organization uses, you can remove members from your organization or convert members to outside collaborators and give them access to only public repositories. For more information, see: -* [AUTOTITLE](/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization) -* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/converting-an-organization-member-to-an-outside-collaborator) -* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-an-individuals-access-to-an-organization-repository) - -{% data reusables.organizations.billing-settings %} -1. Under "Current plan", next to your current plan, select the **Edit** dropdown menu, then click **Remove seats**. -1. Under "Remove seats", select the number of seats you'd like to downgrade to. -1. Review the information about your new payment on your next billing date, then click **Remove seats**. - -{% ifversion ghec %} - ## Downgrading your enterprise account's plan Enterprise accounts are only available with {% data variables.product.prodname_enterprise %}, so it's not possible to downgrade an enterprise account to another plan. -If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether and your company pays via invoice, contact {% data variables.contact.contact_enterprise_sales %}. If you have a self-serve enterprise account, an enterprise account owner must remove or delete all organizations from the enterprise first. Removing an organization from an enterprise automatically downgrades the organization to {% data variables.product.prodname_free_team %}. See [AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise). - -Once all organizations have been removed or deleted, an enterprise owner can delete the enterprise account to cancel the {% data variables.product.prodname_enterprise %} subscription. See [AUTOTITLE](/admin/managing-your-enterprise-account/deleting-an-enterprise-account). +If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether and your company pays via invoice, contact {% data variables.contact.contact_enterprise_sales %}. -## Removing paid seats for your enterprise account - -{% data reusables.enterprise-accounts.billing-perms %} - -> [!NOTE] -> If your enterprise account is invoiced, you cannot remove seats on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}. +If you have a self-serve enterprise account, an enterprise account owner can: -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -{% data reusables.enterprise-accounts.manage-seats %} -{% endif %} +1. Remove or delete all organizations from the enterprise. Removing an organization from an enterprise automatically downgrades the organization to {% data variables.product.prodname_free_team %}. See [AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise). +1. Delete the enterprise account to cancel the {% data variables.product.prodname_enterprise %} subscription. See [AUTOTITLE](/admin/managing-your-enterprise-account/deleting-an-enterprise-account). ## Further reading +* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/manage-user-licenses) * [AUTOTITLE](/get-started/learning-about-github/githubs-plans) * [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process) * [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github). diff --git a/content/billing/how-tos/manage-plan-and-licenses/index.md b/content/billing/how-tos/manage-plan-and-licenses/index.md index 5ae16248f202..2304474081bb 100644 --- a/content/billing/how-tos/manage-plan-and-licenses/index.md +++ b/content/billing/how-tos/manage-plan-and-licenses/index.md @@ -26,7 +26,7 @@ children: - /downgrade-plan - /manage-pending-changes - /view-enterprise-usage - - /add-licenses + - /manage-user-licenses contentType: how-tos --- diff --git a/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md b/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md new file mode 100644 index 000000000000..9f711e976f8c --- /dev/null +++ b/content/billing/how-tos/manage-plan-and-licenses/manage-user-licenses.md @@ -0,0 +1,61 @@ +--- +title: Managing user licenses for an organization or enterprise +intro: Add licenses to allow more people to join your organization or enterprise. +product: 'Organizations on {% data variables.product.prodname_team %} and enterprises that use self-serve volume licensing' +versions: + feature: enhanced-billing-platform +redirect_from: + - /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account + - /billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account + - /billing/using-the-new-billing-platform/adding-seats-to-your-account + - /billing/using-the-new-billing-platform/adding-licenses-to-your-account + - /billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account + - /billing/managing-your-billing/adding-licenses-to-an-organization + - /billing/how-tos/manage-plan-and-licenses/manage-organization-licenses + - /billing/how-tos/manage-plan-and-licenses/add-licenses +topics: + - Billing + - Enterprise + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +shortTitle: Manage user licenses +contentType: how-tos +--- + +## Organizations on {% data variables.product.prodname_team %} + +If you're the owner of an organization on a {% data variables.product.prodname_team %} plan, you can add or remove user licenses to your plan through the "Licensing" page. + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.billing.org-billing-menu %} +1. Click **Licensing**. +1. In the {% data variables.product.prodname_team %} banner, click **Edit** and select **Add seats** or **Remove seats**. +1. Define the number of new seats you require. The details of the prorated cost for the remainder of the billing cycle and the total for your next bill are updated automatically. +1. Click **Add seats** or **Remove seats**. + +### Changing members to outside collaborators + +To reduce the number of paid licenses your organization requires, you can convert members to outside collaborators and give them access to only public repositories. For more information, see: + +* [AUTOTITLE](/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization) +* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/converting-an-organization-member-to-an-outside-collaborator) +* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-an-individuals-access-to-an-organization-repository) + +## Enterprises on {% data variables.product.prodname_ghe_cloud %} + +For organizations that are part of an enterprise, licenses are managed at the enterprise level. Only self-serve customers on a volume agreement can manage licenses through the {% data variables.product.github %} UI. + +To add or remove licenses from your enterprise account: + +* If you **pay by invoice**, contact your account manager in {% data variables.contact.contact_enterprise_sales %}. +* If you are a self-serve customer with **usage-based license billing**, you don't need to add a set number of licenses to your enterprise. You will be billed for licenses based on the number of members in your organizations. See [AUTOTITLE](/billing/concepts/enterprise-billing/usage-based-licenses). +* If you are a self-serve customer with **volume license billing**, follow the instructions below. + +### Self-serve customers with volume licenses + +1. Navigate to your enterprise account. +{% data reusables.billing.enterprise-billing-menu %} +1. In the left sidebar, click **Licensing**. +1. Next to "Enterprise Cloud", click **{% octicon "kebab-horizontal" aria-hidden="true" aria-label="kebab-horizontal" %}**, then click **Manage licenses**. +1. Choose your number of licenses, then click **Confirm licenses**. diff --git a/content/billing/how-tos/manage-plan-and-licenses/upgrade-plan.md b/content/billing/how-tos/manage-plan-and-licenses/upgrade-plan.md index c84885613dcd..56b3616f06f5 100644 --- a/content/billing/how-tos/manage-plan-and-licenses/upgrade-plan.md +++ b/content/billing/how-tos/manage-plan-and-licenses/upgrade-plan.md @@ -1,6 +1,6 @@ --- title: Upgrading your account's plan -intro: 'You can upgrade the plan for any type of account on {% data variables.product.prodname_dotcom %} at any time.' +intro: 'You can upgrade the plan for a personal account or organization on {% data variables.product.prodname_dotcom %} at any time.' redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription - /articles/upgrading-your-personal-account-s-billing-plan @@ -34,14 +34,6 @@ shortTitle: Upgrade plan contentType: how-tos --- -{% data reusables.billing.enhanced-billing-platform-personal-accounts %} - -## About upgrades - -{% data reusables.accounts.accounts-billed-separately %} - -Upgrading your plan does not affect other subscriptions or usage-based billing for your account. See [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github). - ## Upgrading your personal account's plan You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your personal account. @@ -58,11 +50,7 @@ Upgrading your personal account does not affect any organizations you may manage {% data reusables.dotcom_billing.enter-payment-info %} {% data reusables.dotcom_billing.finish_upgrade %} -## Managing your organization's plan - -You can upgrade your organization's plan, add seats to your existing plan, or switch from per-repository to per-user pricing. - -### Upgrading your organization's plan +## Upgrading your organization's plan You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls. @@ -70,8 +58,6 @@ Upgrading an organization does not affect your personal account or repositories {% data reusables.dotcom_billing.org-billing-perms %} ->[!NOTE] {% data reusables.actions.org-to-enterprise-actions-permissions %} - {% data reusables.organizations.billing-settings %} {% data reusables.dotcom_billing.upgrade_org %} {% data reusables.dotcom_billing.choose_org_plan %} @@ -87,16 +73,13 @@ As part of your upgrade to {% data variables.product.prodname_ghe_cloud %}, you {% data reusables.enterprise.create-an-enterprise-account %} See [AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %} -### Adding seats to your organization +>[!NOTE] {% data reusables.actions.org-to-enterprise-actions-permissions %} -If you'd like additional users to have access to your {% data variables.product.prodname_team %} organization's private repositories, you can purchase more seats anytime. +## Troubleshooting a 500 error when upgrading -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.add-seats %} -{% data reusables.dotcom_billing.number-of-seats %} -{% data reusables.dotcom_billing.confirm-add-seats %} +{% data reusables.dotcom_billing.500-error %} -### Switching your organization from per-repository to per-user pricing +## Switching your organization from per-repository to per-user pricing {% data reusables.dotcom_billing.switch-legacy-billing %} See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). @@ -108,29 +91,9 @@ If you'd like additional users to have access to your {% data variables.product. {% data reusables.dotcom_billing.owned_by_business %} {% data reusables.dotcom_billing.finish_upgrade %} -{% ifversion ghec %} - -## Adding seats to your enterprise account - -You can add seats to your enterprise account through the "Licensing" page. See, [AUTOTITLE](/billing/managing-your-billing/adding-licenses-to-an-organization). - -{% data reusables.enterprise-accounts.billing-perms %} - ->[!NOTE] If your enterprise account is invoiced, you cannot add seats 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 %} -{% data reusables.enterprise-accounts.billing-tab %} -{% data reusables.enterprise-accounts.manage-seats %} - -{% endif %} - -## Troubleshooting a 500 error when upgrading - -{% data reusables.dotcom_billing.500-error %} - ## Further reading +* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/manage-user-licenses) * [AUTOTITLE](/get-started/learning-about-github/githubs-plans) * [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process) -* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github). +* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github) diff --git a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md index 3af44ac7a6c5..93d9d98ec3bf 100644 --- a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md +++ b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md @@ -1,6 +1,6 @@ --- 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.' +intro: 'If you''re a customer in the United States with a {% data variables.product.github %} 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 @@ -9,6 +9,7 @@ versions: fpt: '*' ghec: '*' ghes: '*' +product: 'US-based organization and enterprise accounts that use the {% data variables.product.github %} Customer Agreement, see {% ifversion fpt or ghec %}[AUTOTITLE](/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement) in the {% data variables.product.prodname_ghe_cloud %} docs{% endif %}' topics: - Billing - Organizations @@ -17,42 +18,21 @@ shortTitle: Add sales tax certificate contentType: how-tos --- -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: +If you're a {% data variables.product.github %} 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 in JPEG (`.jpg`, `.jpeg`), PNG (`.png`), or PDF (`.pdf`) format. -* JPEG (`.jpg`, `.jpeg`) -* PNG (`.png`) -* PDF (`.pdf`) +## Adding a sales tax exemption certificate to your account -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. +Enterprise owners, organization 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. -{% ifversion fpt or ghec %} +1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. -> [!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). +1. Select the account you want to view and then access the "Billing & Licensing" pages: -{% endif %} + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. + * For **enterprises**, click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. -{% data reusables.organizations.billing-settings %} -1. In the sidebar, under **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**, click **Payment information**. +1. From the list of "Billing & licensing" pages, click **Payment information**. 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 "Additional information" section next to "Sales Tax," click **Upload certificate**, and select the certificate file you want to upload. If "Sales Tax" is missing, check that your billing information defines your country as "United States of America." -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 +1. At the bottom of the page in the "Sales Tax" section, click **Upload certificate**, and select the certificate file you want to upload. If "Sales Tax" is missing, check that your billing information defines your country as "United States of America." -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.billing-tab %} -1. In the sidebar, under **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**, click **Payment information**. -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," click **Upload certificate**, and select the certificate file you want to upload. If "Sales Tax" is missing, check that your billing information defines your country as "United States of America." -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 %} +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. diff --git a/content/billing/how-tos/set-up-payment/index.md b/content/billing/how-tos/set-up-payment/index.md index 39d9b41c21b8..f6d400fe6539 100644 --- a/content/billing/how-tos/set-up-payment/index.md +++ b/content/billing/how-tos/set-up-payment/index.md @@ -1,7 +1,7 @@ --- title: Setting up and managing payment shortTitle: Set up payment -intro: Learn how to change your payment method and manage invoices. +intro: Learn how to change your payment method, view your payment history, and manage invoices. versions: fpt: '*' ghec: '*' @@ -18,4 +18,3 @@ children: - /india-one-time-payments contentType: how-tos --- - diff --git a/content/billing/how-tos/set-up-payment/manage-enterprise-invoice.md b/content/billing/how-tos/set-up-payment/manage-enterprise-invoice.md index 6312fcd20ae0..e76657eda3f1 100644 --- a/content/billing/how-tos/set-up-payment/manage-enterprise-invoice.md +++ b/content/billing/how-tos/set-up-payment/manage-enterprise-invoice.md @@ -6,7 +6,10 @@ redirect_from: - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise - /billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise versions: + fpt: '*' ghec: '*' + ghes: '*' +product: '{% data reusables.gated-features.enterprise-invoices %}' topics: - Billing - Enterprise @@ -14,29 +17,21 @@ topics: contentType: how-tos --- -## About invoices for your enterprise - -For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise). - -Only invoiced customers can view invoices on {% data variables.product.prodname_dotcom %}. If you pay automatically via credit card or PayPal, you can view receipts and payment history instead. For more information, see [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information). - -For more information about viewing the subscription and usage for your enterprise account, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account). - -{% data reusables.billing.ghes-with-no-enterprise-account %} +{% data variables.product.github %} bills invoiced customers through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise). ## Viewing your current invoice {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} 1. Under "Latest invoice", click **View**. ![Screenshot of the billing summary for an enterprise account. A link, labeled "View", is highlighted with an orange outline.](/assets/images/help/business-accounts/view-invoice-link.png) +To view details of subscriptions and usage for your enterprise account, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account). + ## Paying your current invoice {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} 1. Under "Latest invoice", click **Pay invoice**. @@ -46,7 +41,6 @@ For more information about viewing the subscription and usage for your enterpris ## Downloading your current invoice {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} 1. Under "Quick Actions", click **Download current invoice**. @@ -55,7 +49,6 @@ For more information about viewing the subscription and usage for your enterpris ## Viewing your payment history {% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.billing-tab %} 1. To see a summary of your past billing activity, under "Billing", click the **Past invoices** tab. diff --git a/content/billing/how-tos/set-up-payment/redeem-coupon.md b/content/billing/how-tos/set-up-payment/redeem-coupon.md index 8077eed601f7..154be77b3ac6 100644 --- a/content/billing/how-tos/set-up-payment/redeem-coupon.md +++ b/content/billing/how-tos/set-up-payment/redeem-coupon.md @@ -15,6 +15,7 @@ redirect_from: versions: fpt: '*' ghec: '*' +product: 'Personal, organization, and enterprise account owners
Organization and enterprise billing managers' topics: - Billing - Discounts @@ -24,29 +25,23 @@ topics: shortTitle: Redeem coupon contentType: how-tos --- -{% data variables.product.company_short %} can't issue a refund if you pay for an account before applying a coupon. We also can't transfer a redeemed coupon or give you a new coupon if you apply it to the wrong account. Confirm that you're applying the coupon to the correct account before you redeem a coupon. -{% data reusables.dotcom_billing.coupon-expires %} +## Prerequisites -> [!NOTE] -> You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps. +> [!IMPORTANT] +> {% data variables.product.company_short %} can't issue a refund if you apply a coupon to the wrong account or to an account that you have already paid for. -## Redeeming a coupon for your personal account +Before you redeem a coupon: +1. Confirm which account the coupon is intended for. +1. Verify that the account you want to apply the coupon to is not already paid for, see [AUTOTITLE](/billing/how-tos/set-up-payment/manage-payment-info). +1. Be aware that coupons cannot be used for paid plans for {% data variables.product.prodname_marketplace %} apps. -{% data reusables.dotcom_billing.enter_coupon_code_on_redeem_page %} -1. Under "Redeem your coupon", click **Choose** next to your _personal_ account's username. -{% data reusables.dotcom_billing.redeem_coupon %} - -## Redeeming a coupon for your organization - -{% data reusables.dotcom_billing.org-billing-perms %} +## Redeeming a coupon for your personal or organization account {% data reusables.dotcom_billing.enter_coupon_code_on_redeem_page %} -1. Under "Redeem your coupon", click **Choose** next to the _organization_ you want to apply the coupon to. If you'd like to apply your coupon to a new organization that doesn't exist yet, click **Create a new organization**. +1. Under "Redeem your coupon", click **Choose** next to the username of the account to apply the coupon to. {% data reusables.dotcom_billing.redeem_coupon %} -{% ifversion ghec %} - ## Redeeming a coupon for your enterprise Redeeming a {% data variables.product.prodname_ghe_cloud %} coupon will create a new enterprise account. You can't redeem a coupon for an existing enterprise account yourself. If you have an existing enterprise account and want to redeem a coupon, you can [contact {% data variables.contact.github_support %}](/support/contacting-github-support). @@ -55,4 +50,11 @@ Redeeming a {% data variables.product.prodname_ghe_cloud %} coupon will create a 1. Select the organization that you would like to add to your new enterprise. {% data reusables.dotcom_billing.redeem_coupon %} -{% endif %} +## When the coupon expires + +If you use a coupon to pay for a subscription, when the coupon expires you will be charged the **full cost** for that subscription if you have a **payment method defined**. + +If you **do not have a payment method defined**, your account will be affected: +* Personal accounts are downgraded to {% data variables.product.prodname_free_user %} +* Organization accounts are downgraded to {% data variables.product.prodname_free_team %} +* Enterprise accounts are locked until you add a payment method diff --git a/content/billing/how-tos/set-up-payment/set-up-vs-subscription.md b/content/billing/how-tos/set-up-payment/set-up-vs-subscription.md index 4d3e9e6484d0..38d29c1174a6 100644 --- a/content/billing/how-tos/set-up-payment/set-up-vs-subscription.md +++ b/content/billing/how-tos/set-up-payment/set-up-vs-subscription.md @@ -16,54 +16,42 @@ shortTitle: Set up VS subscription contentType: how-tos --- -## About setup of {% data variables.visual_studio.prodname_vss_ghe %} - {% data reusables.enterprise-accounts.vss-ghe-description %} See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise). -This guide shows you how your team can get {% data variables.product.prodname_vs %} subscribers licensed and started with {% data variables.product.prodname_enterprise %}. - -## Roles for {% data variables.visual_studio.prodname_vss_ghe %} - -Before setting up {% data variables.visual_studio.prodname_vss_ghe %}, it's important to understand the roles for this combined offering. - -| Role | Service | Description | More information | -| :- | :- | :- | :- | -| **Subscriptions admin** | {% data variables.product.prodname_vs %} subscription | Person who assigns licenses for {% data variables.product.prodname_vs %} subscription | [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs | -| **Subscriber** | {% data variables.product.prodname_vs %} subscription | Person who uses a license for {% data variables.product.prodname_vs %} subscription | [Visual Studio Subscriptions documentation](https://docs.microsoft.com/en-us/visualstudio/subscriptions/) in Microsoft Docs | -| **Enterprise owner** | {% data variables.product.prodname_dotcom %} | Person who has a personal account that's an administrator of an enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner) | -| **Organization owner** | {% data variables.product.prodname_dotcom %} | Person who has a personal account that's an owner of an organization in your team's enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners) | -| **Enterprise member** | {% data variables.product.prodname_dotcom %} | Person who has a personal account that's a member of an enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-members) | - ## Prerequisites -* Your team's {% data variables.product.prodname_vs %} subscription must include {% data variables.product.prodname_enterprise %}. For more information, see [{% data variables.product.prodname_vs %} Subscriptions and Benefits](https://visualstudio.microsoft.com/subscriptions/) on the {% data variables.product.prodname_vs %} website and [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs. +* Your team's {% data variables.product.prodname_vs %} subscription must include {% data variables.product.prodname_enterprise %}. For more information, see: + * [{% data variables.product.prodname_vs %} Subscriptions and Benefits](https://visualstudio.microsoft.com/subscriptions/) on the {% data variables.product.prodname_vs %} website + * [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs. -* Your team must have an enterprise on {% data variables.location.product_location %}. If you're not sure whether your team has an enterprise, contact your {% data variables.product.prodname_dotcom %} administrator. If you're not sure who on your team is responsible for {% data variables.product.prodname_dotcom %}, contact {% data variables.contact.contact_enterprise_sales %}. For more information, see [AUTOTITLE](/admin/overview/about-enterprise-accounts). +* Your team must have an enterprise on {% data variables.product.github %}, see [AUTOTITLE](/admin/overview/about-enterprise-accounts). + * If you're not sure whether your team has an enterprise, contact your {% data variables.product.github %} administrator. + * If you're not sure who on your team is responsible for {% data variables.product.github %} services, contact {% data variables.contact.contact_enterprise_sales %}. ## Setting up {% data variables.visual_studio.prodname_vss_ghe %} To set up {% data variables.visual_studio.prodname_vss_ghe %}, members of your team must complete the following tasks. -One person may be able to complete the tasks because the person has all of the roles, but you may need to coordinate the tasks with multiple people. For more information, see [Roles for {% data variables.visual_studio.prodname_vss_ghe %}](#roles-for-visual-studio-subscriptions-with-github-enterprise). +One person may be able to complete the tasks because the person has all of the roles, but you may need to coordinate the tasks with multiple people. For more information, see [AUTOTITLE](/billing/reference/roles-for-visual-studio). -1. An enterprise owner must create at least one organization in your enterprise on {% data variables.location.product_location %}. For more information, see [AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise). +1. A {% data variables.product.github %} enterprise owner must create at least one organization in your enterprise. For more information, see [AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise). -1. The subscription admin must assign a license for {% data variables.product.prodname_vs %} to a subscriber in {% data variables.visual_studio.prodname_vss_admin_portal_with_url %}. For more information, see [Overview of the {% data variables.product.prodname_vs %} Subscriptions Administrator Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/using-admin-portal) and [Assign {% data variables.product.prodname_vs %} Licenses in the {% data variables.product.prodname_vs %} Subscriptions Administration Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-license) in Microsoft Docs. +1. The {% data variables.product.prodname_vs %} subscription admin must assign a license for {% data variables.product.prodname_vs %} to a subscriber in {% data variables.visual_studio.prodname_vss_admin_portal_with_url %}. For more information, see [Overview of the {% data variables.product.prodname_vs %} Subscriptions Administrator Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/using-admin-portal) and [Assign {% data variables.product.prodname_vs %} Licenses in the {% data variables.product.prodname_vs %} Subscriptions Administration Portal](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-license) in Microsoft Docs. -1. Optionally, if the subscription admin assigned licenses to subscribers in {% data variables.product.prodname_vs %} before adding {% data variables.product.prodname_enterprise %} to the subscription, the subscription admin can move the subscribers to the combined offering in the {% data variables.product.prodname_vs %} administration portal. For more information, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github#moving-to-visual-studio-with-github-enterprise) in Microsoft Docs. +1. Optionally, if the {% data variables.product.prodname_vs %} subscription admin assigned licenses to subscribers in {% data variables.product.prodname_vs %} before adding {% data variables.product.prodname_enterprise %} to the subscription, the subscription admin can move the subscribers to the combined offering in the {% data variables.product.prodname_vs %} administration portal. For more information, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github#moving-to-visual-studio-with-github-enterprise) in Microsoft Docs. -1. If the subscription admin has not disabled email notifications, the subscriber will receive two confirmation emails. For more information, see [{% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github#what-is-the-visual-studio-subscription-with-github-enterprise-setup-process) in Microsoft Docs. +1. If the {% data variables.product.prodname_vs %} subscription admin has not disabled email notifications, the subscriber will receive two confirmation emails. For more information, see [{% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github#what-is-the-visual-studio-subscription-with-github-enterprise-setup-process) in Microsoft Docs. -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). +1. A {% data variables.product.github %} organization owner must invite the subscriber to the organization created in 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] - > * 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). + > * 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.product.github %} 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.product.github %}, we recommend that the subscriber add the email address they use for {% data variables.product.prodname_vs %} to their personal account on {% data variables.product.github %}. 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. 1. If any enterprise members aren't automatically matched to their {% data variables.product.prodname_vs %} account, an enterprise owner can match the accounts manually on {% data variables.product.github %}. See [Reconciling users across {% data variables.product.prodname_vs %} and {% data variables.product.github %}](#reconciling-users-across-visual-studio-and-github). -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). +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.product.github %}. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account). ## Reconciling users across {% data variables.product.prodname_vs %} and {% data variables.product.github %} diff --git a/content/billing/index.md b/content/billing/index.md index e16c16eb901d..7f9ed7618446 100644 --- a/content/billing/index.md +++ b/content/billing/index.md @@ -6,14 +6,14 @@ redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github - /categories/setting-up-and-managing-billing-and-payments-on-github introLinks: - overview: '{% ifversion fpt or ghec %}/billing/get-started/how-billing-works {% elsif ghes %}/billing/concepts/license-consumption {% endif %}' + overview: '{% ifversion fpt or ghec %}/billing/get-started/how-billing-works {% elsif ghes %}/billing/concepts/enterprise-billing/billing-for-enterprises{% endif %}' featuredLinks: startHere: - '{% ifversion fpt or ghec %}/billing/get-started/introduction-to-billing{% endif %}' - '{% ifversion fpt or ghec %}/billing/get-started/how-billing-works{% endif %}' - '{% ifversion fpt or ghec %}/billing/how-tos/set-up-payment/manage-payment-info{% endif %}' - '{% ifversion fpt or ghec %}/billing/tutorials/set-up-budgets{% endif %}' - - '{% ifversion ghes %}/billing/concepts/license-consumption{% endif %}' + - '{% ifversion ghes %}/billing/concepts/enterprise-billing/billing-for-enterprises{% endif %}' - '{% ifversion ghes %}/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage{% endif %}' - '{% ifversion ghes %}/billing/concepts/enterprise-billing/combined-enterprise-use{% endif %}' popular: @@ -29,7 +29,7 @@ featuredLinks: - /billing/how-tos/manage-plan-and-licenses/upgrade-plan - /billing/concepts/impact-of-plan-changes - '{% ifversion ghes %}/billing/how-tos/manage-server-licenses/sync-license-usage{% endif %}' - - '{% ifversion ghes %}/billing/reference/license-usage-calculation{% endif %}' + - '{% ifversion ghes %}/billing/reference/enterprise-license-troubleshooting{% endif %}' changelog: label: account-management layout: product-landing diff --git a/content/billing/reference/billing-roles.md b/content/billing/reference/billing-roles.md index a33614ffcff6..d0ca3164071e 100644 --- a/content/billing/reference/billing-roles.md +++ b/content/billing/reference/billing-roles.md @@ -1,7 +1,7 @@ --- -title: Roles for the new billing platform +title: Roles for the billing platform shortTitle: Billing roles -intro: Learn about the different roles that can use the new billing platform. +intro: Learn about the different roles that can view and manage billing settings. versions: feature: enhanced-billing-platform redirect_from: @@ -12,27 +12,19 @@ topics: - Billing - Enterprise - Team -product: '{% data reusables.billing.enhanced-billing-platform-product %}' contentType: reference --- -In an {% data variables.enterprise.enterprise_and_org %}, the following roles have access to the new billing platform: {% ifversion ghec %}enterprise owners, {% endif %}billing managers, and organization owners. {% ifversion fpt %}See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization).{% elsif ghec %}See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise).{% endif %} +The following roles have access to the billing platform: -{% ifversion fpt %}Personal accounts also have access to the new billing platform for their personal usage.{% endif %} +* **Enterprise owners and enterprise billing managers**: Can manage billing for an enterprise account. +* **Organization owners and organization billing managers**: Can manage billing for an organization on {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}. +* **Personal accounts (non-managed)**: Can access the billing platform for their personal usage. -{% ifversion ghec %} +To add a billing manager, see: -## Enterprise owners and enterprise billing managers - -You can: - -* View all metered usage for your account and set budgets for your {% data variables.enterprise.enterprise_and_org %}. -* See enterprise usage, including costs for organizations and repositories. -* Download CSV usage reports for products your enterprise is using. -* Set budgets for your {% data variables.enterprise.enterprise_and_org %}. -* Create cost centers for all organizations within your enterprise. - -{% endif %} +* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization#inviting-a-billing-manager) +* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise) ## Organization owners @@ -40,13 +32,9 @@ You have full administrative access to your organization. You can: * View metered usage and budgets for your organization and its repositories. * Set budgets for the organization and its repositories. -* Download CSV usage reports.{% ifversion ghec %} -* Create cost centers by grouping repositories you manage. +* Download CSV usage reports. * View promotions and discounts. -* View spending for pre-purchased user licenses for {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_AS %} based on your usage. -{% endif %} - -{% ifversion fpt %} +* View spending for pre-purchased user licenses for {% data variables.product.prodname_AS %} based on your usage. ## Organization billing managers @@ -56,20 +44,17 @@ You can: * View organization-level budgets. * Download CSV usage reports. -{% endif %} +## Enterprise owners and enterprise billing managers + +You can: -## Inviting a billing manager +* View all metered usage for your account and set budgets for your {% data variables.enterprise.enterprise_and_org %}. +* See enterprise usage, including costs for organizations and repositories. +* Download CSV usage reports for products your enterprise is using. +* Set budgets for your enterprise. +* Create cost centers for all organizations within your enterprise. -The invited person will receive an invitation email asking them to become a billing manager for your {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %}. Once the invited person clicks the accept link in their invitation email, they will automatically be added to the {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %} as a billing manager. If they don't already have a {% data variables.product.prodname_dotcom %} account, they will be directed to sign up for one, and they will be automatically added to the {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %} as a billing manager after they create an account. +## Further reading -{% 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-hidden="true" aria-label="credit-card" %} Billing and plans**. -1. Click the link in the text box, **Enterprise account billing settings**, which will direct you to your organizations billing settings page. -1. {% ifversion horizontal-nav %}At the top of the page, click {% octicon "person" aria-hidden="true" aria-label="person" %} **People**{% else %}On the left side of the page, in the enterprise account sidebar, click {% octicon "person" aria-hidden="true" aria-label="person" %} **People**{% endif %}. -1. Under "People", click **Administrators**. -1. Above the list of administrators, click **Invite admin**. -1. Type the username, full name, or email address of the person you want to invite, then select the appropriate person from the results. -1. Select **Billing Manager**. -1. Click **Send Invitation**. +* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) +* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise) diff --git a/content/billing/reference/license-usage-calculation.md b/content/billing/reference/enterprise-license-troubleshooting.md similarity index 67% rename from content/billing/reference/license-usage-calculation.md rename to content/billing/reference/enterprise-license-troubleshooting.md index e4b7ef7a164f..0f09636e530e 100644 --- a/content/billing/reference/license-usage-calculation.md +++ b/content/billing/reference/enterprise-license-troubleshooting.md @@ -1,7 +1,6 @@ --- -title: License usage for GitHub Enterprise -intro: You can troubleshoot license usage for your enterprise by auditing license reports. -permissions: 'Enterprise owners can review license usage for {% data variables.product.prodname_enterprise %}.' +title: License troubleshooting information for GitHub Enterprise +intro: Troubleshoot license usage for your enterprise by understanding consumption criteria and auditing license reports. versions: ghec: '*' ghes: '*' @@ -9,22 +8,37 @@ topics: - Billing - Enterprise - Licensing -shortTitle: License usage calculation +shortTitle: Enterprise license troubleshooting contentType: reference +redirect_from: + - /billing/reference/license-usage-calculation + - /billing/reference/license-usage-reference --- -## About the calculation of consumed licenses - -> [!NOTE] -> For {% data variables.visual_studio.prodname_vs_subscriber %}s, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise). +## People who consume a license A person consumes a license for {% data variables.product.prodname_enterprise %} depending on specific criteria. If a user has not yet accepted an invitation to join your enterprise, the user still consumes a license. For more information about the people in your enterprise who consume a license, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). +## {% data variables.visual_studio.prodname_vs_subscriber %}s + +If the verified email address for the personal account of an enterprise member on {% data variables.product.prodname_dotcom %} matches the User Principal Name (UPN) for a subscriber to your {% data variables.product.prodname_vs %} account, the {% data variables.product.prodname_vs %} subscriber will automatically consume one license for {% data variables.visual_studio.prodname_vss_ghec %}. + +> [!NOTE] For {% data variables.product.prodname_emu %} only, to make sure a user account consumes a {% data variables.product.prodname_vs %} license, ensure the {% data variables.product.prodname_vs %} UPN matches the SCIM `userName` attribute or the email address from the linked identity on the {% data variables.product.prodname_dotcom %} account. + +For more information, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise). + +## Users of {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} + For each user to consume a single {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud). After you synchronize license usage, {% data variables.product.prodname_dotcom %} matches user accounts on {% data variables.product.prodname_ghe_server %} with user accounts on {% data variables.product.prodname_ghe_cloud %} by email address. -First, we check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise on {% data variables.product.prodname_ghe_cloud %} or any of the enterprise's organizations use SAML authentication or SCIM provisioning, we first check the linked SAML or SCIM identities to see if the identity contains one of the attributes below. We attempt to match the values of these attributes to the primary email address of each {% data variables.product.prodname_ghe_server %} user. +1. We check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. +1. We attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. + +### With SAML or SCIM + +If your enterprise on {% data variables.product.prodname_ghe_cloud %} or any of the enterprise's organizations use SAML authentication or SCIM provisioning, we first check the linked SAML or SCIM identities to see if the identity contains one of the attributes below. We attempt to match the values of these attributes to the primary email address of each {% data variables.product.prodname_ghe_server %} user. * `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name` * `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress` @@ -32,14 +46,9 @@ First, we check the primary email address of each user on {% data variables.prod * `NameID` * `emails` -If there is no match, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %} - -{% ifversion scim-for-ghes-ga %} - -> [!NOTE] -> If SAML with SCIM is enabled, the `scim-admin` setup user will not consume a license. For more information, see [AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users#1-create-a-built-in-setup-user). +### Without SAML or SCIM -{% endif %} +If there is no match with a SAML or SCIM attribute, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %} ## Fields in the consumed license files @@ -89,6 +98,6 @@ Your {% data variables.product.prodname_ghe_server %} license usage is a JSON fi | Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance. | Version | The version of your {% data variables.product.prodname_ghe_server %} instance. -## Troubleshooting +## Troubleshooting steps For troubleshooting steps, see [AUTOTITLE](/billing/how-tos/troubleshooting/enterprise-license-usage). diff --git a/content/billing/reference/index.md b/content/billing/reference/index.md index 0e45eaff63c1..3a29d9157f28 100644 --- a/content/billing/reference/index.md +++ b/content/billing/reference/index.md @@ -14,6 +14,9 @@ children: - /supported-payment-methods - /azure-subscription - /billing-roles - - /license-usage-calculation + - /roles-for-visual-studio + - /license-consumption + - /enterprise-license-troubleshooting contentType: reference --- + diff --git a/content/billing/reference/license-consumption.md b/content/billing/reference/license-consumption.md new file mode 100644 index 000000000000..b9d2be6b7cb5 --- /dev/null +++ b/content/billing/reference/license-consumption.md @@ -0,0 +1,93 @@ +--- +title: People who consume a license in an organization +intro: 'Learn how consumption of {% data variables.product.github %} licenses is determined for paid organizations and enterprises.' +shortTitle: License consumption +redirect_from: + - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing + - /articles/about-per-user-pricing + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing + - /github/billing/managing-billing-for-your-github-account/about-per-user-pricing + - /billing/managing-the-plan-for-your-github-account/about-per-user-pricing + - /billing/concepts/license-consumption +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Downgrades + - Enterprise + - Licensing + - Organizations + - Billing +contentType: reference +--- + +{% data reusables.billing.about-billing %} For organizations and enterprises, the "plan" component of the bill is based on the number of licensed seats you use. + +## Organizations on {% data variables.product.prodname_team %} + +{% data variables.product.github %} bills for the following people: + +* Organization members, including owners +* Outside collaborators on private repositories owned by your organization, excluding forks + * {% data variables.product.company_short %} counts each outside collaborator once, even if the user account has access to multiple repositories in your organization. +* Anyone with a pending invitation to become an outside collaborator on private repositories owned by your organization, excluding forks + * 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. Inviting them using their username does not temporarily use a seat. +* Dormant users + +### People who don't consume a license + +* Billing managers +* Anyone with a pending invitation to become a billing manager +* Anyone with a pending invitation to become an outside collaborator on a public repository owned by your organization + +## Organizations on {% data variables.product.prodname_ghe_cloud %} + +{% data reusables.enterprise-managed.repo-collaborators-note %} + +{% data variables.product.company_short %} bills for each of the following accounts on {% data variables.product.prodname_ghe_cloud %}: + +* Enterprise owners who are a member or owner of at least one organization in the enterprise +* Organization members, including owners +* Outside collaborators on private or internal repositories owned by your organization, excluding forks + * {% data variables.product.company_short %} counts each outside collaborator once, even if the user account has access to multiple repositories in your organization. +* Dormant users who are a member or owner of at least one organization in the enterprise + +If your enterprise does not use {% data variables.product.prodname_emus %}, you will also be billed for each of the following accounts: + +* 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 + * {% 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. Inviting them using their username does not temporarily use a seat. + +### People who don't consume licenses + +* {% data variables.enterprise.prodname_managed_users_caps %} that are suspended +* Enterprise owners who are not a member or owner of at least one organization in the enterprise, except for the user who set up the enterprise +* Enterprise billing managers +* Billing managers for individual organizations +* Anyone with a pending invitation to become a billing manager +* Anyone with a pending invitation to become an outside collaborator on a public repository owned by your organization +* Guest collaborators who are not organization members or repository collaborators (see [AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#guest-collaborators)) +* Users of {% data variables.visual_studio.prodname_vss_ghe %} whose accounts on {% data variables.product.prodname_dotcom %} are not linked, and who do not meet any of the other criteria for per-user pricing +* Users who have been provisioned with a {% data variables.enterprise.prodname_managed_user %}, but are not members of any organizations in the enterprise + +## Organizations on {% data variables.product.prodname_ghe_server %} + +* Any active user who has successfully authenticated to your {% data variables.product.prodname_ghe_server %} instance +* Dormant users (administrators can suspend dormant users to free licenses, see [Managing dormant users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation{% endif %}) + +### People who don't consume a license + +* Suspended users (see [Suspending and unsuspending users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation{% else %}.{% endif %}) +* If you have enabled SCIM on your {% data variables.product.prodname_ghe_server %} instance, the built-in setup user you create, provided you use the `scim-admin` username. +* Users who already consume a license on {% data variables.product.prodname_ghe_cloud %}, provided you sync license usage between environments. See [AUTOTITLE](/billing/concepts/enterprise-billing/combined-enterprise-use). + +## Further reading + +{%- ifversion not fpt %} +* [AUTOTITLE](/admin/overview/about-enterprise-accounts) +* [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise) +{%- endif %} +* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) +* [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/adding-outside-collaborators-to-repositories-in-your-organization) diff --git a/content/billing/reference/roles-for-visual-studio.md b/content/billing/reference/roles-for-visual-studio.md new file mode 100644 index 000000000000..febd98a80665 --- /dev/null +++ b/content/billing/reference/roles-for-visual-studio.md @@ -0,0 +1,31 @@ +--- +title: Roles for {% data variables.visual_studio.prodname_vss_ghe %} reference +shortTitle: Roles for Visual Studio +intro: 'Learn about the different roles required to set up {% data variables.visual_studio.prodname_vss_ghe %}.' +versions: + ghec: '*' +topics: + - Billing + - Enterprise + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' +contentType: reference +--- + +{% data variables.visual_studio.prodname_vss_ghe %} is a combined offering and knowledge of roles in both systems is useful. + +## {% data variables.product.prodname_vs %} roles + +| Role | Description | More information | +| :- | :- | :- | +| **Subscriptions admin** | Person who assigns licenses for {% data variables.product.prodname_vs %} subscription | [Overview of admin responsibilities](https://docs.microsoft.com/en-us/visualstudio/subscriptions/admin-responsibilities) in Microsoft Docs | +| **Subscriber** | Person who uses a license for {% data variables.product.prodname_vs %} subscription | [Visual Studio Subscriptions documentation](https://docs.microsoft.com/en-us/visualstudio/subscriptions/) in Microsoft Docs | + +## {% data variables.product.github %} roles + +| Role | Description | More information | +| :- | :- | :- | +| **Enterprise owner** | Person who has a personal account that's an administrator of an enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner) | +| **Organization owner** | Person who has a personal account that's an owner of an organization in your team's enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#organization-owners) | +| **Enterprise member** | Person who has a personal account that's a member of an enterprise on {% data variables.location.product_location %} | [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-members) | diff --git a/content/code-security/dependabot/working-with-dependabot/dependabot-options-reference.md b/content/code-security/dependabot/working-with-dependabot/dependabot-options-reference.md index 55409bd909cc..bfe43bd5b7a2 100644 --- a/content/code-security/dependabot/working-with-dependabot/dependabot-options-reference.md +++ b/content/code-security/dependabot/working-with-dependabot/dependabot-options-reference.md @@ -506,6 +506,9 @@ Package manager | YAML value | Supported versions | | Swift | `swift` | v5 | | Terraform | `terraform` | >= 0.13, <= 1.10.x | | uv | `uv` | v0 | +| {% ifversion dependabot-vcpkg-support %} | +| vcpkg | `vcpkg` | Not applicable | +| {% endif %} | | yarn | `npm` | v1, v2, v3, v4 | ## `pull-request-branch-name.separator` {% octicon "versions" aria-label="Version updates" height="24" %} {% octicon "shield-check" aria-label="Security updates" height="24" %} diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md index 9304139e82c5..f601b08fec42 100644 --- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md @@ -46,25 +46,14 @@ Billing managers **are not** able to: ## Inviting a billing manager -{% ifversion enhanced-billing-platform %} - ->[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the new billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the new billing platform. -> -> If you are on the new billing platform, the process for adding a billing manager is different. See [AUTOTITLE](/billing/managing-your-billing/roles-for-the-new-billing-platform#inviting-a-billing-manager). - -{% endif %} - -{% ifversion ghec %} - -If your organization is owned by an enterprise account, you cannot invite billing managers at the organization level. For more information, see [AUTOTITLE](/admin/overview/about-enterprise-accounts). - -{% endif %} +>[!NOTE] If your organization is owned by an enterprise account, you cannot invite billing managers at the organization level. For more information, see [AUTOTITLE](/admin/overview/about-enterprise-accounts). The invited person will receive an invitation email asking them to become a billing manager for your organization. Once the invited person clicks the accept link in their invitation email, they will automatically be added to the organization as a billing manager. If they don't already have a {% data variables.product.prodname_dotcom %} account, they will be directed to sign up for one, and they will be automatically added to the organization as a billing manager after they create an account. -{% data reusables.organizations.billing-settings %} -1. Under "Billing management", next to "Billing managers", click **Add**. -1. Type the username or email address of the person you want to add and click **Send invitation**. +{% data reusables.organizations.navigate-to-org %} +{% data reusables.organizations.org_settings %} +1. In the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**, then click **Additional billing details**. +1. Next to "Billing managers", click **Invite**. ## Further reading diff --git a/content/search-github/searching-on-github/searching-code.md b/content/search-github/searching-on-github/searching-code.md index d5fb9c92f8b9..b1a32d2361f0 100644 --- a/content/search-github/searching-on-github/searching-code.md +++ b/content/search-github/searching-on-github/searching-code.md @@ -42,6 +42,7 @@ Due to the complexity of searching code, there are some restrictions on how sear * Up to 4,000 private{% ifversion ghec or ghes %} and internal{% endif %} repositories are searchable. These 4,000 repositories will be the most recently updated of the first 10,000 private{% ifversion ghec or ghes %} and internal{% endif %} repositories that you have access to. * Only repositories with fewer than 500,000 files are searchable.{% ifversion fpt or ghec %} * Only repositories that have had activity or have been returned in search results in the last year are searchable.{% endif %} +* Archived repositories are not searchable. * Except with [`filename`](#search-by-filename) searches, you must always include at least one search term when searching source code. For example, searching for [`language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=language%3Ajavascript&type=Code&ref=searchresults) is not valid, while [`amazing language:javascript`](https://github.com/search?utf8=%E2%9C%93&q=amazing+language%3Ajavascript&type=Code&ref=searchresults) is. * At most, search results can show two fragments from the same file, but there may be more results within the file. * You can't use the following wildcard characters as part of your search query: . , : ; / \ ` ' " = * ! ? # $ & + ^ | ~ < > ( ) { } [ ] @. The search will simply ignore these symbols. diff --git a/data/features/dependabot-vcpkg-support.yml b/data/features/dependabot-vcpkg-support.yml new file mode 100644 index 000000000000..6bb39919a2c2 --- /dev/null +++ b/data/features/dependabot-vcpkg-support.yml @@ -0,0 +1,6 @@ +# Reference: #19113 +# vcpkg support for Dependabot +versions: + fpt: '*' + ghec: '*' + ghes: '>= 3.20' diff --git a/data/reusables/actions/github-token-scope-descriptions.md b/data/reusables/actions/github-token-scope-descriptions.md index 552b1a9f2453..e60282deef5c 100644 --- a/data/reusables/actions/github-token-scope-descriptions.md +++ b/data/reusables/actions/github-token-scope-descriptions.md @@ -25,5 +25,5 @@ Available permissions and details of what each allows an action to do: | {% ifversion projects-v1 %} | | `repository-projects` | Work with GitHub projects (classic). For example, `repository-projects: write` permits an action to add a column to a project (classic). For more information, see [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-projects). | | {% endif %} | -| `security-events` | Work with GitHub code scanning and Dependabot alerts. For example, `security-events: read` permits an action to list the Dependabot alerts for the repository, and `security-events: write` allows an action to update the status of a code scanning alert. For more information, see [Repository permissions for 'Code scanning alerts'](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-code-scanning-alerts) and [Repository permissions for 'Dependabot alerts'](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-dependabot-alerts) in "Permissions required for GitHub Apps." | +| `security-events` | Work with GitHub code scanning alerts. For example, `security-events: read` permits an action to list the code scanning alerts for the repository, and `security-events: write` allows an action to update the status of a code scanning alert. For more information, see [Repository permissions for 'Code scanning alerts'](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-code-scanning-alerts).

Dependabot and secret scanning alerts cannot be read with this permission and require a GitHub App or a {% data variables.product.pat_generic %}. For more information, see [Repository permissions for 'Dependabot alerts'](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-dependabot-alerts) and [Repository permissions for 'Secret scanning alerts'](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-secret-scanning-alerts) in "Permissions required for GitHub Apps." | | `statuses` | Work with commit statuses. For example, `statuses:read` permits an action to list the commit statuses for a given reference. For more information, see [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-commit-statuses). | diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md index 95f05a58a318..619a7d9cf945 100644 --- a/data/reusables/dependabot/supported-package-managers.md +++ b/data/reusables/dependabot/supported-package-managers.md @@ -35,6 +35,9 @@ poetry | `pip` | v1 | {% octicon "check" aria-l [Swift](#swift) | `swift` | v5 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} (git only) | {% octicon "x" aria-label="Not supported" %} | [Terraform](#terraform) | `terraform` | >= 0.13, <= 1.10.x | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable | uv | `uv` | v0 | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable | +| {% ifversion dependabot-vcpkg-support %} | +[vcpkg](#vcpkg) | `vcpkg` | Not applicable | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | Not applicable | +| {% endif %} | [yarn](#yarn) | `npm` | v1, v2, v3 | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}| > [!TIP] @@ -161,6 +164,14 @@ Terraform support includes: * Terraform providers. * Private Terraform Registry. You can configure access for private git repositories by specifying a git registry in your `dependabot.yml` file. For more information, see [`git`](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#git). +{% ifversion dependabot-vcpkg-support %} + +#### vcpkg + +vcpkg support includes updating the `builtin-baseline` commit SHA from the vcpkg ports repository in your `vcpkg.json` manifest file. For more information visit the [`microsoft/vcpkg` repository](https://github.com/microsoft/vcpkg) on {% data variables.product.prodname_dotcom_the_website %} and see [What is manifest mode?](https://learn.microsoft.com/vcpkg/concepts/manifest-mode) in the Microsoft documentation. + +{% endif %} + #### yarn Dependabot supports vendored dependencies for v2 onwards. diff --git a/data/reusables/gated-features/enterprise-invoices.md b/data/reusables/gated-features/enterprise-invoices.md new file mode 100644 index 000000000000..4d663241e286 --- /dev/null +++ b/data/reusables/gated-features/enterprise-invoices.md @@ -0,0 +1,4 @@ +Enterprise owners and billing managers of invoiced customers of {% data variables.product.prodname_enterprise %}. + +* Customers who pay directly via credit card, PayPal, or Azure subscription, should instead see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/managing-your-payment-and-billing-information) in the {% data variables.product.prodname_ghe_cloud %} docs{% endif %} +* {% data variables.product.prodname_ghe_server %} customers with no enterprise account on {% data variables.product.prodname_dotcom_the_website %} should go to the [{% data variables.product.prodname_enterprise %} website](https://enterprise.github.com/login) diff --git a/src/secret-scanning/data/public-docs.yml b/src/secret-scanning/data/public-docs.yml index 50dd02794faf..c95198b8e513 100644 --- a/src/secret-scanning/data/public-docs.yml +++ b/src/secret-scanning/data/public-docs.yml @@ -661,17 +661,6 @@ hasPushProtection: true hasValidityCheck: false isduplicate: true -- provider: Azure - supportedSecret: Azure Dummy Key - secretType: azure_dummy_key - versions: - fpt: '*' - ghec: '*' - isPublic: true - isPrivateWithGhas: true - hasPushProtection: true - hasValidityCheck: false - isduplicate: false - provider: Azure supportedSecret: Azure Event Grid Key Identifiable secretType: azure_event_grid_key_identifiable diff --git a/src/secret-scanning/lib/config.json b/src/secret-scanning/lib/config.json index 121639746318..940908203d93 100644 --- a/src/secret-scanning/lib/config.json +++ b/src/secret-scanning/lib/config.json @@ -1,5 +1,5 @@ { - "sha": "7787a9f3683c2c867602a71115dcb43a15db4a43", - "blob-sha": "1c54a228f919d3c30996f83bc4bc9ea3e616ebb3", + "sha": "e9db261f89fa9b90aa7b258588b45f1731b6e810", + "blob-sha": "30877731584d1ff3569726a0444a4a24a63a8440", "targetFilename": "code-security/secret-scanning/introduction/supported-secret-scanning-patterns" } \ No newline at end of file