Merge branch 'ob/imap-send-ssl-verify'

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index d8edd904065fbc4bd06365ce378f57d4cd8f9f0d..2c8b2d612ee0d6c1f687bfa062bb7fe6471d9280 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -3,8 +3,11 @@
 *.[1-8]
 *.made
 *.texi
+*.pdf
 git.info
 gitman.info
 howto-index.txt
 doc.dep
 cmds-*.txt
+mergetools-*.txt
+manpage-base-url.xsl