Skip to content

Commit 96a31ce

Browse files
authored
Merge branch 'main' into repo-sync
2 parents 3390421 + 21895c3 commit 96a31ce

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

content/actions/creating-actions/metadata-syntax-for-github-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ For more information, see "[`github context`](/actions/reference/context-and-exp
260260
#### `runs.steps[*].shell`
261261

262262
{% ifversion fpt or ghes > 3.2 or ghae-issue-4853 or ghec %}
263-
**Optional** The shell where you want to run the command. You can use any of the shells listed [here](/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell). Required if `run` is set.
263+
**Optional** The shell where you want to run the command. You can use any of the shells listed [here](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsshell). Required if `run` is set.
264264
{% else %}
265-
**Required** The shell where you want to run the command. You can use any of the shells listed [here](/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell). Required if `run` is set.
265+
**Required** The shell where you want to run the command. You can use any of the shells listed [here](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsshell). Required if `run` is set.
266266
{% endif %}
267267

268268
#### `runs.steps[*].name`

content/actions/learn-github-actions/understanding-github-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ topics:
3030

3131
## The components of {% data variables.product.prodname_actions %}
3232

33-
You can configure a {% data variables.product.prodname_actions %} _workflow_ to be triggered when an _event_ occurs in your repository, such as a pull request being opened or an issue being created. Your workflow contains one or more _jobs_ which can run in sequential order or in parallel. Each job will run inside its own virtual machine _runner_, or inside a container, and has one or more _steps_ that either run a script that you define or run an _action_, which is a reusable extension that can simplify in your workflow.
33+
You can configure a {% data variables.product.prodname_actions %} _workflow_ to be triggered when an _event_ occurs in your repository, such as a pull request being opened or an issue being created. Your workflow contains one or more _jobs_ which can run in sequential order or in parallel. Each job will run inside its own virtual machine _runner_, or inside a container, and has one or more _steps_ that either run a script that you define or run an _action_, which is a reusable extension that can simplify your workflow.
3434

3535
![Workflow overview](/assets/images/help/images/overview-actions-simple.png)
3636

0 commit comments

Comments
 (0)