repo sync

Author: Octomerger

CONTRIBUTING.md

@@ -64,12 +64,6 @@ Now that you're a part of the GitHub Docs community, you can keep participating
   - [Labels](#labels)
 - [Opening a pull request](#opening-a-pull-request)
 - [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)
-    - [Editing the file and committing the changes](#editing-the-file-and-committing-the-changes)
-- [Troubleshooting](#troubleshooting)
-  - [Failed status checks](#failed-status-checks)
-- [Draft pull requests](#draft-pull-requests)
 - [Reviewing](#reviewing)
   - [Self review](#self-review)
   - [Pull request template](#pull-request-template)

content/actions/reference/context-and-expression-syntax-for-github-actions.md

@@ -164,7 +164,7 @@ The `needs` context contains outputs from all jobs that are defined as a depende
 | `needs.<job id>` | `object` | A single job that the current job depends on. |
 | `needs.<job id>.outputs` | `object` | The set of outputs of a job that the current job depends on. |
 | `needs.<job id>.outputs.<output name>` | `string` | The value of a specific output for a job that the current job depends on. |
-| `needs.<job id>.result` | `string` | The result of a job that the current job depends on. Possible values are `success`, `failure`, or `cancelled`. |
+| `needs.<job id>.result` | `string` | The result of a job that the current job depends on. Possible values are `success`, `failure`, `cancelled`, or `skipped`. |
 
 #### Example printing context information to the log file
 

contributing/content-style-guide.md

@@ -346,7 +346,7 @@ Use clear, simple language that’s approachable and accessible for a wide range
 
 ## Word choice and terminology
 
-For general guidance and GitHub-specific terms, see “[Terminology](https://brand.github.com/content/terminology) in and “[Words that can be tricky](https://brand.github.com/content/grammar#words-that-can-be-tricky)” in GitHub’s Brand Guide. For more detailed guidance, see the “[A-Z word list](https://docs.microsoft.com/en-us/style-guide)” in Microsoft’s style guide.
+For general guidance and GitHub-specific terms, see “[Terminology](https://brand.github.com/content/terminology)” and “[Words that can be tricky](https://brand.github.com/content/grammar#words-that-can-be-tricky)” in GitHub’s Brand Guide. For more detailed guidance, see the “[A-Z word list](https://docs.microsoft.com/en-us/style-guide)” in Microsoft’s style guide.
 
 ### Abbreviations