Fix versioning and procedures for GitHub Enterprise licensing views (#…

…16083)

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

@@ -99,9 +99,10 @@ You can use these steps to create and share a support bundle if you have SSH acc
 
 #### Uploading a support bundle using your enterprise account
 
-{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
+3. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
 4. Under "{% data variables.product.prodname_enterprise %} Help", click **Upload a support bundle**.
   ![Upload a support bundle link](/assets/images/enterprise/support/upload-support-bundle.png)
 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

@@ -23,9 +23,10 @@ After submitting your support request and optional diagnostic information, {% da
 
 ### Submitting a ticket using your enterprise account
 
-{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
+3. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
 4. Under "{% data variables.product.prodname_enterprise %} Help", click **{% data variables.contact.enterprise_support %} Portal**.
   ![Link to navigate to Enterprise support site](/assets/images/enterprise/support/enterprise-support-link.png)
 5. Click **Submit a Ticket**

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

@@ -30,9 +30,10 @@ After you purchase a new license or upgrade an existing license from {% data var
 
 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.
 
-{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
+3. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
 4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file.
   ![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png)
 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
 
 ### Viewing license usage
 
-{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
+3. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
 4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
 
 ### 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
 {% data reusables.enterprise-accounts.license-tab %}
 5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**.
   ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png)
-6. Navigate to {% data variables.product.prodname_ghe_cloud %}.
-{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
+8. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
+{% data reusables.enterprise-accounts.license-tab %}
 10. Under "Enterprise Server Instances", click **Add server usage**.
   ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png)
 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

@@ -27,6 +27,8 @@ For more information about member access and management, see "[Managing users in
 
 For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/v4/guides/managing-enterprise-accounts)."
 
+{% if currentVersion == "free-pro-team@latest" %}
+
 ### Managing organizations linked to your enterprise account
 
 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
 
 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)."
 
+{% endif %}
+
 ### Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account
 
 {% data reusables.enterprise-accounts.admin-managing-licenses %}

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

@@ -6,6 +6,7 @@ redirect_from:
   - /categories/setting-up-and-managing-your-enterprise-account
 versions:
   free-pro-team: '*'
+  enterprise-server: '*'
 ---
 
 

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

@@ -6,6 +6,5 @@ redirect_from:
   - /articles/managing-organizations-in-your-enterprise-account
 versions:
   free-pro-team: '*'
-  enterprise-server: '*'
 ---
 

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

@@ -6,5 +6,6 @@ redirect_from:
   - /articles/managing-your-enterprise-account
 versions:
   free-pro-team: '*'
+  enterprise-server: '*'
 ---
 

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

@@ -6,6 +6,5 @@ redirect_from:
   - /articles/setting-policies-for-organizations-in-your-enterprise-account
 versions:
   free-pro-team: '*'
-  enterprise-server: '*'
 ---
 

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

@@ -18,7 +18,8 @@ Enterprise accounts are currently available to {% data variables.product.prodnam
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.enterprise-licensing-tab %}
-4. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date.
-  ![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png)
-5. To view details of the user licenses currently in use, click **View details**.
+{% data reusables.enterprise-accounts.license-tab %}
+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.
+  {% if currentVersion == "free-pro-team@latest" %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %}
+  ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprises/enterprise-server-billing-license-info.png){% endif %}
+5. To view details of the user licenses currently in use, click **View {% if currentVersion == "free-pro-team@latest" %}details{% else %}users{% endif %}**.

data/reusables/enterprise-accounts/access-enterprise-on-dotcom.md

@@ -0,0 +1,7 @@
+1. Navigate to {% data variables.product.prodname_dotcom_the_website %}.
+
+1. In the top-right corner of {% data variables.product.prodname_dotcom_the_website %}, click your profile photo, then click **Your enterprises**.
+  !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png)
+
+1. In the list of enterprises, click the enterprise you want to view.
+    ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)

data/reusables/enterprise-accounts/access-enterprise.md

@@ -1,5 +1,20 @@
+{% if currentVersion == "free-pro-team@latest" %}
+
 1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your enterprises**.
-  !["Your enterprises" in drop-down menu for profile photo on GitHub](/assets/images/help/enterprises/your-enterprises.png)
+  !["Your enterprises" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/help/enterprises/your-enterprises.png)
 
 1. In the list of enterprises, click the enterprise you want to view.
-  ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)
+    ![Name of an enterprise in list of your enterprises](/assets/images/help/enterprises/your-enterprises-list.png)
+
+{% endif %}
+
+{% if currentVersion ver_lt "[email protected]" %}
+
+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.
+
+{% elsif enterpriseServerVersions contains currentVersion %}
+
+1. In the top-right corner of {% data variables.product.product_name %}, click your profile photo, then click **Enterprise settings**.
+    !["Enterprise settings" in drop-down menu for profile photo on {% data variables.product.product_name %}](/assets/images/enterprise/settings/enterprise-settings.png)
+
+{% endif %}

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

@@ -1,2 +1,11 @@
+{% if currentVersion == "free-pro-team@latest" %}
+
+1. In the left sidebar, click **Enterprise licensing**.
+  !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png)
+
+{% else %}
+
 1. In the left sidebar, click **License**.
-  ![License tab in the enterprise server settings sidebar](/assets/images/enterprise/business-accounts/license-tab.png)
+  !["License" tab in the enterprise account settings sidebar](/assets/images/enterprise/enterprises/license.png)
+
+{% endif %}