asciidoc fixes
Merge branch 'master' into database-support