Merge "Remove asciidoc.conf"