Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 96755ad68751282eb7262cd5cec3d84a3d07d85c..266af47176a7f09000ed90f43b5ed83af74db8ea 100644 (file)
--- 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))
 
@@ -76,9 +76,12 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
        cmds-mainporcelain.txt \
        cmds-plumbinginterrogators.txt \
        cmds-plumbingmanipulators.txt \
-       cmds-synchingrepositories.txt
+       cmds-synchingrepositories.txt \
+       cmds-synchelpers.txt \
+       cmds-purehelpers.txt \
+       cmds-foreignscminterface.txt
 
-$(cmds_txt): cmd-list.perl $(MAN1_TXT) $(MAN7_TXT)
+$(cmds_txt): cmd-list.perl $(MAN1_TXT)
        perl ./cmd-list.perl
 
 git.7 git.html: git.txt core-intro.txt
@@ -96,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 html-nochunks $<
+
 glossary.html : glossary.txt sort_glossary.pl
        cat $< | \
        perl sort_glossary.pl | \