Merge branch 'maint-2.5' into maint-2.6

diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt
index 282758e76887e34c1a162e8c00d3a1007d9e199c..bd184cd6539af2daef0226e7bf462b91ff5f3b4d 100644 (file)
--- a/Documentation/urls-remotes.txt
+++ b/Documentation/urls-remotes.txt
@@ -36,7 +36,7 @@ The `<pushurl>` is used for pushes only. It is optional and defaults
 to `<url>`.
 
 Named file in `$GIT_DIR/remotes`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can choose to provide the name of a
 file in `$GIT_DIR/remotes`.  The URL