Merge branch 'maint'

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 5fbeab76b7214f871865eaefd5dbe744036676b0..d982f961fc5111ce0e37dd571530652fca147d01 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -35,11 +35,11 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
-include::urls.txt[]
+include::urls-remotes.txt[]
 
 SEE ALSO
 --------
-gitlink:git-pull[1]
+linkgit:git-pull[1]
 
 
 Author
@@ -53,4 +53,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