calendar: Tune archive_pagespec to only match pages, not other files.

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 359c9b86141541549a1f42a32fa0ef869ec08987..bb995d49956e27234e5bb9b621c2caa641b93d40 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -49,7 +49,7 @@ sub getsetup () {
                },
                archive_pagespec => {
                        type => "pagespec",
                },
                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,
                        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 ef03295d68bf5c9c4d3b93c208c17a346be5ad38..980074ec3affe8a7426586166903a1c9884361ed 100644 (file)
--- 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(*)",
        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 => "*",
        global_sidebars => 0,
        discussion => 0,
        locked_pages => "*",

diff --git a/debian/changelog b/debian/changelog
index 32ba0cf082be0a309784665544de232d41ee6ae3..bddedeafaee8109335ba2a148ab819bb6da1aa0b 100644 (file)
--- 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)
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400