Merge branch 'jn/doc-dashdash' into maint

* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc

Conflicts:
Documentation/git-mergetool--lib.txt

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-mergetool--lib.txt
index 8c5be6775d3d2a03518f07f90a2c336d558fdde5,5b0d51f7f8cfc52739463dd90827fe5d0dc1b58c..f98a41b87c16007d6d9fa916c6a3bb31fb049216
--- 1/Documentation/git-mergetool--lib.txt
--- 2/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@@ -7,8 -7,7 +7,8 @@@ git-mergetool--lib - Common git merge t
  
  SYNOPSIS
  --------
- 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
 +[verse]
+ 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
  
  DESCRIPTION
  -----------

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

diff --cc Documentation/git-sh-i18n.txt
Simple merge

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

diff --cc Documentation/git-web--browse.txt
Simple merge

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