git: 05b8a96ab7 - main - Fix a typo and some word tagging.

[Marc Fonvieille]

The branch main has been updated by blackend:

URL: https://cgit.FreeBSD.org/doc/commit/?id=05b8a96ab738dd9506ec9972d3b1a70916a98a43

commit 05b8a96ab738dd9506ec9972d3b1a70916a98a43
Author:     Marc Fonvieille <blackend at FreeBSD.org>
AuthorDate: 2021-04-11 12:03:33 +0000
Commit:     Marc Fonvieille <blackend at FreeBSD.org>
CommitDate: 2021-04-11 12:03:33 +0000

    Fix a typo and some word tagging.
---
 documentation/content/en/articles/committers-guide/_index.adoc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index c6c518614a..33187e64a3 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -822,7 +822,7 @@ This document aims to define best practices when merging source commits using gi
 In general, we aim to use git's native support to achieve these goals rather than enforcing practices built on subversion's model.
 
 One general note: due to technical differences with Git, we will not be using git "merge commits" (created via `git merge`) in stable or releng branches.
-Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some varation of `git cherry-pick`.
+Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some variation of `git cherry-pick`.
 
 ==== Finding Eligible Hashes to MFC
 
@@ -1821,9 +1821,9 @@ HEAD is now at 869cbd3 Encourage contributions
 
 this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate.
 
-===== Ooops! I did a 'git pull' and it created a merge commit, what do I do?
+===== Ooops! I did a `git pull` and it created a merge commit, what do I do?
 
-**Q:** I was on autopilot and did a 'git pull' for my development tree and that created a merge commit on the mainline.
+**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on the mainline.
 How do I recover?
 
 **A:** This can happen when you invoke the pull with your development branch checked out.
@@ -1845,10 +1845,10 @@ Then you simply reset your branch to the corresponding `HEAD^#`:
 git reset --hard HEAD^2
 ....
 
-**Q:** But I also need to fix my 'main' branch. How do I do that?
+**Q:** But I also need to fix my `main` branch. How do I do that?
 
 **A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.
-To fix your 'main' branch, just make it point to the remote's 'main':
+To fix your `main` branch, just make it point to the remote's `main`:
 
 [source,shell]
 ....