torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2012-07-23 12:31:24 -04:00
parent a4995d1507 6cf8e38eca
commit 952f562691
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug6436
+3
View File
@@ -0,0 +1,3 @@
o Minor features:
- Provide a better error message about possible OSX Asciidoc failure
reasons. Fix for bug 6436.
doc/asciidoc-helper.sh
+3 -1
View File
@@ -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.