Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/content/docs/configuration/file-format.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ different aspect of Mergify:

{/* FIXME: add link to a better page than writing your first rule? */}

- [`pull_request_rules`](#pull-request-rules) configures [Automation
Workflow](/workflow/);
- [`pull_request_rules`](#pull-request-rules) configures [Workflow
Automation](/workflow/);

- [`merge_protections`](#merge-protections) and
[`merge_protections_settings`](#merge-protections) configures [Merge
Expand Down Expand Up @@ -117,7 +117,7 @@ The top-level key `queue_rules` allows to define the rules that reign over your

### Priority Rules

The top-level key `priority rules` allows to define the rules that will determine
The top-level key `priority_rules` allows to define the rules that will determine
which [priority](/merge-queue/priority) a pull request has when entering your merge queue.

<OptionsTable def="PriorityRuleModel" />
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/workflow/actions/review.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requests are reviewed in your repository.

## Parameters

<ActionOptionsTable def='ReviewActionModel'/>
<ActionOptionsTable def="ReviewActionModel" />

## Examples

Expand Down
2 changes: 1 addition & 1 deletion src/content/docs/workflow/actions/squash.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ and easier to read.

## Parameters

<ActionOptionsTable def='SquashActionModel'/>
<ActionOptionsTable def="SquashActionModel" />

## Examples

Expand Down
8 changes: 4 additions & 4 deletions src/content/docs/workflow/actions/update.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ by merging the base branch into the pull request branch.

:::note
You do not need to use this action if you use the [merge
queue](/merge-queue). The merge queue automatically update the pull requests
queue](/merge-queue). The merge queue automatically updates the pull requests
it processes as necessary, making sure they are tested with up-to-date code
before being merged.
:::

## Parameters

<ActionOptionsTable def='UpdateActionModel' />
<ActionOptionsTable def="UpdateActionModel" />

## Examples

Expand All @@ -36,7 +36,7 @@ behind their base branch, for example:

```yaml
pull_request_rules:
- name: automatic update of pull requests where more 5 commits behind
- name: automatic update of pull requests that are more than 5 commits behind
conditions:
- base = main
- "#commits-behind > 5"
Expand All @@ -54,7 +54,7 @@ pull requests.

```yaml
pull_request_rules:
- name: automatic update for PR marked as keep-up-to-date
- name: automatic update for pull requests marked as "keep-up-to-date"
conditions:
- -draft # filter-out draft PRs
- label = keep-up-to-date
Expand Down
Loading