Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 12 insertions, 1 deletions

diff --git a/doc/asciidoc/README.txt b/doc/asciidoc/README.txt
index 7547248..04f0c29 100644
--- a/doc/asciidoc/README.txt
+++ b/doc/asciidoc/README.txt
@@ -2,7 +2,18 @@ whats this? this is the attempt to write the documentation for
 fluxbox in ascii-doc format. how does it work?
 
 well, just edit fluxbox.txt from this directory. save it.
-then we can produce pretty much any format we like:
+then we can produce pretty much any format we like: man, pdf, docbook, html,
+etc.
+
+For simplicity the Makefile here is set up to refresh the man pages that will be
+installed with fluxbox.  Just run 'make dist' in this directory. It requires
+that you have a recent asciidoc package installed from
+http://www.methods.co.nz/asciidoc/ and xmlto from
+https://fedorahosted.org/xmlto/browser. The result will be new fluxbox.1.in
+files in the parent directory.  These and your altered .txt files should be
+checked into git.
+
+Here are the nuts and bolts to create other formats:
 
 man: