[EDI] Expand GHEC-only Copilot articles to FPT (#56685)

content/copilot/concepts/completions/text-completion.md

@@ -4,7 +4,7 @@ shortTitle: Text completion
 allowTitleToDifferFromFilename: true
 intro: 'Learn about {% data variables.copilot.copilot_autocomplete_pr %}.'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 permissions: 'Members of an enterprise with a subscription to [{% data variables.copilot.copilot_enterprise %}](/copilot/github-copilot-enterprise/overview/about-github-copilot-enterprise)'
 topics:
   - Copilot

content/copilot/concepts/copilot-billing/about-billing-for-github-copilot-in-your-enterprise.md

@@ -49,7 +49,7 @@ A {% data variables.product.prodname_copilot %} seat is a license to use {% data
 
 If a single user receives a seat from multiple organizations in the same enterprise, the enterprise will only be billed once per billing cycle for that unique 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.
 
-Seat assignment is managed by owners of organizations{% ifversion ghec %} that have been granted access to {% data variables.product.prodname_copilot %} at the enterprise level{% endif %}. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization).
+Seat assignment is managed by owners of organizations that have been granted access to {% data variables.product.prodname_copilot %} at the enterprise level. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization).
 
 If you are a member of an organization or enterprise with a {% data variables.product.prodname_copilot %} plan, to use the plan, you will need to be assigned a seat by an organization owner.
 

content/copilot/how-tos/administer/enterprises/index.md

@@ -3,7 +3,7 @@ title: Managing GitHub Copilot in your enterprise
 shortTitle: Manage for enterprise
 intro: 'Enterprise owners can subscribe to {% data variables.product.prodname_copilot_short %}, manage {% data variables.product.prodname_copilot_short %} for organizations in the enterprise, and control {% data variables.product.prodname_copilot_short %} policies.'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 children:

content/copilot/how-tos/administer/enterprises/managing-access-to-copilot-in-your-enterprise/disabling-copilot-for-organizations-in-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'Disable {% data variables.product.prodname_copilot %} for some or all of
 permissions: Enterprise owners
 product: 'Enterprises with a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} plan'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/administer/enterprises/managing-access-to-copilot-in-your-enterprise/enabling-copilot-for-organizations-in-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'Enable {% data variables.product.prodname_copilot %} for some or all of
 permissions: Enterprise owners
 product: 'Enterprises with a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} plan'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/administer/enterprises/managing-access-to-copilot-in-your-enterprise/index.md

@@ -3,7 +3,7 @@ title: Managing access to Copilot in your enterprise
 shortTitle: Manage access
 intro: 'Enterprise owners can manage {% data variables.product.prodname_copilot_short %} for organizations in the enterprise.'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 children:

content/copilot/how-tos/administer/enterprises/managing-access-to-copilot-in-your-enterprise/managing-github-copilot-access-to-your-enterprises-network.md

@@ -4,7 +4,7 @@ intro: 'Learn how to use subscription-based network routing to control {% data v
 permissions: Enterprise owners
 product: '{% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %}'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 shortTitle: Manage network access

content/copilot/how-tos/administer/enterprises/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise.md

@@ -1,11 +1,11 @@
 ---
 title: Viewing Copilot license usage in your enterprise
 shortTitle: View license usage
-intro: 'View how many users have access to {% data variables.product.prodname_copilot %} across {% ifversion fpt %}your organization{% else %} all the organizations in your enterprise{% endif %}.'
+intro: 'View how many users have access to {% data variables.product.prodname_copilot %} across your enterprise.'
 product: 'Enterprises with a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} plan'
 permissions: Enterprise owners
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 type: how_to
 topics:
   - Copilot
@@ -16,45 +16,10 @@ redirect_from:
   - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise
 ---
 
-## About your {% data variables.product.prodname_copilot %} usage
-
-If you have a {% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %} plan, you can view usage information for {% data variables.product.prodname_copilot_short %} in your {% ifversion ghec %}enterprise, broken down by organization, or in your{% endif %} organization, broken down by seat assignment status. {% ifversion ghec %}At the enterprise level, this information includes the number of seats assigned in each organization, and the total spending associated with each organization, for the current billing cycle.{% endif %} At the organization level, this information includes the total number of seats, seats carried over from the previous billing cycle, new seats added during the current cycle, and seats to be removed at the end of the current cycle.
-
-{% ifversion ghec %}
-
-## Viewing {% data variables.product.prodname_copilot_short %} license usage at the enterprise-level
+If you have a {% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %} plan, you can view usage information for {% data variables.product.prodname_copilot_short %} in your enterprise. This information includes the number of seats assigned and the total spending for the current billing cycle.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.billing-tab %}
-1. Under "{% data variables.product.prodname_copilot_short %} monthly usage," view the breakdown of your {% data variables.product.prodname_copilot %} usage.
+1. Scroll to the bottom of the page and click the **Copilot** tab.
 
-   ![Screenshot of enterprise-level billing, showing the section headed '{% data variables.product.prodname_copilot_short %} monthly usage.'](/assets/images/help/copilot/enterprise-level-seat-view.png)
-
-   The figures represent the billed seats so far for the current billing cycle. The seat usage so far this month is calculated as the number of seats, divided by the number of days in the current billing cycle, multiplied by the days elapsed so far in the billing cycle. So, if you have 5 seats assigned from the beginning of the billing cycle, and the current cycle is 30 days long, and it's the 10th day of the cycle, this figure will be 1.6666. On day 20, it will be 3.3333 and on the last day of the cycle, it will be 5.
-
-   The total spending for each organization for the current cycle will usually be the number of seats assigned, multiplied by the cost per seat. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#about-billing-for-github-copilot-business-and-github-copilot-enterprise). However, if the same organization member is assigned a seat in multiple organizations, their seat usage will be included for each organization, but the enterprise will only be charged once. The cost for this person will only be included in the organization where they were first assigned a seat.
-
-1. Optionally, to receive a CSV report by email detailing the usage of {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %}, and {% data variables.product.prodname_copilot %} for each of your enterprise account's organizations, under the billing summary at the top of the page click **Get usage report**. The report is sent to your account's primary email address.
-
-   ![Screenshot of the header of the billing settings page on GitHub. A button, labeled "Get usage report", is highlighted with an orange outline.](/assets/images/help/billing/actions-packages-report-download-enterprise.png)
-
-## Viewing {% data variables.product.prodname_copilot_short %} license usage at the organization-level
-
-{% else %}
-
-## Viewing your organization's use of {% data variables.product.prodname_copilot %}
-
-{% endif %}
-
-{% data reusables.profile.access_org %}
-{% data reusables.profile.org_settings %}
-1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**.
-1. Under "{% data variables.product.prodname_copilot_short %}", view the breakdown of your {% data variables.product.prodname_copilot %} usage and upcoming changes in your organization.
-
-   ![Screenshot of the organization-level {% data variables.product.prodname_copilot %} seat usage page.](/assets/images/help/copilot/org-level-seat-view.png)
-
-   The figure for Total Seats shows how many seats are currently assigned for {% data variables.product.prodname_copilot %}.
-
-1. Optionally, to download a CSV report detailing the usage of {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, {% data variables.product.prodname_github_codespaces %}, and {% data variables.product.prodname_copilot %} in your organization, next to "Usage this month", click **Get usage report**. An email containing a link for downloading the CSV report is sent to the primary email address for your account. You can choose whether the report should cover the last 7, 30, 90, or 180 days.
-   ![Screenshot of the "Billing and plans" settings. A button, labeled "Get usage report", is highlighted with an orange outline.](/assets/images/help/billing/actions-packages-report-download.png)
+   ![Screenshot of the Copilot usage tab in the enterprise billing settings.](/assets/images/help/copilot/copilot-usage-tab.png)

content/copilot/how-tos/administer/enterprises/managing-copilot-coding-agent-in-your-enterprise.md

@@ -5,7 +5,7 @@ allowTitleToDifferFromFilename: true
 permissions: Enterprise owners
 product: '{% data reusables.gated-features.copilot-coding-agent %}<br><a href="https://github.com/github-copilot/purchase?ref_cta=Copilot+Enterprise+trial&ref_cta=Copilot+Business+trial&ref_loc=making-cca-available-ent" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Sign up for {% data variables.product.prodname_copilot_short %}</span> {% octicon "link-external" height:16 %}</a>'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 shortTitle: 'Manage {% data variables.copilot.copilot_coding_agent %}'

content/copilot/how-tos/administer/enterprises/managing-policies-and-features-for-copilot-in-your-enterprise.md

@@ -4,7 +4,7 @@ intro: 'Control the availability of features for {% data variables.product.prodn
 permissions: Enterprise owners
 product: '{% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %}'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 allowTitleToDifferFromFilename: true
 type: how_to
 topics:

content/copilot/how-tos/administer/enterprises/managing-the-copilot-plan-for-your-enterprise/canceling-copilot-for-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'Disabling {% data variables.product.prodname_copilot %} for all organiza
 permissions: Enterprise admins
 product: '{% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %}'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/administer/enterprises/managing-the-copilot-plan-for-your-enterprise/downgrading-copilot-for-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'You can downgrade organizations in your enterprise from {% data variable
 permissions: Enterprise owners
 product: 'Enterprises with a {% data variables.copilot.copilot_enterprise_short %} plan'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/administer/enterprises/managing-the-copilot-plan-for-your-enterprise/index.md

@@ -3,7 +3,7 @@ title: Managing the Copilot plan for your enterprise
 shortTitle: Manage plan
 intro: 'Enterprise owners can manage the {% data variables.product.prodname_copilot_short %} plan for the enterprise.'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 children:

content/copilot/how-tos/administer/enterprises/managing-the-copilot-plan-for-your-enterprise/subscribing-to-copilot-for-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'Enterprise owners can set up a {% data variables.copilot.copilot_enterpr
 permissions: Enterprise owners
 product: 'Enterprises on {% data variables.product.prodname_ghe_cloud %}'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/administer/enterprises/managing-the-copilot-plan-for-your-enterprise/upgrading-copilot-for-your-enterprise.md

@@ -5,7 +5,7 @@ intro: 'Change your enterprise''s plan from {% data variables.copilot.copilot_bu
 permissions: Enterprise owners
 product: 'Enterprises with a {% data variables.copilot.copilot_business_short %} plan'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/ai-models/creating-a-custom-model-for-github-copilot.md

@@ -5,7 +5,7 @@ intro: 'You can fine-tune {% data variables.product.prodname_copilot_short %} co
 permissions: 'Owners of organizations enrolled in the {% data variables.release-phases.public_preview %}.'
 product: '{% data reusables.copilot.ce-product-callout %}'
 versions:
-  feature: copilot-custom-models
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

content/copilot/how-tos/completions/using-copilot-text-completion.md

@@ -4,7 +4,7 @@ shortTitle: Write PR descriptions
 allowTitleToDifferFromFilename: true
 intro: 'Write pull request descriptions more quickly and accurately with {% data variables.copilot.copilot_autocomplete_pr %}.'
 versions:
-  feature: copilot-enterprise
+  feature: copilot
 type: how_to
 permissions: 'Members of an enterprise with a subscription to [{% data variables.copilot.copilot_enterprise %}](/copilot/github-copilot-enterprise/overview/about-github-copilot-enterprise)'
 topics:

content/copilot/how-tos/custom-instructions/adding-organization-custom-instructions-for-github-copilot.md

@@ -5,7 +5,7 @@ intro: 'Customize {% data variables.copilot.copilot_chat %} responses for member
 permissions: Organization owners
 product: 'Organizations with a {% data variables.copilot.copilot_for_business %} or {% data variables.copilot.copilot_enterprise %} plan'
 versions:
-  feature: copilot-org-instructions
+  feature: copilot
 topics:
   - Copilot
 redirect_from:

data/features/horizontal-nav.yml

@@ -1,5 +1,6 @@
 # Reference: #17228
 # Move Enterprise navigation from left sidebar to top of page
 versions:
+  fpt: '*'
   ghec: '*'
   ghes: '>3.16'

data/reusables/copilot/sku-isolation.md

@@ -1,6 +1,6 @@
 ## About {% data variables.copilot.copilot_sku_isolation %}
 
-As an {% ifversion ghec %}enterprise or {% endif %}organization owner, you can use your network firewall to explicitly allow access to {% data variables.copilot.copilot_for_business %}{% ifversion ghec %} or {% data variables.copilot.copilot_enterprise %}, or both{% endif %}, and/or block access to {% data variables.copilot.copilot_pro %} or {% data variables.copilot.copilot_free %}. This allows you to control which {% data variables.product.prodname_copilot %} plans your members can use within your network.
+As an enterprise or organization owner, you can use your network firewall to explicitly allow access to {% data variables.copilot.copilot_for_business %}, {% data variables.copilot.copilot_enterprise %}, or both, and/or block access to {% data variables.copilot.copilot_pro %} or {% data variables.copilot.copilot_free %}. This allows you to control which {% data variables.product.prodname_copilot %} plans your members can use within your network.
 
 Configuring {% data variables.copilot.copilot_sku_isolation %} will affect the following {% data variables.product.prodname_copilot_short %} features:
 
@@ -16,12 +16,11 @@ Configuring {% data variables.copilot.copilot_sku_isolation %} will affect the f
 
 You should ensure that your firewall allows access to all of the hostnames listed in [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/configuring-your-proxy-server-or-firewall-for-copilot).
 
-## Configuring {% data variables.copilot.copilot_sku_isolation %} for your {% ifversion ghec %}enterprise or {% endif %}organization
+## Configuring {% data variables.copilot.copilot_sku_isolation %} for your enterprise or organization
 
-{% ifversion ghec %}Enterprise or organization {% else %}Organization {% endif %}owners can add the endpoints for {% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %}{% ifversion ghec %}, or both,{% endif %} to their allow-list. This will ensure that members can only access {% data variables.product.prodname_copilot_short %} through the allowed endpoint.
+Enterprise or organization owners can add the endpoints for {% data variables.copilot.copilot_business_short %}, {% data variables.copilot.copilot_enterprise_short %}, or both to their allow-list. This will ensure that members can only access {% data variables.product.prodname_copilot_short %} through the allowed endpoint.
 
-{% ifversion ghec %}
-> [!NOTE] If your enterprise account includes both {% data variables.copilot.copilot_business_short %} and {% data variables.copilot.copilot_enterprise_short %} plans, make sure both endpoints are added to your allow-list.{% endif %}
+> [!NOTE] If your enterprise account includes both {% data variables.copilot.copilot_business_short %} and {% data variables.copilot.copilot_enterprise_short %} plans, make sure both endpoints are added to your allow-list.
 
 1. Ensure your members have updated to at least the minimum version of their {% data variables.product.prodname_copilot_short %} client listed below.
     * For {% data variables.product.prodname_vscode %}, use {% data variables.copilot.copilot_chat_short %} version 0.17 or later.

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

@@ -1,4 +1,4 @@
-{%- ifversion ghec %}
+{%- ifversion fpt or ghec %}
 1. In the top-right corner of {% data variables.product.prodname_dotcom %}, click your profile picture.
 1. Depending on your environment, click **Your enterprise**, or click **Your enterprises** then click the enterprise you want to view.
 {%- elsif ghes %}