Merge branch 'maint'

diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 91eede120e5e192ac8ce3a483dd6a88dce414333..efcabdc27267a80827d9cc22649e6855e3ce3ae9 100644 (file)
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -37,8 +37,8 @@ OPTIONS
 --name-only::
        Instead of printing both the SHA-1 and the name, print only
        the name.  If given with --tags the usual tag prefix of
-       "tags/" is also ommitted from the name, matching the output
-       of gitlink::git-describe[1] more closely.  This option
+       "tags/" is also omitted from the name, matching the output
+       of linkgit:git-describe[1] more closely.  This option
        cannot be combined with --stdin.
 
 EXAMPLE
@@ -75,4 +75,4 @@ Documentation by Johannes Schindelin.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite