Merge branch 'main' into patch-1

Author: skedwards88

.github/actions-scripts/purge-fastly-edge-cache-per-language.js

@@ -5,6 +5,25 @@ import { languageKeys } from '../../lib/languages.js'
 import { makeLanguageSurrogateKey } from '../../middleware/set-fastly-surrogate-key.js'
 import purgeEdgeCache from '../../script/deployment/purge-edge-cache.js'
 
+/**
+ * In simple terms, this script sends purge commands for...
+ *
+ * 1. no-language
+ * 2. 'en'
+ * 3. 'ja'
+ * 4. 'pt'
+ * ...
+ *
+ * ...and so on for all languages.
+ * But to avoid a stampeding herd after each purge, and to avoid unnecessary
+ * load on the backend, put a slight delay between each language.
+ * This gives the backend a chance to finish processing all the now stale
+ * URLs, for that language, before tackling the next.
+ */
+const DELAY_BETWEEN_LANGUAGES = 10 * 1000
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
 // This covers things like `/api/webhooks` which isn't language specific.
 await purgeEdgeCache(makeLanguageSurrogateKey())
 
@@ -16,6 +35,10 @@ const languages = process.env.LANGUAGES
     languageKeys.sort((a) => (a === 'en' ? -1 : 1))
 
 for (const language of languages) {
+  console.log(
+    `Sleeping ${DELAY_BETWEEN_LANGUAGES / 1000} seconds before purging for '${language}'...`
+  )
+  await sleep(DELAY_BETWEEN_LANGUAGES)
   await purgeEdgeCache(makeLanguageSurrogateKey(language))
 }
 

.github/workflows/browser-test.yml

@@ -8,6 +8,12 @@ name: Codeowners - Docs Engineering
 
 on:
   pull_request:
+    types:
+      - edited
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
     paths:
       - '**.js'
       - '**.ts'
@@ -20,7 +26,7 @@ on:
 
 jobs:
   codeowners-docs-engineering:
-    if: ${{ github.repository == 'github/docs-internal' }}
+    if: ${{ github.repository == 'github/docs-internal' && !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.DOCS_BOT_FR }}

.github/workflows/codeowners-docs-engineering.yml

@@ -1,7 +1,10 @@
 import pick from 'lodash/pick'
 import { createContext, useContext } from 'react'
 import { LearningTrack } from './ArticleContext'
-import { FeaturedLink, getFeaturedLinksFromReq } from './ProductLandingContext'
+import {
+  FeaturedLink,
+  getFeaturedLinksFromReq,
+} from 'src/landings/components/ProductLandingContext'
 
 export type TocItem = {
   fullPath: string

assets/images/enterprise/site-admin-settings/ldap-sync-now-button.png

@@ -105,10 +105,24 @@ export function useTheme() {
   })
 
   useEffect(() => {
-    const cookieValue = Cookies.get('color_mode')
-    const css = getCssTheme(cookieValue)
-    const component = getComponentTheme(cookieValue)
-    setTheme({ css, component })
+    // Using setTimeout with a default delay value of 0 interjects one
+    // additional event cycle, which works around a bug that is the
+    // result of a timing issue. Without the setTimeout function
+    // the page loads, then the docs site switches the color mode to
+    // match the user's GitHub color mode. Primer React has a useEffect
+    // call that overrides this change, causing the site to ignore the
+    // user's GitHub color mode and revert to auto.
+    // As a temporary workaround, this code that fetches the user's GitHub
+    // color mode will be called after Primer React's useEffect call.
+    // The long term solution to this theming issue is to migrate to CSS variables
+    // under the hood, which Primer is planning to do in the next couple quarters.
+    // Reference: https://github.com/primer/react/issues/2229
+    setTimeout(() => {
+      const cookieValue = Cookies.get('color_mode')
+      const css = getCssTheme(cookieValue)
+      const component = getComponentTheme(cookieValue)
+      setTheme({ css, component })
+    })
   }, [])
 
   return { theme }

assets/images/enterprise/site-admin-settings/ldap-users-tab.png

@@ -15,6 +15,7 @@ const SectionToLabelMap: Record<string, string> = {
   changes: 'Changes',
   deprecations: 'Deprecations',
   backups: 'Backups',
+  errata: 'Errata',
 }
 
 type Props = {

assets/images/github-apps/authorize_app.png

@@ -1,8 +1,8 @@
 import cx from 'classnames'
 
 import { useMainContext } from 'components/context/MainContext'
-import { SidebarProduct } from './SidebarProduct'
-import { SidebarHomepage } from './SidebarHomepage'
+import { SidebarProduct } from 'src/landings/components/SidebarProduct'
+import { SidebarHomepage } from '../../src/landings/components/SidebarHomepage'
 import { AllProductsLink } from './AllProductsLink'
 import { ApiVersionPicker } from 'src/rest/components/ApiVersionPicker'
 import { Link } from 'components/Link'

assets/images/github-apps/install_app.png

@@ -47,14 +47,14 @@ When you unsubscribe from notifications in your inbox, they will automatically d
 1. From the notifications inbox, select the notifications you want to unsubscribe to.
 2. Click **Unsubscribe.**
 
-  ![Screenshot of the "Notifications" page. A button, titled "Unsubscribe", is highlighted with an orange outline.](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png)
+   ![Screenshot of the "Notifications" page. A button, titled "Unsubscribe", is highlighted with an orange outline.](/assets/images/help/notifications-v2/unsubscribe-from-main-inbox.png)
 
 ## Unsubscribing from notifications on the subscriptions page
 
 {% data reusables.notifications.access_notifications %}
 1. In the left sidebar, under the list of repositories, select the "Manage notifications" dropdown menu and click **Subscriptions**.
 
-  ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
+   ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
 
 2. Select the notifications you want to unsubscribe from. In the top right, click **Unsubscribe**.
 
@@ -65,7 +65,7 @@ When you unwatch a repository, you unsubscribe from future updates from that rep
 {% data reusables.notifications.access_notifications %}
 1. In the left sidebar, under the list of repositories, select the "Manage notifications" dropdown menu and click **Watched repositories**.
 
-  ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
+   ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
 
 2. On the watched repositories page, after you've evaluated the repositories you're watching, choose whether to:
 

assets/images/help/copilot/copilot-cancel-trial.png

@@ -46,11 +46,11 @@ Many people forget about repositories that they've chosen to watch in the past.
 
 {% data reusables.notifications.access_notifications %}
 1. In the left sidebar, under the list of repositories that you have notifications from, use the "Manage notifications" drop-down to click **Subscriptions**.
-  ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
+   ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
 
 2. Use the filters and sort to narrow the list of subscriptions and begin unsubscribing to conversations you no longer want to receive notifications for.
 
-  ![Screenshot of the "Subscriptions" tab. Three dropdown menus, titled "Reason", "Repository", and "Sort", are highlighted with an orange outline.](/assets/images/help/notifications-v2/all-subscriptions.png)
+   ![Screenshot of the "Subscriptions" tab. Three dropdown menus, titled "Reason", "Repository", and "Sort", are highlighted with an orange outline.](/assets/images/help/notifications-v2/all-subscriptions.png)
 
 {% tip %}
 
@@ -64,7 +64,7 @@ Many people forget about repositories that they've chosen to watch in the past.
 ## Reviewing repositories that you're watching
 
 1. In the left sidebar, under the list of repositories, use the "Manage notifications" drop-down menu and click **Watched repositories**.
-  ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
+   ![Screenshot of the "Notifications" page. A dropdown menu, titled "Manage notifications", is highlighted with an orange outline.](/assets/images/help/notifications-v2/manage-notifications-options.png)
 2. Evaluate the repositories that you are watching and decide if their updates are still relevant and helpful. When you watch a repository, you will be notified of all conversations for that repository.
 
   {% tip %}

assets/images/help/desktop/ahead-tab.png

@@ -69,7 +69,7 @@ You can add up to 15 of your own custom filters.
 
 3. Add a name for your filter and a filter query. For example, to only see notifications for a specific repository, you can create a filter using the query `repo:octocat/open-source-project-name reason:participating`. You can also add emojis with a native emoji keyboard. For a list of supported search queries, see "[Supported queries for custom filters](#supported-queries-for-custom-filters)."
 
-  ![Screenshot showing notification filters. Two input fields, with an example name and filter query filled in, are highlighted with an orange outline.](/assets/images/help/notifications-v2/custom-filter-example.png)
+   ![Screenshot showing notification filters. Two input fields, with an example name and filter query filled in, are highlighted with an orange outline.](/assets/images/help/notifications-v2/custom-filter-example.png)
 
 4. Click **Create**.
 

assets/images/help/desktop/view-pr-on-github.png

@@ -19,7 +19,7 @@ To save a single notification to review later, to the right of the notification,
 
 Saved notifications are kept indefinitely and can be viewed by clicking **Saved** in the sidebar or with the `is:saved` query. If your saved notification is older than 5 months and becomes unsaved, the notification will disappear from your inbox within a day.
 
-  ![Screenshot of a single notification from the "Notifications" page. The bookmark icon is highlighted with an orange outline.](/assets/images/help/notifications-v2/save-triaging-option.png)
+![Screenshot of a single notification from the "Notifications" page. The bookmark icon is highlighted with an orange outline.](/assets/images/help/notifications-v2/save-triaging-option.png)
 
 ## Investigating a notification
 
@@ -38,7 +38,7 @@ You can choose how you want to receive future notifications for a specific issue
 
 1. In the right column of the issue or pull request, next to "Notifications", click **Customize**.
 
-  ![Screenshot of the "Notifications" element on an issue or pull request. A link, titled "Customize", is highlighted with an orange outline.](/assets/images/help/notifications-v2/customize-notifications-for-specific-thread.png)
+   ![Screenshot of the "Notifications" element on an issue or pull request. A link, titled "Customize", is highlighted with an orange outline.](/assets/images/help/notifications-v2/customize-notifications-for-specific-thread.png)
 
 2. In the dialog box, select **Custom**, then choose when you'd like to receive a notification update for this thread. For example, you can choose to receive an update when the pull request has been merged, closed, or reopened. You will be subscribed again if you participate in the thread, your username is @mentioned, or a team you're a member of is @mentioned.
 

assets/images/help/enterprises/settings-require-scim-user-provisioning.png

@@ -33,7 +33,8 @@ People who visit your profile can also see the following information.
 - Repositories you've starred{% ifversion fpt or ghec %} and organized into lists{% endif %}. For more information, see "[AUTOTITLE](/get-started/exploring-projects-on-github/saving-repositories-with-stars)."
 - An overview of your activity in organizations, repositories, and teams you're most active in. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-an-overview-of-your-activity-on-your-profile)."{% ifversion fpt or ghec %}
 - Badges and Achievements that highlight your activity and show if you use {% data variables.product.prodname_pro %} or participate in programs like the {% data variables.product.prodname_arctic_vault %}, {% data variables.product.prodname_sponsors %}, or the {% data variables.product.company_short %} Developer Program. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#displaying-badges-on-your-profile)."{% endif %}
-- Your pronouns if you've set them. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#adding-pronouns-to-your-profile).
+- Your pronouns if you've set them. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#adding-pronouns-to-your-profile)." {% ifversion fpt or ghec %}
+- Mutual connections you share with someone who is viewing your profile. The person viewing your profile can see which of the people they follow are also followed by you.{% endif %}
 
 You can also set a status on your profile to provide information about your availability. For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#setting-a-status)."
 

assets/images/help/enterprises/settings-scim-save.png

@@ -227,7 +227,7 @@ If you authored any commit(s) present in the commit history for the listed tag o
 | [pyparsing/pyparsing](https://github.com/pyparsing/pyparsing) | 2.4.7 | [pyparsing_2.4.7](https://github.com/pyparsing/pyparsing/releases/tag/pyparsing_2.4.7) |
 | [pyserial/pyserial](https://github.com/pyserial/pyserial) | 3.5 | [v3.5](https://github.com/pyserial/pyserial/releases/tag/v3.5) |
 | [dateutil/dateutil](https://github.com/dateutil/dateutil) | 2.8.1 | [2.8.1](https://github.com/dateutil/dateutil/releases/tag/2.8.1) |
-| [yaml/pyyaml ](https://github.com/yaml/pyyaml) | 5.4.1 | [5.4.1](https://github.com/yaml/pyyaml/releases/tag/5.4.1) |
+| [yaml/pyyaml](https://github.com/yaml/pyyaml) | 5.4.1 | [5.4.1](https://github.com/yaml/pyyaml/releases/tag/5.4.1) |
 | [psf/requests](https://github.com/psf/requests) | 2.25.1 | [v2.25.1](https://github.com/psf/requests/releases/tag/v2.25.1) |
 | [boto/s3transfer](https://github.com/boto/s3transfer) | 0.3.4 | [0.3.4](https://github.com/boto/s3transfer/releases/tag/0.3.4) |
 | [enthought/scimath](https://github.com/enthought/scimath) | 4.2.0 | [4.2.0](https://github.com/enthought/scimath/releases/tag/4.2.0) |

assets/images/help/graphs/activity-view-compare-changes.png

@@ -27,4 +27,4 @@ shortTitle: Show an overview
 {% data reusables.profile.access_profile %}
 2. Above your contributions graph, select the **Contribution settings** dropdown menu, then click **Activity overview**.
 
-  ![Screenshot of the contributions graph on a user profile. A dropdown menu, labeled "Contribution settings", is highlighted with an orange outline.](/assets/images/help/profile/activity-overview.png)
+   ![Screenshot of the contributions graph on a user profile. A dropdown menu, labeled "Contribution settings", is highlighted with an orange outline.](/assets/images/help/profile/activity-overview.png)

assets/images/help/graphs/activity-view-embedded-link.png

@@ -53,7 +53,7 @@ Since an email address can only be associated with a single {% data variables.pr
 
 1. In the email, click **Unlink this email**.
 
-  ![Screenshot of an email from {% data variables.product.prodname_dotcom %} to unlink an email address from a {% data variables.product.prodname_dotcom %} account. A link with the text "Unlink this email" is outlined in orange.](/assets/images/help/2fa/unlink-this-email.png)
+   ![Screenshot of an email from {% data variables.product.prodname_dotcom %} to unlink an email address from a {% data variables.product.prodname_dotcom %} account. A link with the text "Unlink this email" is outlined in orange.](/assets/images/help/2fa/unlink-this-email.png)
 
 1. To finish unlinking your email, on {% data variables.product.prodname_dotcom_the_website %}, click **Unlink**.
 1. Optionally, to create a new account and link your newly unlinked email, click **Create a new account**.