Change projects to point to projectdb

diff --git a/ikiwiki b/ikiwiki
index e1e69609a10733a80c7d70810cc83f2c34026d02..40898f3c74a1eeacd7038bcd1b9e4d8dfdddb16c 160000 (submodule)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1 +1 @@
-Subproject commit e1e69609a10733a80c7d70810cc83f2c34026d02
+Subproject commit 40898f3c74a1eeacd7038bcd1b9e4d8dfdddb16c

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 979cce39afc70b1ec7104afb6ef171d2c0962861..bdb11aee05509f9fc9b8ba30ca8787559d27f002 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -111,7 +111,7 @@ my %common_setup_args = (
        # htmlscrubber plugin
        # PageSpec specifying pages not to scrub
        #htmlscrubber_skip => '!*/Discussion',
-       htmlscrubber_skip => 'calendar',
+       htmlscrubber_skip => 'calendar or office',
 
        # inline plugin
        # enable rss feeds by default?

diff --git a/wiki b/wiki
index a4eaa1c284251bc3a29a9bdd6f39fb99aca66491..2f6552161b0ba76244a21bee34a7bfb0bfb74119 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit a4eaa1c284251bc3a29a9bdd6f39fb99aca66491
+Subproject commit 2f6552161b0ba76244a21bee34a7bfb0bfb74119