Merge branch 'jc/combine' into next

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 9011ffbea3107d082871cc73a5480b6b089299f5..e852f41a322933aa010bdf79247508e42ee3f661 100644 (file)
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -1,7 +1,6 @@
 <repository>::
        The "remote" repository that is the source of a fetch
-       or pull operation.
-include::urls.txt[]
+       or pull operation.  See the section <<URLS,GIT URLS>> below.
 
 <refspec>::
        The canonical format of a <refspec> parameter is