Merge pull request #37709 from github/repo-sync

Repo sync

Author: docs-bot

assets/images/help/copilot/chat-share-button.png

@@ -32,7 +32,7 @@ You can view the current license limits and usage for your enterprise.
 {% ifversion ghec %}
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
-   * The "{% data variables.product.prodname_GHAS %}" section shows details of the licenses you currently **consume**.
+   * The "{% data variables.product.prodname_AS %}" section shows details of the licenses you currently **consume**.
    * If you have a volume/subscription license, the number of licenses **available** to use is also displayed.
    * If you run out of licenses, for volume/subscription only, the section is red and reports "Limit exceeded." You should either reduce your use or purchase more licenses.
 
@@ -48,7 +48,7 @@ You can view the current license limits and usage for your enterprise.
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.license-tab %}
 
-   The "{% data variables.product.prodname_GHAS %}" section shows details of the current usage. You can see the total number of licenses used, as well as a table with the number of committers and unique committers for each organization.
+   The "{% data variables.product.prodname_AS %}" section shows details of the current usage. You can see the total number of licenses used, as well as a table with the number of committers and unique committers for each organization.
 
 1. Optionally, to see a detailed breakdown of usage by repositories within an organization, click an organization name to display the "Global code security settings" for the organization.
 

assets/images/help/security-configurations/current-sp-cs-license-usage.png

@@ -30,20 +30,23 @@ To learn about licensing for {% data variables.product.prodname_GH_cs_and_sp %},
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
 {% data reusables.security-configurations.view-configurations-page %}
-1. In the "Apply configurations" section, your current license usage will be displayed as:
-   {% ifversion ghas-products %}
-   `# {% data variables.product.prodname_secret_protection %} licenses • # {% data variables.product.prodname_code_security %} licenses in use{% ifversion ghec %} by YOUR-ENTERPRISE{% endif %}.`
+1. In the "Apply configurations" section, your current license usage will be displayed. {% ifversion ghas-products %}This screenshot shows metered usage. If you have bought a volume/subscription license, then the number of licenses available is also reported.
+
     ![Screenshot of the "Apply configurations" section. The current license use for the enterprise is outlined in dark orange.](/assets/images/help/security-configurations/current-sp-cs-license-usage.png)
    {% else %}
    `NUMBER-USED out of NUMBER-PURCHASED available GitHub Advanced Security licenses in use by YOUR-ENTERPRISE.`
     ![Screenshot of the "Apply configurations" section. The current license use for the enterprise is outlined in dark orange.](/assets/images/help/security-configurations/current-ghas-license-usage.png)
     {% endif %}
 
 1. Optionally, to find specific repositories in your organization, filter the repository table. To learn more, see [AUTOTITLE](/code-security/securing-your-organization/managing-the-security-of-your-organization/filtering-repositories-in-your-organization-using-the-repository-table).
+{% ifversion ghas-products %}
+<!--This functionality is shown in modal dialogs when you enable a security configuration following the release of separate SKUs for GHAS.-->
+{% else %}
 1. To quickly identify the number of licenses needed to enable {% data variables.product.prodname_GH_cs_and_sp %} on a specific repository, in that repository's row of the repository table, read "NUMBER licenses required".
 1. To view license usage for multiple repositories in your organization, select the repositories from the repository table. In the "Apply configurations" section, you will see the number of licenses required to apply {% data variables.product.prodname_GH_cs_and_sp %} to the repositories, as well as the number of licenses made available if you disable {% data variables.product.prodname_GH_cs_or_sp %} on those repositories.
 
     ![Screenshot of the "Apply configurations" section. The potential changes to GHAS license usage for the enterprise are outlined in dark orange.](/assets/images/help/security-configurations/ghas-licenses-used-or-freed.png)
+{% endif %}
 
 {% ifversion ghec %}
 > [!TIP]

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

@@ -19,7 +19,7 @@ When you adopt {% data variables.product.prodname_copilot %} in a company, you w
 
 This article helps you to decide whether to adopt {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %}.
 
-<a href="https://github.com/github-copilot/purchase" 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>
+<a href="https://github.com/github-copilot/purchase?ref_cta=Copilot+Enterprise+trial&ref_cta=Copilot+Business+trial&ref_loc=choosing+enterprise+plan" 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>
 
 ## About the plans
 

content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md

@@ -408,15 +408,18 @@ You can access {% data variables.product.prodname_copilot_short %}'s immersive v
 
 > [!NOTE] This feature is currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %}, this feature is only available to users without enterprise or team memberships.
 
-You can share {% data variables.product.prodname_copilot_chat_short %} conversations from the immersive view ([https://github.com/copilot](https://github.com/copilot)). Shared conversations are public or private (i.e. permission-based), for example, a conversation about a private repository. If you share a private conversation, the recipient must have the necessary permissions to view the content. Shared conversations are read-only—the recipient can view the conversation but cannot interact.
+You can share {% data variables.product.prodname_copilot_chat_short %} conversations from the immersive view ([https://github.com/copilot](https://github.com/copilot)). Shared conversations are public or private (i.e. permission-based), depending on the referenced content, for example, a conversation about a private repository. If you share a private conversation, the recipient must have the necessary permissions to view the content.
+
+Once you share a conversation, the recipient can view the conversation, and continue it from the point you shared it. Any changes made to the conversation after you share it are not included in the shared link.
 
 1. In the top right of any page on {% data variables.product.github %}, click the **{% octicon "copilot" aria-hidden="true" %}** {% data variables.product.prodname_copilot %} icon next to the search bar.
 1. To view a conversation in immersive mode, click **{% octicon "screen-full" aria-hidden="true" %} Immersive**.
-1. Once you submit your first prompt, a share button will appear in the upper right corner. Click {% octicon "share" aria-label="Share" %} to open the share dialog.
+1. Once you submit your first prompt, a share button will appear in the upper right corner. Click **{% octicon "lock" aria-hidden="true" %} Share** to open the share dialog.
 
    ![Screenshot of the main search box on {% data variables.product.prodname_dotcom %}. The share button is highlighted with an orange outline.](/assets/images/help/copilot/chat-share-button.png)
 
-1. To copy the conversation link, click **{% octicon "link" aria-label="Copy conversation link" %} Create link**. The link is copied to your clipboard.
+1. To share the conversation, click **Share**. This will generate a link to the conversation.
+1. To copy the conversation link, click the **{% octicon "copy" aria-label="Copy conversation icon" %}** copy icon. The link is copied to your clipboard.
 
 ## Sharing feedback about {% data variables.product.prodname_copilot_chat_dotcom %}
 

content/copilot/rolling-out-github-copilot-at-scale/choosing-your-enterprises-plan-for-github-copilot.md

@@ -11,6 +11,7 @@ import { getUserEventsId } from '../events'
 import type { ParsedUrlQuery } from 'querystring'
 
 let experimentsInitialized = false
+let userIsStaff = false
 
 export function shouldShowExperiment(
   experimentKey: ExperimentNames | { key: ExperimentNames },
@@ -45,6 +46,7 @@ export function shouldShowExperiment(
         // If the user has staffonly cookie, and staff override is true, show the experiment
         if (experiment.alwaysShowForStaff) {
           if (isStaff) {
+            userIsStaff = true
             console.log(`Staff cookie is set, showing '${experiment.key}' experiment`)
             return true
           }
@@ -117,10 +119,11 @@ export function getExperimentVariationForContext(locale: string, version: string
     if (experiment.includeVariationInContext) {
       // If the user is using the URL param to view the experiment, include the variation in the context
       if (
-        experiment.turnOnWithURLParam &&
-        window.location?.search
-          ?.toLowerCase()
-          .includes(`feature=${experiment.turnOnWithURLParam.toLowerCase()}`)
+        (experiment.turnOnWithURLParam &&
+          window.location?.search
+            ?.toLowerCase()
+            .includes(`feature=${experiment.turnOnWithURLParam.toLowerCase()}`)) ||
+        (experiment.alwaysShowForStaff && userIsStaff)
       ) {
         return TREATMENT_VARIATION
       }