Merge branch 'maint'

* maint:
  asciidoc markup fixes
  Fail properly when cloning from invalid HTTP URL

Conflicts:
	Documentation/git-push.txt

diff --cc Documentation/git-push.txt
index 050c3dd,60d5339..45c9643
--- 1/Documentation/git-push.txt
--- 2/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -30,9 -29,9 +30,9 @@@ OPTION
        The "remote" repository that is destination of a push
        operation.  See the section <<URLS,GIT URLS>> below.
  
 -<refspec>::
 +<refspec>...::
-       The canonical format of each <refspec> parameter is
-       `+?<src>:<dst>`; that is, an optional plus `+`, followed
+       The canonical format of a <refspec> parameter is
+       `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
        by the source ref, followed by a colon `:`, followed by
        the destination ref.
  +

diff --cc Documentation/git-rerere.txt
Simple merge

diff --cc Documentation/pull-fetch-param.txt
Simple merge

diff --cc transport.c
Simple merge