Merge pull request #38745 from github/repo-sync

Repo sync

Author: docs-bot

content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-plan-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise.md

@@ -31,8 +31,9 @@ Paid {% data variables.product.prodname_copilot_short %} plans include premium r
 
 Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle.
 
-* **Any seat assigned part way through the billing cycle** will be prorated based on the number of days remaining in the cycle.
-* **Any seat assignment removed during a billing cycle** will take effect from the beginning of the next cycle. The person will still be able to use {% data variables.product.prodname_copilot %} until the end of the cycle. If a user's access to organizations in the enterprise with {% data variables.product.prodname_copilot_short %} seats is removed, they will lose access immediately.
+* **Any seat assigned part way through the billing cycle** is prorated based on the number of days remaining in the cycle.
+* **Any seat assignment cancellation during a billing cycle** takes effect at the beginning of the next cycle. The user can access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
+* **Any user removed from an organization with {% data variables.product.prodname_copilot_short %} during a billing cycle** loses access to {% data variables.product.prodname_copilot_short %} immediately. Billing for that user stops at the end of the cycle.  If the user is restored to the organization during the billing cycle, they regain access to {% data variables.product.prodname_copilot_short %} immediately.
 
 Your enterprise will be charged on whichever payment method you’ve set up for the enterprise account, such as a credit card or a Microsoft Azure subscription.
 
@@ -62,7 +63,7 @@ If you upgrade an organization from {% data variables.copilot.copilot_business_s
 
 If you downgrade an organization's {% data variables.copilot.copilot_enterprise %} plan during a billing cycle, the users will have access to {% data variables.copilot.copilot_enterprise %} for the rest of the cycle, and the change to your bill will take effect from the following cycle.
 
-Disabling {% data variables.product.prodname_copilot %} for all organizations in your enterprise will cancel your enterprise's {% data variables.product.prodname_copilot_short %} plan.
+Disabling {% data variables.product.prodname_copilot %} for all organizations in your enterprise will cancel your enterprise's {% data variables.product.prodname_copilot_short %} plan. All users with a seat in those organizations will lose access to {% data variables.product.prodname_copilot_short %} immediately. You will be billed for those seats until the end of the current billing cycle.
 
 {% data reusables.copilot.copilot-one-account %}
 

content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-plan-for-your-organization/about-billing-for-github-copilot-in-your-organization.md

@@ -25,10 +25,11 @@ Paid {% data variables.product.prodname_copilot_short %} plans include premium r
 
 Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle.
 
-* **Any seat assigned part way through the billing cycle** will be prorated based on the number of days remaining in the cycle.
-* **Any seat assignment removed during a billing cycle** will take effect from the beginning of the next cycle. The person will still be able to use {% data variables.product.prodname_copilot %} until the end of the cycle. If a user's access to the organization itself is removed, they will lose access immediately.
+* **Any seat assigned part way through the billing cycle** is prorated based on the number of days remaining in the cycle.
+* **Any seat assignment cancellation during a billing cycle** takes effect at the beginning of the next cycle. The user can access {% data variables.product.prodname_copilot %} until the end of the cycle.
+* **Any user removed from the organization during a billing cycle** loses access to {% data variables.product.prodname_copilot %} immediately. Billing for that user stops at the end of the cycle. If the user is restored to the organization during the billing cycle, they will regain access to {% data variables.product.prodname_copilot %} immediately.
 
-If your organization belongs to an enterprise, your enterprise will be charged on whichever payment method you’ve set up for the organization account, such as a credit card or a Microsoft Azure subscription.
+If your organization belongs to an enterprise, your enterprise will be charged on whichever payment method you’ve set up for the organization account, such as a credit card or a Microsoft Azure subscription. If an organization with {% data variables.product.prodname_copilot %} seats is removed from an enterprise, billing for those seats will stop at the end of the billing cycle. The users who had seats assigned by the removed organization will lose access to {% data variables.product.prodname_copilot %} unless they receive a seat through another organization.
 
 {% data reusables.billing.authorization-charge %}
 

data/ui.yml

@@ -30,6 +30,7 @@ search:
     placeholder_no_icon: Search or ask Copilot
     shortcut: Type {{icon}} to search
   overlay:
+    aria_label: Search overlay
     input_aria_label: Search or ask Copilot
     suggestions_list_aria_label: Search suggestions
     ai_suggestions_list_aria_label: Copilot search suggestions

src/fixtures/fixtures/data/ui.yml

@@ -30,6 +30,7 @@ search:
     placeholder_no_icon: Search or ask Copilot
     shortcut: Type {{icon}} to search
   overlay:
+    aria_label: Search overlay
     input_aria_label: Search or ask Copilot
     suggestions_list_aria_label: Search suggestions
     ai_suggestions_list_aria_label: Copilot search suggestions

src/search/components/input/SearchOverlay.tsx

@@ -650,6 +650,7 @@ export function SearchOverlay({
   } else {
     OverlayContents = (
       <ActionList
+        id="search-suggestions-list"
         aria-label={t('search.overlay.suggestions_list_aria_label')}
         showDividers
         className={styles.suggestionsList}
@@ -675,7 +676,6 @@ export function SearchOverlay({
     )
   }
 
-  const overlayHeadingId = 'overlay-heading'
   return (
     <>
       <div className={styles.overlayBackdrop} />
@@ -698,7 +698,7 @@ export function SearchOverlay({
         }
         role="dialog"
         aria-modal="true"
-        aria-labelledby={overlayHeadingId}
+        aria-label={t('search.overlay.aria_label')}
         ref={overlayRef}
       >
         <div className={styles.header}>
@@ -723,11 +723,11 @@ export function SearchOverlay({
             value={urlSearchInputQuery}
             onChange={handleSearchQueryChange}
             leadingVisual={<SearchIcon />}
-            aria-labelledby={overlayHeadingId}
             role="combobox"
             // In AskAI the search input not longer "controls" the suggestions list, because there is no list, so we remove the aria-controls attribute
             aria-controls={isAskAIState ? 'ask-ai-result-container' : 'search-suggestions-list'}
             aria-expanded={combinedOptions.length > 0}
+            aria-label={t('search.overlay.input_aria_label')}
             aria-activedescendant={
               selectedIndex >= 0
                 ? `search-option-${combinedOptions[selectedIndex]?.group}-${selectedIndex}`
@@ -1027,7 +1027,7 @@ function renderSearchGroups(
 
     groups.push(
       <ActionList.Group key="general" data-testid="general-autocomplete-suggestions">
-        <ActionList.GroupHeading as="h3" tabIndex={-1} id="search-suggestions-list">
+        <ActionList.GroupHeading as="h3" tabIndex={-1}>
           {t('search.overlay.general_suggestions_list_heading')}
         </ActionList.GroupHeading>
         {items}