Skip to content

Commit 28e29ad

Browse files
docs-botdocs-bot
authored
Merge pull request #39901 from github/repo-sync
Repo sync
2 parents d7ee3dd + ef7d0f4 commit 28e29ad

File tree

13 files changed

+437
-140
lines changed

13 files changed

+437
-140
lines changed

‎content/admin/all-releases.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,32 @@ We provide documentation for both supported and unsupported versions of {% data
2020

2121
For information about the latest release, see the [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise) website.
2222

23-
| Version | Release | {% data variables.release-phases.closing_down_caps %} date | Supported | Release notes | Documentation |
24-
| :- | :- | :- | :-: | :- | :- |
23+
| Version | Candidate | Release | {% data variables.release-phases.closing_down_caps %} date | Supported | Release notes | Docs |
24+
| :- | :- | :- | :- | :-: | :- | :- |
2525
{%- for version in enterpriseServerReleases.supported %}
26-
{%- assign currentDate = 'now' | date: '%s' %}
27-
{%- assign deprecationDate = enterpriseServerReleases.dates[version].deprecationDate | date: '%s' %}
28-
| {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | Support temporarily extended until further notice | {% octicon "check" aria-label="Supported" %} | [{{version}} release notes](/enterprise-server@{{version}}/admin/release-notes) | [{{version}} documentation](/enterprise-server@{{version}}) |
26+
| {{version}} | {{enterpriseServerReleases.dates[version].displayCandidateDate}} | {{enterpriseServerReleases.dates[version].displayReleaseDate}} | Support temporarily extended until further notice | {% octicon "check" aria-label="Supported" %} | [{{version}} release notes](/enterprise-server@{{version}}/admin/release-notes) | [{{version}} docs](/enterprise-server@{{version}}) |
2927
{%- endfor %}
3028
{%- for version in enterpriseServerReleases.deprecatedReleasesWithNewFormat %}
31-
| {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | {% octicon "x" aria-label="Not supported" %} | [{{version}} release notes](/enterprise-server@{{version}}/admin/release-notes) | [{{version}} documentation](/enterprise-server@{{version}}) |
29+
{%- assign candidateDisplay = enterpriseServerReleases.dates[version].displayCandidateDate | default: enterpriseServerReleases.dates[version].releaseDate %}
30+
{%- assign releaseDisplay = enterpriseServerReleases.dates[version].displayReleaseDate | default: enterpriseServerReleases.dates[version].releaseDate %}
31+
| {{version}} | {{candidateDisplay}} | {{releaseDisplay}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | {% octicon "x" aria-label="Not supported" %} | [{{version}} release notes](/enterprise-server@{{version}}/admin/release-notes) | [{{version}} docs](/enterprise-server@{{version}}) |
3232
{%- endfor %}
3333
{%- for version in enterpriseServerReleases.deprecatedReleasesWithLegacyFormat %}
34-
| {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | {% octicon "x" aria-label="Not supported" %} | [{{version}} release notes](https://enterprise.github.com/releases/series/{{version}}) | [{{version}} documentation](/enterprise/{{version}}) |
34+
{%- assign candidateDisplay = enterpriseServerReleases.dates[version].displayCandidateDate | default: enterpriseServerReleases.dates[version].releaseDate %}
35+
{%- assign releaseDisplay = enterpriseServerReleases.dates[version].displayReleaseDate | default: enterpriseServerReleases.dates[version].releaseDate %}
36+
| {{version}} | {{candidateDisplay}} | {{releaseDisplay}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | {% octicon "x" aria-label="Not supported" %} | [{{version}} release notes](https://enterprise.github.com/releases/series/{{version}}) | [{{version}} docs](/enterprise/{{version}}) |
3537
{%- endfor %}
3638

3739
### Developer documentation that is {% data variables.release-phases.closing_down %}
3840

3941
We hosted developer documentation for {% data variables.product.prodname_ghe_server %} on a separate site until the 2.17 release. We provide developer documentation for version 2.16 and earlier, but do not maintain or update the documentation.
4042

41-
| Version | Release | {% data variables.release-phases.closing_down_caps %} date | Developer documentation |
42-
| :- | :- | :- | :- |
43+
| Version | Candidate | Release | {% data variables.release-phases.closing_down_caps %} date | Developer docs |
44+
| :- | :- | :- | :- | :- |
4345
{%- for version in enterpriseServerReleases.deprecatedReleasesOnDeveloperSite %}
44-
| {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | [{{version}} developer documentation](https://developer.github.com/enterprise/{{version}}) |
46+
{%- assign candidateDisplay = enterpriseServerReleases.dates[version].displayCandidateDate | default: enterpriseServerReleases.dates[version].releaseDate %}
47+
{%- assign releaseDisplay = enterpriseServerReleases.dates[version].displayReleaseDate | default: enterpriseServerReleases.dates[version].releaseDate %}
48+
| {{version}} | {{candidateDisplay}} | {{releaseDisplay}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | [{{version}} developer docs](https://developer.github.com/enterprise/{{version}}) |
4549
{%- endfor %}
4650

4751
## Recommended {% data variables.product.prodname_codeql_cli %} versions for code scanning

‎content/billing/concepts/enterprise-billing/usage-based-licenses.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,28 @@ Usage-based billing for licenses provides flexibility and cost savings compared
3131

3232
{% data reusables.billing.do-i-have-usage-based %}
3333

34-
{% data variables.visual_studio.prodname_vss_ghe %} is currently not supported for usage-based billing.
35-
3634
## Can I use {% data variables.product.prodname_ghe_server %}?
3735

3836
Although you can sync licenses with {% data variables.product.prodname_ghe_server %}, usage-based licensing is a cloud-first license model where users must first be added to an organization on {% data variables.product.prodname_ghe_cloud %}.
3937

4038
For a detailed comparison between usage-based and volume licensing models, see [AUTOTITLE](/billing/concepts/enterprise-billing/combined-enterprise-use#about-licensing-models).
4139

40+
## Can I use a {% data variables.product.prodname_vs %} bundle?
41+
42+
If you have a {% data variables.product.prodname_vs %} bundle with {% data variables.product.prodname_ghe_cloud %}, you can switch to usage-based billing by contacting your account manager or {% data variables.contact.contact_enterprise_sales %} ahead of contract renewal.
43+
44+
Usage-based billing will apply to non-bundled licenses, categorized as "GitHub Enterprise licenses" on your enterprise's Licensing page. These licenses include:
45+
46+
* Licenses for enterprise members who are not matched to a {% data variables.product.prodname_vs %} account.
47+
* Any extra {% data variables.product.prodname_enterprise %} licenses you consume beyond the number of licenses purchased in your volume agreement.
48+
49+
Bundled licenses ({% data variables.product.prodname_vs %} plus {% data variables.product.prodname_enterprise %}) **remain on a volume agreement**.
50+
51+
Before switching to usage-based billing, to ensure you are not charged extra for {% data variables.product.prodname_vs %} users who should consume a bundled license:
52+
53+
* Ensure all {% data variables.product.prodname_vs %} users are correctly matched to their account on {% data variables.product.github %}. See [AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/set-up-payment/set-up-vs-subscription#reconciling-users-across-visual-studio-and-github).
54+
* Add all {% data variables.product.prodname_vs %} users to your enterprise on **{% data variables.product.prodname_ghe_cloud %}** before adding them to {% data variables.product.prodname_ghe_server %}. Users who are only on {% data variables.product.prodname_ghe_server %} will consume a "{% data variables.product.prodname_enterprise %}" license once you switch to usage-based billing.
55+
4256
## How are metered licenses measured?
4357

4458
{% data reusables.billing.metered-license-measures %}

‎content/billing/concepts/enterprise-billing/visual-studio-subs.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ shortTitle: Visual Studio subs
2222
contentType: concepts
2323
---
2424

25-
> [!NOTE] Usage-based billing is not currently supported for {% data variables.visual_studio.prodname_vss_ghe %}.
25+
> [!NOTE] Customers with a {% data variables.product.prodname_vs %} bundle can **switch to usage-based billing** for {% data variables.product.prodname_enterprise %} licenses. This allows you to pay for licenses on a flexible monthly cycle for users who are not part of your {% data variables.product.prodname_vs %} subscription. See [AUTOTITLE](/billing/concepts/enterprise-billing/usage-based-licenses).
2626
2727
{% data reusables.enterprise-accounts.vss-ghe-description %} {% data variables.visual_studio.prodname_vss_ghe %} is available from Microsoft under the terms of the Microsoft Enterprise Agreement. For more information, see [{% data variables.visual_studio.prodname_vss_ghe %}](https://visualstudio.microsoft.com/subscriptions/visual-studio-github/) on the {% data variables.product.prodname_vs %} website.
2828

@@ -46,7 +46,9 @@ For more information about {% data variables.product.prodname_enterprise %}, see
4646

4747
{% data reusables.enterprise.ghe-includes-ghec-and-ghes %} For more information, see [AUTOTITLE](/admin/overview/about-github-for-enterprises#about-deployment-options).
4848

49-
For users only on {% data variables.product.prodname_ghe_server %}, each {% data variables.product.prodname_vs %} subscriber will only consume one license as long as the email address associated with their {% data variables.product.prodname_ghe_server %} account matches their {% data variables.product.prodname_vs %} UPN. For users on both {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}, only one license will be consumed as long as you follow the instructions in the 'About licenses for {% data variables.visual_studio.prodname_vss_ghec %}' section, and the user's accounts are linked as described in [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
49+
For users only on {% data variables.product.prodname_ghe_server %}, each {% data variables.product.prodname_vs %} subscriber will only consume one license as long as the email address associated with their {% data variables.product.prodname_ghe_server %} account matches their {% data variables.product.prodname_vs %} UPN. This does not apply if you have switched to **usage-based billing**, in which case users must also be on {% data variables.product.prodname_ghe_cloud %} to consume a bundled license.
50+
51+
For users on both {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}, only one license will be consumed as long as you follow the instructions in the 'About licenses for {% data variables.visual_studio.prodname_vss_ghec %}' section, and the user's accounts are linked as described in [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
5052

5153
## Further reading
5254

‎content/billing/how-tos/set-up-payment/set-up-vs-subscription.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ shortTitle: Set up VS subscription
1616
contentType: how-tos
1717
---
1818

19+
> [!NOTE] Customers with a {% data variables.product.prodname_vs %} bundle can **switch to usage-based billing** for {% data variables.product.prodname_enterprise %} licenses. This allows you to pay for licenses on a flexible monthly cycle for users who are not part of your {% data variables.product.prodname_vs %} subscription. See [AUTOTITLE](/billing/concepts/enterprise-billing/usage-based-licenses).
20+
1921
{% 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).
2022

2123
## Prerequisites

0 commit comments

Comments
 (0)