Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 12 deletions

diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md
index a0c3efe7143..4a2319774ac 100644
--- a/doc/user/project/merge_requests/cherry_pick_changes.md
+++ b/doc/user/project/merge_requests/cherry_pick_changes.md
@@ -11,7 +11,7 @@ GitLab implements Git's powerful feature to
 [cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation")
 with a **Cherry-pick** button in merge requests and commit details.
 
-## Cherry-picking a merge request
+## Cherry-pick a merge request
 
 After the merge request has been merged, a **Cherry-pick** button displays
 to cherry-pick the changes introduced by that merge request.
@@ -25,7 +25,7 @@ where you can choose to either:
 - Cherry-pick the changes directly into the selected branch.
 - Create a new merge request with the cherry-picked changes.
 
-### Cherry-pick tracking
+### Track a cherry-pick
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2675) in GitLab 12.9.
 
@@ -40,7 +40,7 @@ NOTE:
 We only track cherry-pick executed from GitLab (both UI and API). Support for tracking cherry-picked commits through the command line
 is tracked [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/202215).
 
-## Cherry-picking a commit
+## Cherry-pick a commit
 
 You can cherry-pick a commit from the commit details page:
 
diff --git a/doc/user/project/merge_requests/revert_changes.md b/doc/user/project/merge_requests/revert_changes.md
index a798f2c9b85..e6fb619d365 100644
--- a/doc/user/project/merge_requests/revert_changes.md
+++ b/doc/user/project/merge_requests/revert_changes.md
@@ -5,12 +5,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, concepts
 ---
 
-# Reverting changes **(FREE)**
+# Revert changes **(FREE)**
 
 You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
 by clicking the **Revert** button in merge requests and commit details.
 
-## Reverting a merge request
+## Revert a merge request
 
 NOTE:
 The **Revert** button is available only for merge requests
@@ -34,7 +34,7 @@ create a new merge request with the revert changes.
 
 After the merge request has been reverted, the **Revert** button is no longer available.
 
-## Reverting a commit
+## Revert a commit
 
 You can revert a commit from the commit details page:
 
diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md
index 2842c084bc5..c3fc2fa871f 100644
--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -12,8 +12,6 @@ type: reference, concepts
 With squash and merge you can combine all your merge request's commits into one
 and retain a clean history.
 
-## Overview
-
 Squashing lets you tidy up the commit history of a branch when accepting a merge
 request. It applies all of the changes in the merge request as a single commit,
 and then merges that commit using the merge method set for the project.
@@ -58,7 +56,7 @@ meaningful commit messages and:
 - It's simpler to [revert](revert_changes.md) if necessary.
 - The merged branch retains the full commit history.
 
-## Enabling squash for a merge request
+## Enable squash for a merge request
 
 Anyone who can create or edit a merge request can choose for it to be squashed
 on the merge request form. Users can select or clear the checkbox when they
@@ -98,7 +96,7 @@ it. This is because squashing is only available when accepting a merge request,
 so a merge request may need to be rebased before squashing, even though
 squashing can itself be considered equivalent to rebasing.
 
-## Squash Commits Options
+## Squash commits options
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17613) in GitLab 13.2.
 > - Deployed behind a feature flag, disabled by default.
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index afdcf2a94fa..26b9a979c34 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -50,10 +50,10 @@ to a branch in the repository. When you use the command line, you can commit mul
   on their respective thread.
 - **Cherry-pick a commit:**
   In GitLab, you can
-  [cherry-pick a commit](../merge_requests/cherry_pick_changes.md#cherry-picking-a-commit)
+  [cherry-pick a commit](../merge_requests/cherry_pick_changes.md#cherry-pick-a-commit)
   from the UI.
 - **Revert a commit:**
-  [Revert a commit](../merge_requests/revert_changes.md#reverting-a-commit)
+  [Revert a commit](../merge_requests/revert_changes.md#revert-a-commit)
   from the UI to a selected branch.
 - **Sign a commit:**
   Use GPG to [sign your commits](gpg_signed_commits/index.md).