Add latest changes from gitlab-org/gitlab@master

10 files changed, 17 insertions, 13 deletions

diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md
index 3de51a92226..224d1fabb14 100644
--- a/doc/gitlab-basics/start-using-git.md
+++ b/doc/gitlab-basics/start-using-git.md
@@ -6,7 +6,7 @@ type: howto, tutorial
 description: "Introduction to using Git through the command line."
 ---
 
-# Git on the command line **(FREE)**
+# Command line Git **(FREE)**
 
 [Git](https://git-scm.com/) is an open-source distributed version control system. GitLab is built
 on top of Git.
diff --git a/doc/topics/git/git_add.md b/doc/topics/git/git_add.md
index 71f695d1657..722701dbb49 100644
--- a/doc/topics/git/git_add.md
+++ b/doc/topics/git/git_add.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 comments: false
 ---
 
-# Git Add **(FREE)**
+# Git add **(FREE)**
 
 Adds content to the index or staging area.
 
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 192da46d9b5..ec28d0b6431 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -6,7 +6,7 @@ type: concepts, howto
 description: "Introduction to Git rebase and force push, methods to resolve merge conflicts through the command line."
 ---
 
-# Introduction to Git rebase and force push **(FREE)**
+# Git rebase and force push **(FREE)**
 
 This guide helps you to get started with rebases, force pushes, and fixing
 [merge conflicts](../../user/project/merge_requests/conflicts.md) locally.
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index 678e03a2c13..29f1be3617a 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: howto
 ---
 
-# Undo possibilities in Git **(FREE)**
+# Undo options in Git **(FREE)**
 
 [Nothing in Git is deleted](https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery),
 so when you work in Git, you can undo your work.
diff --git a/doc/topics/git/rollback_commits.md b/doc/topics/git/rollback_commits.md
index 65c4f1e5007..56d740f3d1b 100644
--- a/doc/topics/git/rollback_commits.md
+++ b/doc/topics/git/rollback_commits.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 comments: false
 ---
 
-# Rollback commits **(FREE)**
+# Roll back commits **(FREE)**
 
 ## Undo Commits
 
diff --git a/doc/topics/git/stash.md b/doc/topics/git/stash.md
index 6ef72e300ed..ee931bbbb7c 100644
--- a/doc/topics/git/stash.md
+++ b/doc/topics/git/stash.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 comments: false
 ---
 
-# Git Stash **(FREE)**
+# Git stash **(FREE)**
 
 We use `git stash` to store our changes when they are not ready to be committed,
 but we must change to a different branch.
diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md
index 4156a3078da..235412f511a 100644
--- a/doc/topics/git/useful_git_commands.md
+++ b/doc/topics/git/useful_git_commands.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference
 ---
 
-# Useful Git commands **(FREE)**
+# Frequently used Git commands **(FREE)**
 
 The GitLab support team has collected these commands to help you. You may not
 need them frequently.
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 66f9f0594bf..b72481b8794 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -84,9 +84,9 @@ The following features are not found in standard Markdown.
 
 ### Colors
 
-[View this topic in GitLab](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/markdown.md#colors).
+Markdown does not support changing text color.
 
-You can write a color in the formats: `HEX`, `RGB`, or `HSL`.
+You can write a color code in the formats: `HEX`, `RGB`, or `HSL`.
 
 - `HEX`: `` `#RGB[A]` `` or `` `#RRGGBB[AA]` ``
 - `RGB`: `` `RGB[A](R, G, B[, A])` ``
@@ -94,7 +94,8 @@ You can write a color in the formats: `HEX`, `RGB`, or `HSL`.
 
 Named colors are not supported.
 
-Colors in backticks are followed by a color indicator:
+In the GitLab application (but not the GitLab documentation) color codes in backticks
+display a color chip next to the color code. For example:
 
 ```markdown
 - `#F00`
@@ -108,6 +109,9 @@ Colors in backticks are followed by a color indicator:
 - `HSLA(540,70%,50%,0.3)`
 ```
 
+[View this topic in GitLab](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/markdown.md#colors)
+to see the color chips next to the color code:
+
 - `#F00`
 - `#F00A`
 - `#FF0000`
diff --git a/doc/user/project/merge_requests/allow_collaboration.md b/doc/user/project/merge_requests/allow_collaboration.md
index d3d95a5bf61..0729e024df4 100644
--- a/doc/user/project/merge_requests/allow_collaboration.md
+++ b/doc/user/project/merge_requests/allow_collaboration.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Collaborate on merge requests across forks **(FREE)**
 
-When you open a merge request from your fork, you can allow upstream
+When you open a merge request from your [fork](../repository/forking_workflow.md), you can allow upstream
 members to collaborate with you on your branch.
 When you enable this option, members who have permission to merge to the target branch get
 permission to write to the merge request's source branch.
@@ -15,7 +15,7 @@ The members of the upstream project can then make small fixes or rebase branches
 before merging.
 
 This feature is available for merge requests across forked projects that are
-publicly accessible.
+[publicly accessible](../../public_access.md).
 
 ## Allow commits from upstream members
 
diff --git a/doc/user/project/push_options.md b/doc/user/project/push_options.md
index 796280d0f1e..1f85490795f 100644
--- a/doc/user/project/push_options.md
+++ b/doc/user/project/push_options.md
@@ -4,7 +4,7 @@ group: Source Code
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Push Options **(FREE)**
+# Push options **(FREE)**
 
 GitLab supports using client-side [Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
 to perform various actions at the same time as pushing changes. Additionally, [Push Rules](repository/push_rules.md) offer server-side control and enforcement options.