Merge branch 'md/interix'

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