Merge branch 'jc/maint-doc-em-dash'

* jc/maint-doc-em-dash:
  Work around em-dash handling in newer AsciiDoc

diff --cc Documentation/asciidoc.conf
index b5f0f29d1f736f2e6a0c544d682b973b95420191,3267bae9da46ffa6e511c3bf36387bf5a85e6440..aea8627be088c58ef9ad7fd07f5498da88d9b1fc
--- 1/Documentation/asciidoc.conf
--- 2/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@@ -16,10 -16,9 +16,11 @@@ plus=&#43
  caret=^
  startsb=[
  endsb=]
 +backslash=\
  tilde=~
 +apostrophe='
  backtick=`
+ litdd=--
  
  ifdef::backend-docbook[]
  [linkgit-inlinemacro]

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

diff --cc Documentation/git-instaweb.txt
index e70cea932063b04f3ab3c78b882f4981514d663e,61e2cbbebc21e95ba76edf7f21335c2f606f6cb9..7477ce8fa8e5185cfbd74a31b8d5accd18216a1b
--- 1/Documentation/git-instaweb.txt
--- 2/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@@ -44,12 -44,11 +44,12 @@@ OPTION
  -b::
  --browser::
        The web browser that should be used to view the gitweb
-       page. This will be passed to the 'git web--browse' helper
+       page. This will be passed to the 'git web{litdd}browse' helper
        script along with the URL of the gitweb instance. See
-       linkgit:git-web--browse[1] for more information about this. If
+       linkgit:git-web{litdd}browse[1] for more information about this. If
        the script fails, the URL will be printed to stdout.
  
 +start::
  --start::
        Start the httpd instance and exit.  This does not generate
        any of the configuration files for spawning a new instance.