Merge remote-tracking branch 'origin/maint-0.2.4'

doc/asciidoc-helper.sh

@@ -52,8 +52,8 @@ elif [ "$1" = "man" ]; then
 You need a working asciidoc installed to be able to build the manpage.
 
 a2x is installed, but for some reason it isn't working.  Sometimes
-This happens because required docbook support files are missing.
-Please install docbook-xsl, docbook-xml, and libxml2-utils (Debian) or
+this happens because required docbook support files are missing.
+Please install docbook-xsl, docbook-xml, and xmlto (Debian) or
 similar. If you use homebrew on Mac OS X, install the docbook formula
 and add "export XML_CATALOG_FILES=/usr/local/etc/xml/catalog" to your
 .bashrc