Merge branch 'master' into debian-jessie-backports

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

diff --git a/.gitignore b/.gitignore
index 8528fe9bed7336175e4315f610c96a2d6880af6a..d27140896a6c3dc4ad0702dccd20dec78cd38a4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-ikiwiki.setup
-Makefile
+/ikiwiki.setup
+/Makefile

 Makefile.old
 blib/*
 /cover_db
 Makefile.old
 blib/*
 /cover_db


@@ -8,12 +8,15 @@ html/*
 ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out
 ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out

+ikiwiki-comment.out

 pm_to_blib
 /MYMETA.json
 /MYMETA.yml
 *.man
 /po/cover_db
 pm_to_blib
 /MYMETA.json
 /MYMETA.yml
 *.man
 /po/cover_db

+/po/html/

 po/po2wiki_stamp
 po/po2wiki_stamp

+/po/underlays/.ikiwiki

 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn


@@ -21,3 +24,5 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/

+/t/manual/*/git/
+/t/manual/*/html/