Merge branch 'maint'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 84693f8b10619dca8b615d30fbbcd950c9319d16..e1eb2c1d0037f06dbf2b5cc0bde84918157ee2bf 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -29,7 +29,7 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
-include::urls.txt[]
+include::urls-remotes.txt[]
 
 include::merge-strategies.txt[]