Merge branch 'main' into repo-sync

Author: Octomerger

content/actions/using-workflows/workflow-syntax-for-github-actions.md

@@ -830,7 +830,7 @@ services:
     image: ghcr.io/owner/myservice1
     credentials:
       username: ${{ github.actor }}
-      password: ${{ secrets.ghcr_token }}
+      password: ${{ secrets.github_token }}
   myservice2:
     image: dockerhub_org/myservice2
     credentials:

data/reusables/actions/jobs/section-running-jobs-in-a-container-credentials.md

@@ -8,6 +8,6 @@ container:
   image: ghcr.io/owner/image
   credentials:
      username: ${{ github.actor }}
-     password: ${{ secrets.ghcr_token }}
+     password: ${{ secrets.github_token }}
 ```
 {% endraw %}