Merge branch 'jk/asciidoc-markup-fix' into maint

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'

diff --cc Documentation/config.txt
index 2e5ceaf71974b1e5404de79103648da1829eaf42,7714798ffe76812f11f71e128a14091495f12776..9ccabb4a6ea1c7107fbf1bbf7d7eb06a2b7e701f
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2274,14 -2260,14 +2274,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::

diff --cc Documentation/diff-options.txt
Simple merge

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

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

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

diff --cc Documentation/git-send-pack.txt
Simple merge

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