Merge branch 'md/url-parse-harden' into maint

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6d738f831ebaf316ac79b6a3eb9c544cd18ea7c5..dbf5a0f2762fba5c7d0fcf5f7ec322c413f2b779 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -7,7 +7,10 @@ ARTICLES =
 SP_ARTICLES =
 OBSOLETE_HTML =
 
+-include GIT-EXCLUDED-PROGRAMS
+
 MAN1_TXT += $(filter-out \
+               $(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
                $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
                $(wildcard git-*.txt))
 MAN1_TXT += git.txt