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

changes/bug6436

+  o Minor features:
+    - Provide a better error message about possible OSX Asciidoc failure
+      reasons. Fix for bug 6436.

doc/asciidoc-helper.sh

@@ -54,7 +54,9 @@ 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
-similar.
+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
 
 Alternatively, to build without manpages, use the --disable-asciidoc
 argument when calling configure.