Change asciidoc backend to more recent name.
The latest asciidoc doesn't have an 'html' backend. 'html' was last valid
with version 6 ( 2005-1-28). Current options are xhtml11, or
html4, with xhtml11 by default.
merge: warning: conflicts during mergemerging amerging a failed!32e80765d7fe+75234512624c+ tipsomething else=======somethingM a