Skip to content

Commit 954dc04

Browse files
authored
repo sync
2 parents ff9ac81 + 8c8968b commit 954dc04

19 files changed

+61
-22
lines changed
Binary file not shown.
Loading
27.2 KB
Loading
Loading
Loading
Loading

content/admin/enterprise-support/providing-data-to-github-support.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ You can use these steps to create and share a support bundle if you have SSH acc
9999

100100
#### Uploading a support bundle using your enterprise account
101101

102-
{% data reusables.enterprise-accounts.access-enterprise %}
102+
{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
103103
{% data reusables.enterprise-accounts.settings-tab %}
104-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
104+
3. In the left sidebar, click **Enterprise licensing**.
105+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
105106
4. Under "{% data variables.product.prodname_enterprise %} Help", click **Upload a support bundle**.
106107
![Upload a support bundle link](/assets/images/enterprise/support/upload-support-bundle.png)
107108
5. Under "Select an enterprise account", select the support bundle's associated account from the drop-down menu.

content/admin/enterprise-support/submitting-a-ticket.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ After submitting your support request and optional diagnostic information, {% da
2323

2424
### Submitting a ticket using your enterprise account
2525

26-
{% data reusables.enterprise-accounts.access-enterprise %}
26+
{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
2727
{% data reusables.enterprise-accounts.settings-tab %}
28-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
28+
3. In the left sidebar, click **Enterprise licensing**.
29+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
2930
4. Under "{% data variables.product.prodname_enterprise %} Help", click **{% data variables.contact.enterprise_support %} Portal**.
3031
![Link to navigate to Enterprise support site](/assets/images/enterprise/support/enterprise-support-link.png)
3132
5. Click **Submit a Ticket**

content/admin/overview/managing-your-github-enterprise-license.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ After you purchase a new license or upgrade an existing license from {% data var
3030

3131
If you'd like to renew or add user licenses to {% data variables.product.prodname_enterprise %}, contact {% data variables.contact.contact_enterprise_sales %}. Your new license file will be available for download immediately after you complete your order.
3232

33-
{% data reusables.enterprise-accounts.access-enterprise %}
33+
{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
3434
{% data reusables.enterprise-accounts.settings-tab %}
35-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
35+
3. In the left sidebar, click **Enterprise licensing**.
36+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
3637
4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file.
3738
![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png)
3839
5. Log into your {% data variables.product.prodname_ghe_server %} instance as a site administrator.
@@ -49,9 +50,10 @@ If you'd like to renew or add user licenses to {% data variables.product.prodnam
4950

5051
### Viewing license usage
5152

52-
{% data reusables.enterprise-accounts.access-enterprise %}
53+
{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
5354
{% data reusables.enterprise-accounts.settings-tab %}
54-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
55+
3. In the left sidebar, click **Enterprise licensing**.
56+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
5557
4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
5658

5759
### Automatically syncing user license usage with {% data variables.product.prodname_ghe_cloud %}
@@ -68,10 +70,11 @@ You can download a JSON file from {% data variables.product.prodname_ghe_server
6870
{% data reusables.enterprise-accounts.license-tab %}
6971
5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**.
7072
![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png)
71-
6. Navigate to {% data variables.product.prodname_ghe_cloud %}.
72-
{% data reusables.enterprise-accounts.access-enterprise %}
73+
{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
7374
{% data reusables.enterprise-accounts.settings-tab %}
74-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
75+
8. In the left sidebar, click **Enterprise licensing**.
76+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
77+
{% data reusables.enterprise-accounts.license-tab %}
7578
10. Under "Enterprise Server Instances", click **Add server usage**.
7679
![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png)
7780
11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}.

content/github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ For more information about member access and management, see "[Managing users in
2727

2828
For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/v4/guides/managing-enterprise-accounts)."
2929

30+
{% if currentVersion == "free-pro-team@latest" %}
31+
3032
### Managing organizations linked to your enterprise account
3133

3234
Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information, see "[About organizations](/articles/about-organizations)."
@@ -35,6 +37,8 @@ Enterprise owners can create organizations and link them to the enterprise. Afte
3537

3638
For more information, see "[Managing organizations in your enterprise account](/articles/managing-organizations-in-your-enterprise-account)" and "[Setting policies for organizations in your enterprise account](/articles/setting-policies-for-organizations-in-your-enterprise-account)."
3739

40+
{% endif %}
41+
3842
### Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account
3943

4044
{% data reusables.enterprise-accounts.admin-managing-licenses %}

content/github/setting-up-and-managing-your-enterprise-account/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ redirect_from:
66
- /categories/setting-up-and-managing-your-enterprise-account
77
versions:
88
free-pro-team: '*'
9+
enterprise-server: '*'
910
---
1011

1112

content/github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ redirect_from:
66
- /articles/managing-organizations-in-your-enterprise-account
77
versions:
88
free-pro-team: '*'
9-
enterprise-server: '*'
109
---
1110

content/github/setting-up-and-managing-your-enterprise-account/managing-your-enterprise-account.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ redirect_from:
66
- /articles/managing-your-enterprise-account
77
versions:
88
free-pro-team: '*'
9+
enterprise-server: '*'
910
---
1011

content/github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ redirect_from:
66
- /articles/setting-policies-for-organizations-in-your-enterprise-account
77
versions:
88
free-pro-team: '*'
9-
enterprise-server: '*'
109
---
1110

content/github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ Enterprise accounts are currently available to {% data variables.product.prodnam
1818

1919
{% data reusables.enterprise-accounts.access-enterprise %}
2020
{% data reusables.enterprise-accounts.settings-tab %}
21-
{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
22-
4. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date.
23-
![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png)
24-
5. To view details of the user licenses currently in use, click **View details**.
21+
{% data reusables.enterprise-accounts.license-tab %}
22+
4. Under "User {% if currentVersion == "free-pro-team@latest" %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date.
23+
{% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %}
24+
![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %}
25+
5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
1. Navigate to {% data variables.product.prodname_dotcom_the_website %}.
2+
3+
1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**.
4+
!["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png)
5+
6+
1. In the list of enterprises, click the enterprise you want to view.
7+
![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)
Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1+
{% if currentVersion == "free-pro-team@latest" %}
2+
13
1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**.
2-
!["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png)
4+
!["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png)
35

46
1. In the list of enterprises, click the enterprise you want to view.
5-
![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)
7+
![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)
8+
9+
{% endif %}
10+
11+
{% if currentVersion ver_lt "enterprise-server@2.22" %}
12+
13+
1. Navigate to your enterprise account by visiting {% raw %}<code>https://<em>HOSTNAME</em>/enterprises/<em>ENTERPRISE-NAME</em></code>{% endraw %}, replacing `HOSTNAME` with your instance's hostname and `ENTERPRISE-NAME` with your enterprise account's name.
14+
15+
{% elsif enterpriseServerVersions contains currentVersion %}
16+
17+
1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**.
18+
!["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png)
19+
20+
{% endif %}

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

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1+
{% if currentVersion == "free-pro-team@latest" %}
2+
3+
1. In the left sidebar, click **Enterprise licensing**.
4+
!["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
5+
6+
{% else %}
7+
18
1. In the left sidebar, click **License**.
2-
![License tab in the enterprise server settings sidebar](/assets/images/enterprise/business-accounts/license-tab.png)
9+
!["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png)
10+
11+
{% endif %}

0 commit comments

Comments
 (0)