changeset 5058:a3d6de2838de

merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 13:03:25 +0200
parents 8db8e1100f3f (diff) f191bc3916f7 (current diff)
children 8d9bdcbb2b18
files tests/test-double-merge
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/README
+++ b/doc/README
@@ -18,4 +18,6 @@ To display:
 
 To create the html page (without stylesheets):
 
- asciidoc -b html hg.1.txt
+ asciidoc -b html4 hg.1.txt
+
+(older asciidoc may want html instead of html4 above)