Merge branch 'jc/cache-unmerge'

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index dc76e7f073f23cd911da0b0d0d49b72726576f1a..87a90f2c3fd48bbb593a2cef135310f88d87e4b4 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -17,6 +17,7 @@ caret=^
 startsb=[
 endsb=]
 tilde=~
+backtick=`
 
 ifdef::backend-docbook[]
 [linkgit-inlinemacro]