Merge branch 'main' of https://github.com/github/docs into olayinka/images-upload

.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md

@@ -158,8 +158,8 @@ For each language, upload the new file to Azure blob storage in the `enterprise`
 
 After uploading the new files, you will need to purge the Fastly cache for the single page. From Okta, go to Fastly and select `docs`. Click `Purge` then `Purge URL`. If you need to purge a whole path, just do a `Purge All`
 
-![](/assets/images/fastly_purge.jpg)
+![](/contributing/images/fastly_purge.jpg)
 
 Enter the URL or path and do a soft purge.
 
-![](/assets/images/fastly_purge_url.jpg)
+![](/contributing/images/fastly_purge_url.jpg)

.github/actions/get-docs-early-access/action.yml

@@ -0,0 +1,33 @@
+name: Clone and add docs-early-access
+
+description: Clone docs-early-access and copy its content into the repo
+
+inputs:
+  token:
+    description: PAT
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Figure out which branch to checkout
+      id: check-early-access
+      env:
+        BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        GITHUB_TOKEN: ${{ inputs.token }}
+      shell: bash
+      run: node .github/actions-scripts/what-docs-early-access-branch.js
+
+    - name: Clone
+      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      with:
+        repository: github/docs-early-access
+        token: ${{ inputs.token }}
+        path: docs-early-access
+        ref: ${{ steps.check-early-access.outputs.branch }}
+
+    - name: Merge docs-early-access repo's folders
+      shell: bash
+      run: |
+        .github/actions-scripts/merge-early-access.sh
+        rm -fr docs-early-access

.github/workflows/check-broken-links-github-github.yml

@@ -44,19 +44,12 @@ jobs:
           # To prevent issues with cloning early access content later
           persist-credentials: 'false'
 
-      - name: Clone docs-early-access
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-        with:
-          repository: github/docs-early-access
-          token: ${{ secrets.DOCUBOT_REPO_PAT }}
-          path: docs-early-access
-          ref: main
-
-      - name: Merge docs-early-access repo's folders
-        run: .github/actions-scripts/merge-early-access.sh
-
       - uses: ./.github/actions/node-npm-setup
 
+      - uses: ./.github/actions/get-docs-early-access
+        with:
+          token: ${{ secrets.DOCUBOT_REPO_PAT }}
+
       - name: Build server
         run: npm run build
 

.github/workflows/codeql.yml

@@ -31,8 +31,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - uses: github/codeql-action/init@1ed1437484560351c5be56cf73a48a279d116b78
+      - uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5
         with:
           languages: javascript # comma separated list of values from {go, python, javascript, java, cpp, csharp, ruby}
-      - uses: github/codeql-action/analyze@1ed1437484560351c5be56cf73a48a279d116b78
+      - uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5
         continue-on-error: true

.github/workflows/link-check-on-pr.yml

@@ -30,26 +30,10 @@ jobs:
 
       - uses: ./.github/actions/node-npm-setup
 
-      - name: Figure out which docs-early-access branch to checkout, if internal repo
+      - uses: ./.github/actions/get-docs-early-access
         if: ${{ github.repository == 'github/docs-internal' }}
-        id: check-early-access
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-          GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }}
-        run: node .github/actions-scripts/what-docs-early-access-branch.js
-
-      - name: Check out docs-early-access too, if internal repo
-        if: ${{ github.repository == 'github/docs-internal' }}
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
-          repository: github/docs-early-access
           token: ${{ secrets.DOCUBOT_REPO_PAT }}
-          path: docs-early-access
-          ref: ${{ steps.check-early-access.outputs.branch }}
-
-      - name: Merge docs-early-access repo's folders
-        if: ${{ github.repository == 'github/docs-internal' }}
-        run: .github/actions-scripts/merge-early-access.sh
 
       # TODO: When we want to fix redirects on changed files we can uncomment everything below
       # Creates file "${{ env.HOME }}/files.json", among others

.github/workflows/test.yml

@@ -88,28 +88,10 @@ jobs:
 
       - uses: ./.github/actions/node-npm-setup
 
-      - name: Figure out which docs-early-access branch to checkout, if internal repo
+      - uses: ./.github/actions/get-docs-early-access
         if: ${{ github.repository == 'github/docs-internal' }}
-        id: check-early-access
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-          GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }}
-        run: node .github/actions-scripts/what-docs-early-access-branch.js
-
-      - name: Check out docs-early-access too, if internal repo
-        if: ${{ github.repository == 'github/docs-internal' }}
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
-          repository: github/docs-early-access
           token: ${{ secrets.DOCUBOT_REPO_PAT }}
-          path: docs-early-access
-          ref: ${{ steps.check-early-access.outputs.branch }}
-
-      - name: Merge docs-early-access repo's folders
-        if: ${{ github.repository == 'github/docs-internal' }}
-        run: |
-          .github/actions-scripts/merge-early-access.sh
-          rm -fr docs-early-access
 
       - name: Check the test fixture data (if applicable)
         if: ${{ matrix.test-group == 'rendering-fixtures' }}

CONTRIBUTING.md

@@ -1,12 +1,12 @@
 # Welcome to GitHub docs contributing guide <!-- omit in toc -->
 
-Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [docs.github.com](https://docs.github.com/en) :sparkles:. 
+Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [docs.github.com](https://docs.github.com/en) :sparkles:.
 
 Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
 
 In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
 
-Use the table of contents icon <img src="./assets/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
+Use the table of contents icon <img src="/contributing/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
 
 ## New contributor guide
 
@@ -28,7 +28,7 @@ Check to see what [types of contributions](/contributing/types-of-contributions.
 
 #### Create a new issue
 
-If you spot a problem with the docs, [search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/github/docs/issues/new/choose). 
+If you spot a problem with the docs, [search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/github/docs/issues/new/choose).
 
 #### Solve an issue
 
@@ -38,9 +38,9 @@ Scan through our [existing issues](https://github.com/github/docs/issues) to fin
 
 #### Make changes in the UI
 
-Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review. 
+Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review.
 
- <img src="./assets/images/contribution_cta.png" width="300" height="150" /> 
+ <img src="/contributing/images/contribution_cta.png" />
 
 #### Make changes in a codespace
 
@@ -67,7 +67,7 @@ Commit the changes once you are happy with them. Don't forget to [self-review](/
 ### Pull Request
 
 When you're finished with the changes, create a pull request, also known as a PR.
-- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request. 
+- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request.
 - Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
 - Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
 Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request additional information.
@@ -77,9 +77,9 @@ Once you submit your PR, a Docs team member will review your proposal. We may as
 
 ### Your PR is merged!
 
-Congratulations :tada::tada: The GitHub team thanks you :sparkles:. 
+Congratulations :tada::tada: The GitHub team thanks you :sparkles:.
 
-Once your PR is merged, your contributions will be publicly visible on the [GitHub docs](https://docs.github.com/en). 
+Once your PR is merged, your contributions will be publicly visible on the [GitHub docs](https://docs.github.com/en).
 
 Now that you are part of the GitHub docs community, see how else you can [contribute to the docs](/contributing/types-of-contributions.md).
 

README.md

@@ -1,20 +1,20 @@
-# GitHub Docs <!-- omit in toc --> 
- 
+# GitHub Docs <!-- omit in toc -->
+
 This repository contains the documentation website code and Markdown source files for [docs.github.com](https://docs.github.com).
 
 GitHub's Docs team works on pre-production content in a private repo that regularly syncs with this public repo.
 
-Use the table of contents icon <img src="./assets/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
+Use the table of contents icon <img src="/contributing/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
 
 ## Contributing
 
-See [the contributing guide](CONTRIBUTING.md) for detailed instructions on 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](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 at the bottom of the page to open a pull request for quick fixes like typos, updates, or link fixes.
 
-<img src="./assets/images/contribution_cta.png" width="400">
+<img src="./contributing/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.