Merge branch 'tr/maint-merge-ours-clarification' (early part)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 269ec475e6a822c671af994d13693cfc89e5983f..27d97b6d1e7705dd4025a33b5b9ab668cfaa15e1 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2569,7 +2569,7 @@ them again with linkgit:git-am[1].
 Other tools
 -----------
 
-There are numerous other tools, such as StGIT, which exist for the
+There are numerous other tools, such as StGit, which exist for the
 purpose of maintaining a patch series.  These are outside of the scope of
 this manual.
 
@@ -4275,7 +4275,7 @@ You see, Git is actually the best tool to find out about the source of Git
 itself!
 
 [[glossary]]
-GIT Glossary
+Git Glossary
 ============
 
 include::glossary-content.txt[]