summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-31 14:41:17 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-31 14:43:30 -0800
commit9299c4f147bcff603eef187eb04fe38153571d30 (patch)
treee348ab4c4cfcfc32384bb0363cec1a6f6e04abf6 /Documentation/Makefile
parent3c23d66fc30e8805a2b66708acd3f0da921085ba (diff)
parent0b375ab0a511568fe2c80aede9a297b640212d35 (diff)
downloadgit-9299c4f147bcff603eef187eb04fe38153571d30.tar.gz
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.
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 5314068d32..5e012f48e3 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -17,7 +17,7 @@ ARTICLES += hooks
ARTICLES += everyday
ARTICLES += git-tools
# with their own formatting rules.
-SP_ARTICLES = glossary howto/revert-branch-rebase
+SP_ARTICLES = glossary howto/revert-branch-rebase user-manual
DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
@@ -99,6 +99,12 @@ clean:
%.xml : %.txt
asciidoc -b docbook -d manpage -f asciidoc.conf $<
+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 | \