Sync with 1.7.9.6

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index dc76e7f073f23cd911da0b0d0d49b72726576f1a..aea8627be088c58ef9ad7fd07f5498da88d9b1fc 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -16,7 +16,11 @@ plus=+
 caret=^
 startsb=[
 endsb=]
+backslash=\
 tilde=~
+apostrophe='
+backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkgit-inlinemacro]