diff --git a/src/content/docs/configuration/file-format.mdx b/src/content/docs/configuration/file-format.mdx index 7ac519626d..9a9783c30a 100644 --- a/src/content/docs/configuration/file-format.mdx +++ b/src/content/docs/configuration/file-format.mdx @@ -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 @@ -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. diff --git a/src/content/docs/workflow/actions/review.mdx b/src/content/docs/workflow/actions/review.mdx index dbbb59dd77..d4c3057f50 100644 --- a/src/content/docs/workflow/actions/review.mdx +++ b/src/content/docs/workflow/actions/review.mdx @@ -14,7 +14,7 @@ requests are reviewed in your repository. ## Parameters - + ## Examples diff --git a/src/content/docs/workflow/actions/squash.mdx b/src/content/docs/workflow/actions/squash.mdx index ea9f97abbf..c87b534dc9 100644 --- a/src/content/docs/workflow/actions/squash.mdx +++ b/src/content/docs/workflow/actions/squash.mdx @@ -14,7 +14,7 @@ and easier to read. ## Parameters - + ## Examples diff --git a/src/content/docs/workflow/actions/update.mdx b/src/content/docs/workflow/actions/update.mdx index db6a09088d..4a518bae5f 100644 --- a/src/content/docs/workflow/actions/update.mdx +++ b/src/content/docs/workflow/actions/update.mdx @@ -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 - + ## Examples @@ -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" @@ -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