Merge refs/heads/master from .

diff --git a/Documentation/Makefile b/Documentation/Makefile
index c887ded6afaaacadf9675610e86e261a6e85d139..91addedca0cee764a74723272f4953dd70a1b62d 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -2,7 +2,8 @@ MAN1_TXT=$(wildcard git-*.txt)
 MAN7_TXT=git.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
-
+DOC_HTML += glossary.html
+DOC_HTML += tutorial.html
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
@@ -53,3 +54,11 @@ 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