Merge branch 'mb/relnotes-2.1'

* mb/relnotes-2.1:
Release notes: grammatical fixes
RelNotes: no more check_ref_format micro-optimization

diff --git a/contrib/convert-objects/git-convert-objects.txt b/contrib/convert-objects/git-convert-objects.txt
index 0565d83fc42c3d689b34299b38f0d2a7a0ae4212..f871880cfb1728243dc9e6f61a9d5e6c0d54cfe8 100644 (file)
--- a/contrib/convert-objects/git-convert-objects.txt
+++ b/contrib/convert-objects/git-convert-objects.txt
@@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite

diff --git a/contrib/examples/git-svnimport.txt b/contrib/examples/git-svnimport.txt
index 3bb871e42f9c786eb8c40553ea3b0e0eb433b195..3f0a9c33b56555352fcf5e5f692a21709f197474 100644 (file)
--- a/contrib/examples/git-svnimport.txt
+++ b/contrib/examples/git-svnimport.txt
@@ -176,4 +176,4 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite

diff --git a/contrib/gitview/gitview.txt b/contrib/gitview/gitview.txt
index 9e12f978425cbc45e5cd072b8bfb2fc57fae610b..7b5f9002b96b3f56e7c9937d76015d3bff1e88e6 100644 (file)
--- a/contrib/gitview/gitview.txt
+++ b/contrib/gitview/gitview.txt
@@ -28,7 +28,7 @@ OPTIONS
 
 <args>::
 
-       All the valid option for gitlink:git-rev-list[1].
+       All the valid option for linkgit:git-rev-list[1].
 
 Key Bindings
 ------------