Merge branch 'maint'

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

Conflicts:
	Documentation/git-push.txt

Documentation/git-push.txt

@@ -31,8 +31,8 @@ OPTIONS
 	operation.  See the section <<URLS,GIT URLS>> below.
 
 <refspec>...::
-	The canonical format of each <refspec> parameter is
+	The canonical format of a <refspec> parameter is
-	`+?<src>:<dst>`; that is, an optional plus `+`, followed
+	`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
 	by the source ref, followed by a colon `:`, followed by
 	the destination ref.
 +

Documentation/git-rerere.txt

@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:
 
 The commits marked with `*` touch the same area in the same
 file; you need to resolve the conflicts when creating the commit
-marked with `+`.  Then you can test the result to make sure your
+marked with `{plus}`.  Then you can test the result to make sure your
 work-in-progress still works with what is in the latest master.
 
 After this test merge, there are two ways to continue your work
 on the topic.  The easiest is to build on top of the test merge
-commit `+`, and when your work in the topic branch is finally
+commit `{plus}`, and when your work in the topic branch is finally
 ready, pull the topic branch into master, and/or ask the
 upstream to pull from you.  By that time, however, the master or
-the upstream might have been advanced since the test merge `+`,
+the upstream might have been advanced since the test merge `{plus}`,
 in which case the final commit graph would look like this:
 
 ------------

Documentation/pull-fetch-param.txt

@@ -6,7 +6,7 @@
 
 <refspec>::
 	The canonical format of a <refspec> parameter is
-	`+?<src>:<dst>`; that is, an optional plus `+`, followed
+	`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
 	by the source ref, followed by a colon `:`, followed by
 	the destination ref.
 +

transport.c

@@ -463,17 +463,14 @@ static struct ref *get_refs_via_curl(struct transport *transport)
 		run_active_slot(slot);
 		if (results.curl_result != CURLE_OK) {
 			strbuf_release(&buffer);
-			if (missing_target(&results)) {
+			if (missing_target(&results))
-				return NULL;
+				die("%s not found: did you run git update-server-info on the server?", refs_url);
-			} else {
+			else
-				error("%s", curl_errorstr);
+				die("%s download error - %s", refs_url, curl_errorstr);
-				return NULL;
-			}
 		}
 	} else {
 		strbuf_release(&buffer);
-		error("Unable to start request");
+		die("Unable to start HTTP request");
-		return NULL;
 	}
 
 	data = buffer.buf;