Merge branch 'jk/noetcconfig'

diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index bd613b2fcfcd77cf61d4f67944e56a11aeb2c7d4..6d6cd5d87c70a29445601939ef43a2e1278264ff 100644 (file)
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -16,7 +16,7 @@ on allowing users to make changes to their repository by making
 new commits, amending existing ones, creating branches, performing
 local merges, and fetching/pushing to remote repositories.
 
-Unlike gitlink:gitk[1], git-gui focuses on commit generation
+Unlike linkgit:gitk[1], git-gui focuses on commit generation
 and single file annotation, and does not show project history.
 It does however supply menu actions to start a gitk session from
 within git-gui.
@@ -89,7 +89,7 @@ See Also
 Other
 -----
 git-gui is actually maintained as an independent project, but stable
-versions are distributed as part of the Git suite for the convience
+versions are distributed as part of the Git suite for the convenience
 of end users.
 
 A git-gui development repository can be obtained from:
@@ -112,4 +112,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite