Merge branch 'main' into patch-2

Author: ramyaparimi

.eslintrc.js

@@ -13,6 +13,7 @@ module.exports = {
     babelOptions: { configFile: './.babelrc' },
     sourceType: 'module',
   },
+  ignorePatterns: ['tmp/*'],
   rules: {
     'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
   },

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,7 +25,7 @@ Closes [issue link]
 ### Check off the following:
 
 - [ ] I have reviewed my changes in staging (look for "Automatically generated comment" and click **Modified** to view your latest changes).
-- [ ] For content changes, I have completed the [self-review checklist](https://github.com/github/docs/blob/main/CONTRIBUTING.md#self-review).
+- [ ] For content changes, I have completed the [self-review checklist](https://github.com/github/docs/blob/main/contributing/self-review.md#self-review).
 
 ### Writer impact (This section is for GitHub staff members only):
 

.github/workflows/test-windows.yml

@@ -23,7 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-group: [content, graphql, meta, rendering, routing, unit, linting]
+        test-group:
+          [
+            content,
+            graphql,
+            meta,
+            rendering,
+            routing,
+            unit,
+            linting,
+            translations,
+          ]
     steps:
       - name: Check out repo
         uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97

.github/workflows/test.yml

@@ -26,7 +26,17 @@ jobs:
       fail-fast: false
       matrix:
         # The same array lives in test-windows.yml, so make any updates there too.
-        test-group: [content, graphql, meta, rendering, routing, unit, linting]
+        test-group:
+          [
+            content,
+            graphql,
+            meta,
+            rendering,
+            routing,
+            unit,
+            linting,
+            translations,
+          ]
     steps:
       # Each of these ifs needs to be repeated at each step to make sure the required check still runs
       # Even if if doesn't do anything

README.md

@@ -8,21 +8,21 @@ Use the table of contents icon <img src="./assets/images/table-of-contents.png"
 
 ## Contributing
 
-See [the contributing guide](CONTRIBUTING.md) for detailed instructions of how to get started with our project. 
+See [the contributing guide](CONTRIBUTING.md) for detailed instructions on how to get started with our project. 
 
-We accept different [types of contributions](CONTRIBUTING.md/#types-of-contributions-memo), including some that don't require you to write a single line of code.
+We accept different [types of contributions](https://github.com/github/docs/blob/main/contributing/types-of-contributions.md), including some that don't require you to write a single line of code.
 
-On the GitHub Docs site, you can click the make a contribution button to open a PR for quick fixes like typos, updates, or link fixes.
+On the GitHub Docs site, you can click the make a contribution button to open a PR(Pull Request) for quick fixes like typos, updates, or link fixes.
 
 <img src="./assets/images/contribution_cta.png" width="400">
 
-For more complex contributions, you can open an issue using the most appropriate [issue template](https://github.com/github/docs/issues/new/choose) to describe the changes you'd like to see.
+For more complex contributions, you can open an issue using the most appropriate [issue template](https://github.com/github/docs/issues/new/choose) to describe the changes you'd like to see. By this way you can also be a part of Open source contributor's community without even writing a single line of code.
 
 If you're looking for a way to contribute, you can scan through our [existing issues](https://github.com/github/docs/issues) for something to work on. When ready, check out [Getting Started with Contributing](/CONTRIBUTING.md) for detailed instructions.
 
 ### Join us in discussions
 
-We use GitHub Discussions to talk about all sorts of topics related to documentation and this site. For example: if you'd like help troubleshooting a PR, have a great new idea, or want to share something amazing you've learned in our docs, join us in [discussions](https://github.com/github/docs/discussions).
+We use GitHub Discussions to talk about all sorts of topics related to documentation and this site. For example: if you'd like help troubleshooting a PR, have a great new idea, or want to share something amazing you've learned in our docs, join us in the [discussions](https://github.com/github/docs/discussions).
 
 ### And that's it!
 
@@ -33,6 +33,7 @@ That's how you can easily become a member of the GitHub Documentation community.
 ## READMEs
 
 In addition to the README you're reading right now, this repo includes other READMEs that describe the purpose of each subdirectory in more detail:
+YOu can go through among them for specified details regarding the topics listed below.
 
 - [content/README.md](content/README.md)
 - [content/graphql/README.md](content/graphql/README.md)
@@ -54,9 +55,9 @@ In addition to the README you're reading right now, this repo includes other REA
 
 The GitHub product documentation in the assets, content, and data folders are licensed under a [CC-BY license](LICENSE).
 
-All other code in this repository is licensed under a [MIT license](LICENSE-CODE).
+All other code in this repository is licensed under the [MIT license](LICENSE-CODE).
 
-When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
+When you are using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
 
 ## Thanks :purple_heart:
 

assets/images/help/settings/settings-sidebar-blocked-users.png

@@ -16,6 +16,26 @@ const SectionToLabelMap: Record<string, string> = {
   backups: 'Backups',
 }
 
+const LabelColorMap = {
+  features: 'color-bg-success-emphasis',
+  bugs: 'color-bg-attention-emphasis',
+  known_issues: 'color-bg-accent-emphasis',
+  security_fixes: 'color-bg-sponsors-emphasis',
+  changes: 'color-bg-success-emphasis',
+  deprecations: 'color-bg-done-emphasis',
+  backups: 'color-bg-severe-emphasis',
+}
+
+const HeadingColorMap = {
+  features: 'color-fg-success',
+  bugs: 'color-fg-attention',
+  known_issues: 'color-fg-accent',
+  security_fixes: 'color-fg-sponsors',
+  changes: 'color-fg-success',
+  deprecations: 'color-fg-done',
+  backups: 'color-fg-severe',
+}
+
 type Props = {
   patch: ReleaseNotePatch
   withReleaseNoteLabel?: boolean
@@ -25,6 +45,10 @@ export function PatchNotes({ patch, withReleaseNoteLabel }: Props) {
     <>
       {Object.entries(patch.sections).map(([key, sectionItems], i, arr) => {
         const isLast = i === arr.length - 1
+        const primaryLabelColor =
+          LabelColorMap[key as keyof typeof LabelColorMap] || LabelColorMap.features
+        const primaryHeadingColor =
+          HeadingColorMap[key as keyof typeof HeadingColorMap] || HeadingColorMap.features
         return (
           <div
             key={key}
@@ -36,7 +60,12 @@ export function PatchNotes({ patch, withReleaseNoteLabel }: Props) {
           >
             {withReleaseNoteLabel && (
               <div className="col-12 col-xl-3 mb-5">
-                <span className="px-3 py-2 text-small text-bold text-uppercase color-bg-emphasis color-fg-on-emphasis">
+                <span
+                  className={cx(
+                    'px-3 py-2 color-fg-on-emphasis text-small text-bold text-uppercase',
+                    primaryLabelColor
+                  )}
+                >
                   {SectionToLabelMap[key] || 'INVALID SECTION'}
                 </span>
               </div>
@@ -52,7 +81,11 @@ export function PatchNotes({ patch, withReleaseNoteLabel }: Props) {
                   <Fragment key={slug}>
                     <h4
                       id={slug}
-                      className={cx(styles.sectionHeading, 'text-uppercase text-bold f4')}
+                      className={cx(
+                        styles.sectionHeading,
+                        primaryHeadingColor,
+                        'text-uppercase text-bold f4'
+                      )}
                     >
                       <Link href={`#${slug}`} className="color-fg-inherit">
                         {item.heading}

components/release-notes/PatchNotes.tsx

@@ -23,6 +23,7 @@ shortTitle: Merge multiple user accounts
 1. [Transfer any repositories](/articles/how-to-transfer-a-repository) from the account you want to delete to the account you want to keep. Issues, pull requests, and wikis are transferred as well. Verify the repositories exist on the account you want to keep.
 2. [Update the remote URLs](/github/getting-started-with-github/managing-remote-repositories) in any local clones of the repositories that were moved.
 3. [Delete the account](/articles/deleting-your-user-account) you no longer want to use.
+4. To attribute past commits to the new account, add the email address you used to author the commits to the account you're keeping. For more information, see "[Why are my contributions not showing up on my profile?](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-graphs-on-your-profile/why-are-my-contributions-not-showing-up-on-my-profile#your-local-git-commit-email-isnt-connected-to-your-account)"
 
 ## Further reading
 

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md

@@ -57,7 +57,7 @@ Before you begin, you'll need to create a {% data variables.product.prodname_dot
 
 ## Creating a Dockerfile
 
-In your new `hello-world-docker-action` directory, create a new `Dockerfile` file. For more information, see "[Dockerfile support for {% data variables.product.prodname_actions %}](/actions/creating-actions/dockerfile-support-for-github-actions)."
+In your new `hello-world-docker-action` directory, create a new `Dockerfile` file. Make sure that your filename is capitalized correctly (use a capital `D` but not a capital `f`) if you're having issues. For more information, see "[Dockerfile support for {% data variables.product.prodname_actions %}](/actions/creating-actions/dockerfile-support-for-github-actions)."
 
 **Dockerfile**
 ```Dockerfile{:copy}

content/actions/creating-actions/creating-a-docker-container-action.md

@@ -44,7 +44,7 @@ By default, the validation only includes the audience (`aud`) condition, so you
 "Condition": {
   "StringEquals": {
     "token.actions.githubusercontent.com:aud": "https://github.com/octo-org",
-    "token.actions.githubusercontent.com:sub": "token.actions.githubusercontent.com:sub": "repo:octo-org/octo-repo:ref:refs/heads/octo-branch"
+    "token.actions.githubusercontent.com:sub": "repo:octo-org/octo-repo:ref:refs/heads/octo-branch"
 ```
 
 ## Updating your {% data variables.product.prodname_actions %} workflow