Merge branch 'main' into patch-6

.all-contributorsrc

@@ -294,6 +294,68 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "jeffmcaffer",
+      "name": "Jeff McAffer",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10070956?v=4",
+      "profile": "https://mcaffer.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "tjenkinson",
+      "name": "Tom Jenkinson",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/3259993?v=4",
+      "profile": "https://tjenkinson.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "casals",
+      "name": "Arthur Casals",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/785860?v=4",
+      "profile": "https://github.com/casals",
+      "contributions": [
+        "content",
+        "doc"
+      ]
+    },
+    {
+      "login": "Simran-B",
+      "name": "Simran",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7819991?v=4",
+      "profile": "https://www.arangodb.com/",
+      ]
+    },
+    {
+      "login": "Ruth",
+      "name": "Ruth",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/85029?v=4",
+      "profile": "https://github.com/ruth",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "wi5nia",
+      "name": "Tomasz Wisniewski",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/12593852?v=4",
+      "profile": "http://tomaszwisniewski.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "chiedo",
+      "name": "Chiedo John",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2156688?v=4",
+      "profile": "https://chiedojohn.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/CODEOWNERS

@@ -14,3 +14,7 @@ package-lock.json @github/docs-engineering
 package.json @github/docs-engineering
 
 /content/github/site-policy/ @github/site-policy-admins
+
+# Make sure that Octokit maintainers get notified about changes
+# relevant to the Octokit libraries (https://github.com/octokit)
+/content/rest/reference @github/octokit-maintainers

.github/allowed-actions.js

@@ -8,6 +8,7 @@ module.exports = [
   'actions/cache@v2',
   'actions/checkout@v2',
   'actions/[email protected]',
+  'actions/[email protected]',
   'actions/github-script@v2',
   'actions/github-script@v3',
   'actions/labeler@v2',
@@ -22,11 +23,14 @@ module.exports = [
   'juliangruber/approve-pull-request-action@v1',
   'juliangruber/find-pull-request-action@v1',
   'juliangruber/read-file-action@v1',
-  'pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a',
+  'pascalgn/automerge-action@c9bd182',
   'peter-evans/create-issue-from-file@v2',
   'peter-evans/create-pull-request@v2',
+  'rachmari/[email protected]',
+  'rachmari/[email protected]',
   'repo-sync/github-sync@v2',
   'repo-sync/pull-request@v2',
   'rtCamp/action-slack-notify@master',
-  'rtCamp/[email protected]'
-]
+  'rtCamp/[email protected]',
+  'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0'
+]

.github/workflows/automerge-dependencies.yml

@@ -0,0 +1,14 @@
+name: Auto Merge Dependency Updates
+
+on:
+  - pull_request
+  - pull_request_review
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allowed-actors: dependabot[bot]

.github/workflows/automerge.yml

@@ -20,18 +20,17 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'automerge')
+    if: contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
+        uses: "pascalgn/automerge-action@c9bd182"
         env:
           GITHUB_TOKEN: "${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}"
-          MERGE_LABELS: "automerge"
-          MERGE_REMOVE_LABELS: ""
+          MERGE_METHOD_LABELS: "automerge=merge,autosquash=squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_METHOD: "merge"
           MERGE_FORKS: "true"
           MERGE_RETRIES: "50"
-          MERGE_RETRY_SLEEP: "10000"
-          UPDATE_LABELS: "automerge"
+          MERGE_RETRY_SLEEP: "10000" # ten seconds
+          UPDATE_LABELS: "automerge,autosquash"
           UPDATE_METHOD: "merge"

.github/workflows/merged-notification.yml

@@ -13,11 +13,7 @@ jobs:
             github.issues.createComment({
               ...context.repo,
               issue_number: context.payload.pull_request.number,
-              body: `Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours. To add your ✨ contribution to the README.md, create a new comment in this PR with:
-            
-            ```
-            @all-contributors please add @${context.payload.pull_request.user.login} for docs
-            ```
-            
-            If you want to, you can use the [emoji key](https://allcontributors.org/docs/en/emoji-key) to replace docs with a different contribution type.`
+              body: `Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours.
+              
+              If you haven't already, you can add yourself to [the list of contributors](https://github.com/github/docs#contributors-) by creating a new comment in this PR using [these instructions](https://allcontributors.org/docs/en/bot/usage#commands). Thanks again! :sparkles:`
             })

.github/workflows/start-new-engineering-pr-workflow.yml

@@ -6,7 +6,6 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'github/docs-internal'
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
@@ -15,6 +14,7 @@ jobs:
     steps:
     - name: 
       uses: actions/github-script@v2
+      continue-on-error: true
       with:
           github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }}
           script: |

.github/workflows/test-windows.yml

@@ -3,6 +3,7 @@
 name: Node.js Tests - Windows
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: "50 19 * * *" # once a day at 19:50 UTC / 11:50 PST
 
@@ -11,7 +12,6 @@ env:
 
 jobs:
   lint:
-    if: github.repository == 'github/docs-internal'
     runs-on: windows-latest
     steps:
       - name: Check out repo

CONTRIBUTING.md

@@ -32,7 +32,7 @@ Fork using the command line:
 ### Make your update:
 Make your changes to the file(s) you'd like to update. Here are some tips and tricks for [using the docs codebase](#working-in-the-githubdocs-repository).
   - Are you making changes to the application code? You'll need **Node.js v14** to run the site locally. See [contributing/development.md](contributing/development.md).
-  - Are you contributing to markdown? We use [GitHub Markdown](contributing/content-markup-reference).
+  - Are you contributing to markdown? We use [GitHub Markdown](contributing/content-markup-reference.md).
 
 ### Open a pull request
 When you're done making changes and you'd like to propose them for review, use the [pull request template](#pull-request-template) to open your PR (pull request).
@@ -63,8 +63,6 @@ Now that you're a part of the GitHub Docs community, you can keep participating
 - [Starting with an issue](#starting-with-an-issue)
   - [Labels](#labels)
 - [Opening a pull request](#opening-a-pull-request)
-  - [Fork using GitHub Desktop](#fork-using-github-desktop)
-  - [Fork using the command line](#fork-using-the-command-line)
 - [Working in the github/docs repository](#working-in-the-githubdocs-repository)
 - [Resolving merge conflicts](#resolving-merge-conflicts)
   - [In the GitHub user interface](#in-the-github-user-interface)
@@ -156,7 +154,7 @@ You should always review your own PR first.
 For content changes, make sure that you:
 - [ ] Confirm that the changes address every part of the content strategy plan from your issue (if there are differences, explain them).
 - [ ] Review the content for technical accuracy.
-- [ ] Review the entire pull request using the [localization checklist](contribution/localization-checklist.md).
+- [ ] Review the entire pull request using the [localization checklist](contributing/localization-checklist.md).
 - [ ] Copy-edit the changes for grammar, spelling, and adherence to the style guide.
 - [ ] Check new or updated Liquid statements to confirm that versioning is correct.
 - [ ] Check that all of your changes render correctly in staging. Remember, that lists and tables can be tricky.