Merge branch 'master' into next

diff --git a/Documentation/Makefile b/Documentation/Makefile
index c1af22ce04f71fe2d4a49a908e10878f7b5e0bcf..2a08f592d99476ced40153880461559d059c53e3 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -7,6 +7,7 @@ MAN7_TXT=git.txt
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
 
 ARTICLES = tutorial
+ARTICLES += tutorial-2
 ARTICLES += core-tutorial
 ARTICLES += cvs-migration
 ARTICLES += diffcore