Merge branch 'main' into check-for-outdated-links

Author: sarahs

content/actions/learn-github-actions/essential-features-of-github-actions.md

@@ -75,7 +75,7 @@ jobs:
         run: |
           expr 1 + 1 > output.log
       - name: Upload output file
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
           name: output-log-file
           path: output.log

content/actions/reference/workflow-syntax-for-github-actions.md

@@ -638,6 +638,27 @@ jobs:
         uses: docker://gcr.io/cloud-builders/gradle
 ```
 
+#### Example using action inside a different private repository than the workflow
+
+Your workflow must checkout the private repository and reference the action locally.
+
+{% raw %}
+```yaml
+jobs:
+  my_first_job:
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+        with:
+          repository: octocat/my-private-repo
+          ref: v1.0
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: ./.github/actions/my-private-repo
+      - name: Run my action
+        uses: ./.github/actions/my-private-repo/my-action
+```
+{% endraw %}
+
 ### `jobs.<job_id>.steps[*].run`
 
 Runs command-line programs using the operating system's shell. If you do not provide a `name`, the step name will default to the text specified in the `run` command.

content/github/using-git/updating-credentials-from-the-macos-keychain.md

@@ -31,7 +31,7 @@ protocol=https
 > <em>[Press Return]</em>
 ```
 
-If it's successful, nothing will print out. To test that it works, try and clone a repository from {% data variables.product.product_location %}. If you are prompted for a password, the keychain entry was deleted.
+If it's successful, nothing will print out. To test that it works, try and clone a private repository from {% data variables.product.product_location %}. If you are prompted for a password, the keychain entry was deleted.
 
 ### Further reading
 

data/reusables/github-actions/expression-syntax-if.md

@@ -1 +1 @@
-When you use expressions in an `if` conditional, you may omit the expression syntax ({% raw %}`${{ }}`{% endraw %}) because {% data variables.product.prodname_dotcom %} automatically evaluates the `if` conditional as an expression.
+When you use expressions in an `if` conditional, you may omit the expression syntax ({% raw %}`${{ }}`{% endraw %}) because {% data variables.product.prodname_dotcom %} automatically evaluates the `if` conditional as an expression, unless the expression contains any operators. If the expression contains any operators, the expression must be contained within {% raw %}`${{ }}`{% endraw %} to explicitly mark it for evaluation.

lib/redirects/external-sites.json

@@ -14,7 +14,7 @@
   "/git-scm": "https://git-scm.com/",
   "/git-user-manual": "http://schacon.github.com/git/user-manual.html",
   "/github-status": "https://status.github.com/messages",
-  "/github-support": "https://support.github.com/contact",
+  "/github-support": "https://support.github.com",
   "/multiple-keys": "https://developer.github.com/guides/managing-deploy-keys",
   "/pro-git": "https://git-scm.com/book",
   "/submodules": "https://git-scm.com/book/en/Git-Tools-Submodules",