From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:50 +0000 (-0700)
Subject: Merge branch 'jk/asciidoc-markup-fix'
X-Git-Tag: v2.5.0-rc0~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d1caa5895458443cc9535b6fda6ff8480383471b?hp=--cc

Merge branch 'jk/asciidoc-markup-fix'

Various documentation mark-up fixes to make the output more
consistent in general and also make AsciiDoctor (an alternative
formatter) happier.

* jk/asciidoc-markup-fix:
doc: convert AsciiDoc {?foo} to ifdef::foo[]
doc: put example URLs and emails inside literal backticks
doc: drop backslash quoting of some curly braces
doc: convert \--option to --option
doc/add: reformat `--edit` option
doc: fix length of underlined section-title
doc: fix hanging "+"-continuation
doc: fix unquoted use of "{type}"
doc: fix misrendering due to `single quote'
---

d1caa5895458443cc9535b6fda6ff8480383471b
diff --cc Documentation/config.txt
index efea933561,7714798ffe..54cbf6b7ea
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2296,14 -2260,14 +2296,14 @@@ remote.<name>.receivepack:
  
  remote.<name>.uploadpack::
  	The default program to execute on the remote side when fetching.  See
- 	option \--upload-pack of linkgit:git-fetch-pack[1].
+ 	option --upload-pack of linkgit:git-fetch-pack[1].
  
 -remote.<name>.tagopt::
 +remote.<name>.tagOpt::
- 	Setting this value to \--no-tags disables automatic tag following when
- 	fetching from remote <name>. Setting it to \--tags will fetch every
+ 	Setting this value to --no-tags disables automatic tag following when
+ 	fetching from remote <name>. Setting it to --tags will fetch every
  	tag from remote <name>, even if they are not reachable from remote
  	branch heads. Passing these flags directly to linkgit:git-fetch[1] can
- 	override this setting. See options \--tags and \--no-tags of
+ 	override this setting. See options --tags and --no-tags of
  	linkgit:git-fetch[1].
  
  remote.<name>.vcs::