Merge refs/heads/master from paulus

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 336578497d3b55163194dc62a0f01121fbed9276..aba35d7d533f678088425a85de675e68359497f8 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,7 +1,11 @@
-MAN1_TXT=$(wildcard git-*.txt)
+MAN1_TXT=$(wildcard git-*.txt) gitk.txt
 MAN7_TXT=git.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
+DOC_HTML += glossary.html
+DOC_HTML += tutorial.html
+DOC_HTML += howto-index.html
+DOC_HTML += howto/revert-branch-rebase.html
 
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -43,7 +47,7 @@ git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@
 
 clean:
-       rm -f *.xml *.html *.1 *.7
+       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
 
 %.html : %.txt
        asciidoc -b xhtml11 -d manpage $<
@@ -54,3 +58,28 @@ clean:
 %.xml : %.txt
        asciidoc -b docbook -d manpage $<
 
+glossary.html : glossary.txt sort_glossary.pl
+       cat $< | \
+       perl sort_glossary.pl | \
+       asciidoc -b xhtml11 - > glossary.html
+
+tutorial.html : tutorial.txt
+       asciidoc -b xhtml11 tutorial.txt
+
+howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
+       rm -f $@+ $@
+       sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
+       mv $@+ $@
+
+howto-index.html: howto-index.txt
+       asciidoc -b xhtml11 howto-index.txt
+
+WEBDOC_DEST = /pub/software/scm/git/docs
+
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+       rm -f $@+ $@
+       sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
+       mv $@+ $@
+
+install-webdoc : html
+       sh ./install-webdoc.sh $(WEBDOC_DEST)