Merge branch 'js/misc-doc-fixes'

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index ea27148c598f925600f00f1af79f58fc9034f1a4..9022d4835545cbf40c9537efa8ca9a7678e42673 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -13,4 +13,5 @@ mergetools-*.txt
 manpage-base-url.xsl
 SubmittingPatches.txt
 tmp-doc-diff/
+GIT-ASCIIDOCFLAGS
 /GIT-EXCLUDED-PROGRAMS