summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/calendar.pm2
-rw-r--r--auto-blog.setup2
-rw-r--r--debian/changelog1
3 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 359c9b861..bb995d499 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -49,7 +49,7 @@ sub getsetup () {
},
archive_pagespec => {
type => "pagespec",
- example => "posts/* and !*/Discussion",
+ example => "page(posts/*) and !*/Discussion",
description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
link => 'ikiwiki/PageSpec',
safe => 1,
diff --git a/auto-blog.setup b/auto-blog.setup
index ef03295d6..980074ec3 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -46,7 +46,7 @@ IkiWiki::Setup::Automator->import(
example => "blog",
comments_pagespec => "posts/* and !*/Discussion",
blogspam_pagespec => "postcomment(*)",
- archive_pagespec => "posts/* and !*/Discussion",
+ archive_pagespec => "page(posts/*) and !*/Discussion",
global_sidebars => 0,
discussion => 0,
locked_pages => "*",
diff --git a/debian/changelog b/debian/changelog
index 32ba0cf08..bddedeafa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
* websetup: Allow enabling plugins listed in disable_plugins.
* editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
(Thanks, privat)
+ * calendar: Tune archive_pagespec to only match pages, not other files.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400