Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 77c0b3dccda79aaaf712b704fe58680cdc41f2e9..d27140896a6c3dc4ad0702dccd20dec78cd38a4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-ikiwiki.setup
-Makefile
+/ikiwiki.setup
+/Makefile
 Makefile.old
 blib/*
 /cover_db
@@ -14,7 +14,9 @@ pm_to_blib
 /MYMETA.yml
 *.man
 /po/cover_db
+/po/html/
 po/po2wiki_stamp
+/po/underlays/.ikiwiki
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn
@@ -22,3 +24,5 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/
+/t/manual/*/git/
+/t/manual/*/html/