summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorBjörn Gustavsson <bgustavsson@gmail.com>2009-11-22 09:47:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-23 00:20:28 (GMT)
commit73a1d050c47dfa0fc758eedd9d3bb60b7449e14f (patch)
tree585a025dd7fe204b7e3e72625f1006d5b740c4c7 /Documentation/user-manual.txt
parent625a860cb73b259683a4285705ac17e92298d5d5 (diff)
downloadgit-73a1d050c47dfa0fc758eedd9d3bb60b7449e14f.zip
git-73a1d050c47dfa0fc758eedd9d3bb60b7449e14f.tar.gz
git-73a1d050c47dfa0fc758eedd9d3bb60b7449e14f.tar.bz2
User Manual: Write "Git" instead of "GIT"
In the Table of Contents, there is a notable inconsistency: first there is "GIT Glossary", followed by "Git Quick Reference" on the very next line. Running "grep -c" on user-manual.txt, I find 780 occurrrences of "git", 37 occurrences of "Git", and 9 occurrences of "GIT". In general, "git" is the preferred spelling, except at the beginning of a sentence. Therefore, change "GIT Glossary" to "Git Glossary" for consistency with the rest of the document. Looking at the other eight occurrences of "GIT" I found one other occurrence that should be changed: * The mention of "StGIT". Looking at the web pages for "Stacked Git" at http://www.procode.org/stgit, I only saw the spelling "StGit", except in http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT_Tutorial, but that page was last updated in 2006. The other seven occurrences should not be changed: * Three occurrences were in the output of 'git show-branch' run on the git.git repository. * One occurrence was in the output of 'git cat-file'. * One occurrence was as part of the file name "GIT-VERSION-GEN". * Two occurrences were in comments in scripts quoted in a description of Tony Luck's workflow. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 269ec47..27d97b6 100644
--- 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[]