Merge branch 'master' of git://linux-nfs.org/~bfields/git

This is in the hope of giving JBF's user-manual wider exposure.
I am not very happy with trailing whitespaces in the new
document, but let's not worry too much about the formatting
issues for now, but concentrate more on the structure and the
contents.

diff --cc Documentation/Makefile
index 5314068d32f1e9205ec7b76c9356674a414d773c,c2ee5b4824aa8708ddbddf0afd4415442a086557..5e012f48e360985f8433da971daa1de8075da758
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -99,6 -89,14 +99,12 @@@ clean
  %.xml : %.txt
        asciidoc -b docbook -d manpage -f asciidoc.conf $<
  
 -git.html: git.txt README
 -
+ user-manual.xml: user-manual.txt user-manual.conf
+       asciidoc -b docbook -d book $<
+ 
+ user-manual.html: user-manual.xml
+       xmlto -m /etc/asciidoc/docbook-xsl/xhtml.xsl html-nochunks $<
+ 
  glossary.html : glossary.txt sort_glossary.pl
        cat $< | \
        perl sort_glossary.pl | \