Merge commit 'smcv/prefix'

Conflicts: doc/news/version_2.49.mdwn Also fixed the newest news file (and my wikiannounce script).
author: Joey Hess <joey@kodama.kitenet.net> 2008-07-21 11:33:43 -0400
committer: Joey Hess <joey@kodama.kitenet.net> 2008-07-21 11:34:49 -0400
commit: d5e65e582a34ae2494fee493ddcb2b959e4a4bce (patch)
tree: 14bf1f7a604406ecb98523eda42c2e864321e1d0
parent: d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff)
parent: e3a84952715cdd625258e1695cb74898006c31f3 (diff)
download: ikiwiki-d5e65e582a34ae2494fee493ddcb2b959e4a4bce.tar
ikiwiki-d5e65e582a34ae2494fee493ddcb2b959e4a4bce.tar.gz
329 files changed, 729 insertions, 729 deletions
diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 8276c0833..a78e4843a 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -19,7 +19,7 @@ Bus connections
 * Bus Nr. 02 - **Wiki Developers Tour** - next stop: [MeatballWiki TourBusStop](http://www.usemod.com/cgi-bin/mb.pl?TourBusStop)
 * Bus Nr. 42 - **Software Developers Tour** - next stop: [Ward's Wiki TourBusStop](http://c2.com/cgi/wiki?TourBusStop)
 
-[[meatballwiki TourBusMap]]
+[[!meatballwiki TourBusMap]]
 
 Famous sights to visit here at **ikiwiki**
 ==========================================
diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index 888685625..f634b6e78 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -3,7 +3,7 @@ elsewhere. Link items to [[bugs/done]] when done.
 
 Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
 
-[[inline pages="bugs/* and !bugs/done and !bugs/discussion and 
+[[!inline pages="bugs/* and !bugs/done and !bugs/discussion and 
 !link(patch) and !link(bugs/done) and !bugs/*/*"
 feedpages="created_after(bugs/no_commit_mails_for_new_pages)"
 actions=yes rootpage="bugs" postformtext="Add a new bug titled:" show=0]]
diff --git a/doc/bugs/Another_UTF-8_problem.mdwn b/doc/bugs/Another_UTF-8_problem.mdwn
index b5bcd30d2..031576f00 100644
--- a/doc/bugs/Another_UTF-8_problem.mdwn
+++ b/doc/bugs/Another_UTF-8_problem.mdwn
@@ -10,4 +10,4 @@ with my pretty standard Ubuntu gutsy Firefox installation?  --[[tschwinge]]
 > is already valid utf-8, when in fact it's not yet been decoded. So I
 > removed that line to fix it. --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn
index 1b09608c6..a40a454c1 100644
--- a/doc/bugs/CGI_problem_with_some_webservers.mdwn
+++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn
@@ -1,5 +1,5 @@
 The "ikwiki.cgi?page=index&do=edit" function has a problem
-when running with [[debpkg thttpd]] or [[debpkg mini-httpd]]:
+when running with [[!debpkg thttpd]] or [[!debpkg mini-httpd]]:
 for some reason the headers ikiwiki outputs are transmitted
 as the page content. Surprisingly, the "do=prefs" function
 works as expected.
@@ -15,7 +15,7 @@ Here is what it looks like in iceweasel:
     <html>
     (...)
 
-Ikiwiki runs fine with [[debpkg boa]].
+Ikiwiki runs fine with [[!debpkg boa]].
 
 --[[JeremieKoenig]]
 
@@ -64,6 +64,6 @@ Why do they appear two times with conflicting values in the very same hashes?
 >>> where ikiwiki might output to stderr, and that's the right thing to do.
 >>> So I don't see any way to address this in ikiwiki. --[[Joey]]
 
->>>> (reported as [[debbug 437927]] and [[debbug 437932]]) --[[JeremieKoenig]]
+>>>> (reported as [[!debbug 437927]] and [[!debbug 437932]]) --[[JeremieKoenig]]
 
 Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]]
diff --git a/doc/bugs/Can__39__t_create_root_page.mdwn b/doc/bugs/Can__39__t_create_root_page.mdwn
index 6b0d0023d..60cbcd530 100644
--- a/doc/bugs/Can__39__t_create_root_page.mdwn
+++ b/doc/bugs/Can__39__t_create_root_page.mdwn
@@ -66,4 +66,4 @@ This type of page name (with leading slash) also gets created by the aggregate p
 
 >> -- intrigeri
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/bugs/Insecure_dependency_in_utime.mdwn b/doc/bugs/Insecure_dependency_in_utime.mdwn
index de20385f6..330479d22 100644
--- a/doc/bugs/Insecure_dependency_in_utime.mdwn
+++ b/doc/bugs/Insecure_dependency_in_utime.mdwn
@@ -11,4 +11,4 @@ I worked-around this by doing:
 > apparently all versions of perl, apparently leaking taint flags at random.
 > See [[Insecure_dependency_in_mkdir]] --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn b/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
index 444de431b..fe634e9c1 100644
--- a/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
+++ b/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
@@ -16,7 +16,7 @@ I have a few tags starting with `a` (abridged list):
 
 In `wiki-wc/factors/tag.mdwn`, I have a map for these tags:
 
-    \[[map pages="factors/tag/*"]]
+    \[[!map pages="factors/tag/*"]]
 
 and this works, except that for *whatever* reason, it actually sorts the three
 `affects/*` tags under `active`:
diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn
index 103e31001..3d1388312 100644
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -4,7 +4,7 @@ so commits made via monotone will not automatically update the wiki.
 Here for future reference is the most recent version of support for 
 that I've been sent. It's not yet working; there are path issues. --[[Joey]]
 
-> I think this was fixed in version 2.40. --[[Joey]] [[tag done]]
+> I think this was fixed in version 2.40. --[[Joey]] [[!tag done]]
 
 <pre>
 diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
diff --git a/doc/bugs/No___34__sid__34___in_forms_resulting_in_Error:_Your_login_session_has_expired..mdwn b/doc/bugs/No___34__sid__34___in_forms_resulting_in_Error:_Your_login_session_has_expired..mdwn
index 37f745047..06bbce91a 100644
--- a/doc/bugs/No___34__sid__34___in_forms_resulting_in_Error:_Your_login_session_has_expired..mdwn
+++ b/doc/bugs/No___34__sid__34___in_forms_resulting_in_Error:_Your_login_session_has_expired..mdwn
@@ -36,4 +36,4 @@ View source of editing page or preview+edit page shows no "sid" input value. (I
 	</TMPL_IF>
 
 > Well, that don't look like as good an idea today.. I've documented the
-> recent template change. --[[Joey]] [[tag done]]
+> recent template change. --[[Joey]] [[!tag done]]
diff --git a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
index ac6d6db1e..608d09b74 100644
--- a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
+++ b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn
@@ -6,7 +6,7 @@ EDIT: I just found that in this wiki under <http://ikiwiki.info/bugs/done/> the
 enabled, then `$safe_url_regexp` determines the URL unsafe because of the
 colon and hence removes the `src` attribute.
 
-Digging into this, I find that [[rfc 3986]] pretty much discourages colons in
+Digging into this, I find that [[!rfc 3986]] pretty much discourages colons in
 filenames:
 
 > A path segment that contains a colon character (e.g., "this:that") cannot be
diff --git a/doc/bugs/Problem_with_toc.pm_plug-in.mdwn b/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
index f756bf8f5..8ae347d42 100644
--- a/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
+++ b/doc/bugs/Problem_with_toc.pm_plug-in.mdwn
@@ -5,7 +5,7 @@ Here is a patch for toc.pm for producing non-empty 'a' elements.
 > Thanks for the patch, but I already fixed this in 2.4 using a different
 > approach. I think your patch is slightly broken, an anchor tag isn't
 > really meant to enclose all the html it anchors to, but just be stuck in
-> front of it. --[[Joey]] [[tag done]]
+> front of it. --[[Joey]] [[!tag done]]
 
     --- IkiWiki/Plugin/toc.pm.orig	Thu Jun  7 11:53:53 2007
     +++ IkiWiki/Plugin/toc.pm	Thu Jun  7 13:00:00 2007
diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index f283bfa65..aeeb9e21b 100644
--- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
+++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
@@ -53,4 +53,4 @@ the smiley issue remains open. --[[JasonBlevins]]
 
 > This bug is [[done]], all issues are fixed. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
index 56cda026f..27919f7be 100644
--- a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
+++ b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
@@ -1,7 +1,7 @@
 Versions 2.0 and 2.1 of ikiwiki, and I think earlier versions as well,
-allowed wiki links to have spaces in the link text. For example, [[ikiwiki
+allowed wiki links to have spaces in the link text. For example, [[!ikiwiki
 logo page|logo]] should create an anchor tag referencing the logo page, and
-[[ikiwiki logo|logo/ikiwiki.png]] should create an image tag referencing
+[[!ikiwiki logo|logo/ikiwiki.png]] should create an image tag referencing
 the logo.
 
 As of version 2.2, this no longer works. I think the pattern \\[[...|...]]
diff --git a/doc/bugs/Spurious___60__p__62___elements_added_to_tags_in_inliine_pages.mdwn b/doc/bugs/Spurious___60__p__62___elements_added_to_tags_in_inliine_pages.mdwn
index c59a6ba40..e3b1d858d 100644
--- a/doc/bugs/Spurious___60__p__62___elements_added_to_tags_in_inliine_pages.mdwn
+++ b/doc/bugs/Spurious___60__p__62___elements_added_to_tags_in_inliine_pages.mdwn
@@ -1,4 +1,4 @@
-[[tag patch]]
+[[!tag patch]]
 
 When a page containing tags and using the [[syntax_(3rd_party)_plugin|plugins/contrib/syntax]] (though pages using other preprocessors may also be affected) is rendered as an inline page, some extra `<p>` elements are added.
 
diff --git a/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn b/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
index 608948466..4849edd63 100644
--- a/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
+++ b/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
@@ -8,7 +8,7 @@ The following renders incorrectly:
 
 	# header2
 
-	\[[map pages="sandbox"]]
+	\[[!map pages="sandbox"]]
 
 
 Removing the `\[[!toc]]` directive or moving it at the end of the page
@@ -21,7 +21,7 @@ in the HTML output, without any leading `<p>` or any HTML formatting.
 > html parser, that will get confused if markdown is present between two
 > separate html blocks, and not format the markdown.
 > 
-> This is fixed in [[cpan Text::MarkDown]] 1.0.19. markdown 1.0.2 also
+> This is fixed in [[!cpan Text::MarkDown]] 1.0.19. markdown 1.0.2 also
 > fixes the problem. Install either one. I'm going to make ikiwiki's
 > dependencies list Text::Markdown before markdown, since people keep
 > stumbling over this. (The downside is that the old broken markdown is
diff --git a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
index 3f65b01b9..2c3fdea3e 100644
--- a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
+++ b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn
@@ -23,8 +23,8 @@ I tried searching the web and wiki but could not find any information on why <br
 
 > > `<br/>` is also valid, so this is a bug still. --[[madduck]]
 
->>> It _is_ the htmlscrubber that removes that. It's due to [[debbug 365971]], 
->>> basically the [[cspan HTML::Scrubber]] doesn't understand xhtml tags
+>>> It _is_ the htmlscrubber that removes that. It's due to [[!debbug 365971]], 
+>>> basically the [[!cspan HTML::Scrubber]] doesn't understand xhtml tags
 >>> of this sort at all, I hacked it to support `<br />` by tellig it to treak 
 >>> the "/" as an attribute, but if there's no space, it doesn't see it as 
 >>> an attribute. Hmm, I could also add `br` as a tag name, that would catch both cases.
diff --git a/doc/bugs/aggregate_plugin_errors.mdwn b/doc/bugs/aggregate_plugin_errors.mdwn
index e62b7852e..aa36bdd09 100644
--- a/doc/bugs/aggregate_plugin_errors.mdwn
+++ b/doc/bugs/aggregate_plugin_errors.mdwn
@@ -23,11 +23,11 @@ feed I'm seeing this with is http://www.wirelesscommons.org/feed.php
 > This is a bug in XML::Parser. Unfortunately, perl does not have a feed
 > parser that handles invalid feeds, and in particular, XML::Parser has
 > issues with feeds that claim to be encoded in utf-8 and contain invalid
-> utf sequences, as well as other encoding issues. See also [[debbug 380426]].
+> utf sequences, as well as other encoding issues. See also [[!debbug 380426]].
 > Note though that this invalid feed does not really crash the aggregate plugin,
 > it just notes that XML::Parser crashed on it and continues. This is the
 > best I can do in ikiwiki. I have filed a bug on XML::Parser about this,
-> it's [[debbug 420636]].  I've also put in a workaround, so [[done]].
+> it's [[!debbug 420636]].  I've also put in a workaround, so [[done]].
 
 **Wonderful**, thanks Joey! -- Adam.
 
diff --git a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
index 082f0800c..565f3b16c 100644
--- a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
+++ b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
@@ -110,4 +110,4 @@ Index: IkiWiki/Plugin/inline.pm
 
 [[done]] --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/bugs/debbug_shortcut_should_expand_differently.mdwn b/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
index 22a1c149c..d34c40244 100644
--- a/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
+++ b/doc/bugs/debbug_shortcut_should_expand_differently.mdwn
@@ -1,4 +1,4 @@
-`\[[debbug 123456]]` expands to "bug #123456", which is hyperlinked. Could you please drop the leading "bug", for two reasons?
+`\[[!debbug 123456]]` expands to "bug #123456", which is hyperlinked. Could you please drop the leading "bug", for two reasons?
 
 First, #123456 is not a bug, it's a bug report. And second, #123456 suffices, doesn't it? By hardcoding the "bug" in there, you make it impossible to start a sentence with a bug number, e.g.:
 
diff --git a/doc/bugs/done.mdwn b/doc/bugs/done.mdwn
index 282122001..0a666ab11 100644
--- a/doc/bugs/done.mdwn
+++ b/doc/bugs/done.mdwn
@@ -1,3 +1,3 @@
 recently fixed [[bugs]]
 
-[[inline pages="link(bugs/done) and !bugs and !*/Discussion" sort=mtime show=10]]
+[[!inline pages="link(bugs/done) and !bugs and !*/Discussion" sort=mtime show=10]]
diff --git a/doc/bugs/format_bug.mdwn b/doc/bugs/format_bug.mdwn
index 3d4b4a94e..dc9a09ebb 100644
--- a/doc/bugs/format_bug.mdwn
+++ b/doc/bugs/format_bug.mdwn
@@ -15,7 +15,7 @@ encouraging.
 
 > This is a bug in markdown, not in ikiwiki. Markdown often has issues with
 > one sort of list followed by a second sort. I've filed a bug report on
-> markdown about this ([[debbug 432152]])
+> markdown about this ([[!debbug 432152]])
 
 > (BTW, this bug was filed by editing the bugs page directly. Please don't
 > do that, use the form to generate a new per-bug page..)
diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn
index 1135236ae..25aa417d0 100644
--- a/doc/bugs/git_fails_to_compile.mdwn
+++ b/doc/bugs/git_fails_to_compile.mdwn
@@ -29,4 +29,4 @@ Thanks.
 >>> security since ikiwiki can be run setuid.) If you need to use
 >>> a nonstandard path, you'll need to edit that. --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
index ec02ddb89..2882eeb12 100644
--- a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
+++ b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
@@ -23,4 +23,4 @@ I see two possibilities how to fix this:
 > to be no way to override it reading /etc/tidy.conf, so options there can
 > still screw things up. I guess I'll pass --markup yes and deal with
 > overriding other problem settings from config files if they're found
-> later. --[[Joey]] [[tag done]]
+> later. --[[Joey]] [[!tag done]]
diff --git a/doc/bugs/img_plugin_causes_taint_failure.mdwn b/doc/bugs/img_plugin_causes_taint_failure.mdwn
index e2b85e498..14de17557 100644
--- a/doc/bugs/img_plugin_causes_taint_failure.mdwn
+++ b/doc/bugs/img_plugin_causes_taint_failure.mdwn
@@ -1,6 +1,6 @@
 The img plugin causes a taint failure if one tries to link a scaled image, e.g.
 
-    \[[img foo.png size=64x64]]
+    \[[!img foo.png size=64x64]]
 
     .ikiwiki.setup: Insecure dependency in mkdir while running with -T switch at /usr/lib/perl5/vendor_perl/5.8.8/IkiWiki.pm line 360.
     BEGIN failed--compilation aborted at (eval 5) line 109.
diff --git a/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn b/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn
index f7883dbb7..6b861c397 100644
--- a/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn
+++ b/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn
@@ -33,4 +33,4 @@ I have been unable to reproduce this outside of the `madduck.net` website...
 
 **Update**: this is the same bug as [[the_colon-in-links_bug|No_link_for_blog_items_when_filename_contains_a_colon]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/index.html__63__updated.mdwn b/doc/bugs/index.html__63__updated.mdwn
index e56bd7941..2f20d66bb 100644
--- a/doc/bugs/index.html__63__updated.mdwn
+++ b/doc/bugs/index.html__63__updated.mdwn
@@ -10,6 +10,6 @@ After editing a page `pagename`, ikiwiki redirects to `pagename/index.html?updat
 > said broken software will then display its old out of date cached
 > version.
 > 
-> So, not changing this. [[tag done]]
+> So, not changing this. [[!tag done]]
 > 
 > --[[Joey]]
diff --git a/doc/bugs/iniline_breaks_toc_plugin.mdwn b/doc/bugs/iniline_breaks_toc_plugin.mdwn
index 1c715221e..a99f8d6da 100644
--- a/doc/bugs/iniline_breaks_toc_plugin.mdwn
+++ b/doc/bugs/iniline_breaks_toc_plugin.mdwn
@@ -1,7 +1,7 @@
 Hi, I try to make an example to reproduce some bug with inline and toc plugins.
 My friend uses
 
-    \[[inline pages="users/joey" raw="yes"]]
+    \[[!inline pages="users/joey" raw="yes"]]
 
 to include common snippets in various pages, and it works as advertised, but if toc plugin is used, page is messed up.
 
@@ -26,7 +26,7 @@ All this is displayed correctly if toc is removed.
 > [here](http://bugs.debian.org/421843).
 > 
 > I'm going to close this bug report since it's a markdown bug. --[[Joey]]
-[[tag done]]
+[[!tag done]]
 
 >> thanks, that fixes it.
 
@@ -42,11 +42,11 @@ bla bla bla
  * bl bla
  * aadsd
 
-[[toc levels=2]]
+[[!toc levels=2]]
 
 bla bla
 
-[[table data="""
+[[!table data="""
 Customer|Amount
 Fulanito|134,34
 Menganito|234,56
@@ -59,6 +59,6 @@ Menganito|234,56
 Here's a paragraph.
 
 
-[[inline pages="users/joey" raw="yes"]]
+[[!inline pages="users/joey" raw="yes"]]
 
 bla bla
diff --git a/doc/bugs/inline_plugin_rootpage_option_is_not_case_insensitive.mdwn b/doc/bugs/inline_plugin_rootpage_option_is_not_case_insensitive.mdwn
index e8f033aa4..8ef128117 100644
--- a/doc/bugs/inline_plugin_rootpage_option_is_not_case_insensitive.mdwn
+++ b/doc/bugs/inline_plugin_rootpage_option_is_not_case_insensitive.mdwn
@@ -6,4 +6,4 @@ But maybe this is intended behavior? --rdennis
 > filesystem. It just avoids you having to get the case right when
 > referring to existing files, by wikilinks or pagespecs --[[Joey]] 
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn b/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
index 5d6c6ad6d..e8392a80d 100644
--- a/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
+++ b/doc/bugs/mailto:_links_not_properly_generated_in_rssatom_feeds.mdwn
@@ -1,5 +1,5 @@
-[[meta title="mailto: links not properly generated in rss/atom feeds"]]
+[[!meta title="mailto: links not properly generated in rss/atom feeds"]]
 
 A link like \[this](mailto:foo@bar.org) will not be converted correctly to a mailto link in the rss/atom feeds, but an absolute link instead. See e.g. the logitech post on http://madduck.net/blog/feeds/planet-lca2008/index.rss
 
-> fixed --[[Joey]] [[tag done]]
+> fixed --[[Joey]] [[!tag done]]
diff --git a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn
index afc5d90cc..d197cdb6c 100644
--- a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn
+++ b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn
@@ -1,4 +1,4 @@
-[[meta title="map does not link entries which are equal to basename(current_page)"]]
+[[!meta title="map does not link entries which are equal to basename(current_page)"]]
 
 On <http://phd.martin-krafft.net/wiki/tag/factors/>, the top-level `factors` entry is not linked to the corresponding page. Looking at <http://phd.martin-krafft.net/wiki/tag/factors/language/>, this must be because the page name is the same as the entry name, and ikiwiki probably doesn't take the complete path of subpages into account.
 
diff --git a/doc/bugs/map_doesn__39__t_calculate___34__common__95__prefix__34___correctly.mdwn b/doc/bugs/map_doesn__39__t_calculate___34__common__95__prefix__34___correctly.mdwn
index d6923605d..df00621d8 100644
--- a/doc/bugs/map_doesn__39__t_calculate___34__common__95__prefix__34___correctly.mdwn
+++ b/doc/bugs/map_doesn__39__t_calculate___34__common__95__prefix__34___correctly.mdwn
@@ -4,7 +4,7 @@ Problem with [[plugins/map]]:
 
 ## given map:
 
-\[[map pages="blog/tags/*"]]
+\[[!map pages="blog/tags/*"]]
 
 ## received map:
 
diff --git a/doc/bugs/pipe_in_tables_as_characters.mdwn b/doc/bugs/pipe_in_tables_as_characters.mdwn
index d9c080a65..12d5e1597 100644
--- a/doc/bugs/pipe_in_tables_as_characters.mdwn
+++ b/doc/bugs/pipe_in_tables_as_characters.mdwn
@@ -10,7 +10,7 @@ Seems tables are disabled here ?
 
 See this example:
 
-[[table class=table1 data="""
+[[!table class=table1 data="""
 aaaaaaaaaaaaaaa|b|c
 --\|\|--|e|f
 """]]
diff --git a/doc/bugs/prune_causing_taint_mode_failures.mdwn b/doc/bugs/prune_causing_taint_mode_failures.mdwn
index e698cbed7..1876d9129 100644
--- a/doc/bugs/prune_causing_taint_mode_failures.mdwn
+++ b/doc/bugs/prune_causing_taint_mode_failures.mdwn
@@ -32,4 +32,4 @@ sub prune ($) { #{{{
 > I don't really support using ikiwiki with the perl 5.8.4 in debian
 > oldstable, and would recommend upgrading. --[[Joey]]
 
-[[tag patch done]]
+[[!tag patch done]]
diff --git a/doc/bugs/raw_html_in-page_and___91____91____33__included__93____93__.mdwn b/doc/bugs/raw_html_in-page_and___91____91____33__included__93____93__.mdwn
index 607326c97..5860d330a 100644
--- a/doc/bugs/raw_html_in-page_and___91____91____33__included__93____93__.mdwn
+++ b/doc/bugs/raw_html_in-page_and___91____91____33__included__93____93__.mdwn
@@ -8,9 +8,9 @@ This should work, but html code (listing 1) shows up with a hash replaced for th
 
 I have to suspect that replacing html with some hash is a bug.
 
-> Congrats, you're another person to fall afoul of markdown [[debbug 380212]].
+> Congrats, you're another person to fall afoul of markdown [[!debbug 380212]].
 > The fix is to use Text::Markdown, or markdown 1.0.2 instead of buggy
-> old markdown 1.0.1. --[[Joey]] [[tag done]]
+> old markdown 1.0.1. --[[Joey]] [[!tag done]]
 
 ## inlining raw html
 
diff --git a/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn b/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
index f646143d3..b3578f26a 100644
--- a/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
+++ b/doc/bugs/recentchangesdiff_crashes_on_commits_which_remove_a_lot_of_files.mdwn
@@ -40,7 +40,7 @@ The tarball is at http://scratch.madduck.net/__tmp__recentchanges-segfault.tgz -
 > I only see it with 1.0.1. (Bad news: Newer versions of markdown are
 > slooooooow, especially on such large files.)
 
-> I'm calling this [[done]] since I've filed [[debbug 470676]] on perl, and
+> I'm calling this [[done]] since I've filed [[!debbug 470676]] on perl, and
 > also have modified recentchangesdiff to only show the first 200 lines of
 > diff, which should be enough without bloating the recentchanges into
 > perl-crashing territory. --[[Joey]]
diff --git a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
index 5121f0379..b0f417209 100644
--- a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
+++ b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
@@ -17,4 +17,4 @@ markdown plugin also has no problems rendering the same file, so I'm guessing
 it's a problem with the XML-RPC interface.
 
 Sorry for the delay, this is now fixed! --[[Joey]]
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/search:___34__link__34___and___34__title__34___fields_are_incorrectly_specified.mdwn b/doc/bugs/search:___34__link__34___and___34__title__34___fields_are_incorrectly_specified.mdwn
index 5cc66f3f8..c088d1eae 100644
--- a/doc/bugs/search:___34__link__34___and___34__title__34___fields_are_incorrectly_specified.mdwn
+++ b/doc/bugs/search:___34__link__34___and___34__title__34___fields_are_incorrectly_specified.mdwn
@@ -26,4 +26,4 @@ and so only finds pages which were indexed by _ikiwiki_ with "ZStag"
  [patch]: http://www.gmcmanus.org/0001-Use-correct-term-prefixes-when-searching.patch
 [search]: http://ikiwiki.info/ikiwiki.cgi?P=title%3Atags
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
index a7fab5571..0a2b1efea 100644
--- a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
+++ b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
@@ -11,7 +11,7 @@ It seems like gettext only searches for locale information in /usr/share/locale,
                     return $gettext_obj->get(shift);
             }
 
-[[tag patch]]
+[[!tag patch]]
 -- [[ThomasBleher]]
 
 > According to my testing, this patch makes ikiwiki's localisation fail for
diff --git a/doc/bugs/search_plugin_and_CGI_preview.mdwn b/doc/bugs/search_plugin_and_CGI_preview.mdwn
index eb602cd9d..2a3d270b7 100644
--- a/doc/bugs/search_plugin_and_CGI_preview.mdwn
+++ b/doc/bugs/search_plugin_and_CGI_preview.mdwn
@@ -16,4 +16,4 @@ Making the indexing only happen on a real commit might also speed the
 Preview up a small amount.
 --Chapman Flack
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/search_plugin_uses_wrong_css_path.mdwn b/doc/bugs/search_plugin_uses_wrong_css_path.mdwn
index 9eeb3c374..688d51ee6 100644
--- a/doc/bugs/search_plugin_uses_wrong_css_path.mdwn
+++ b/doc/bugs/search_plugin_uses_wrong_css_path.mdwn
@@ -11,4 +11,4 @@ variable which points always to the base of the wiki.
 e.g. use "wikibase" for css and favicon and "baseurl" for the &lt;base&gt; tag.
 
 > thanks for pointing this bug out, I've fixed it --[[Joey]].
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/shortcut_encoding.mdwn b/doc/bugs/shortcut_encoding.mdwn
index bb335906a..66fd81023 100644
--- a/doc/bugs/shortcut_encoding.mdwn
+++ b/doc/bugs/shortcut_encoding.mdwn
@@ -4,7 +4,7 @@
     Might this be a problem of the web server?
 
 Also, I'd like to put the shortcut usages into backticks
--- `[[iki shortcuts]]` --
+-- `[[!iki shortcuts]]` --
 to have them displayed in the usual backtick-formatting.
 That also doesn't work, but this is an already-reported issue, as far as I know.
 
diff --git a/doc/bugs/shortcuts_don__39__t_escape_from_Markdown.mdwn b/doc/bugs/shortcuts_don__39__t_escape_from_Markdown.mdwn
index f977dc354..022987efb 100644
--- a/doc/bugs/shortcuts_don__39__t_escape_from_Markdown.mdwn
+++ b/doc/bugs/shortcuts_don__39__t_escape_from_Markdown.mdwn
@@ -1,6 +1,6 @@
-Writing [[wikipedia Low_frequency_oscillation]] causes the word "frequency" 
+Writing [[!wikipedia Low_frequency_oscillation]] causes the word "frequency" 
 to show up in italics, since underscores are Markdown for italics. Using
-[[wikipedia low frequency oscillation]] works in this case, because Wikipedia
+[[!wikipedia low frequency oscillation]] works in this case, because Wikipedia
 will redirect, but it's hardly clean. Maybe the shortcuts plugin should
 run pagetitle() on the text of its link? --Ethan
 
diff --git a/doc/bugs/space_in_a___91____91__page_link__93____93___doesn__39__t_make_link.mdwn b/doc/bugs/space_in_a___91____91__page_link__93____93___doesn__39__t_make_link.mdwn
index 5ed975f12..39f5d891e 100644
--- a/doc/bugs/space_in_a___91____91__page_link__93____93___doesn__39__t_make_link.mdwn
+++ b/doc/bugs/space_in_a___91____91__page_link__93____93___doesn__39__t_make_link.mdwn
@@ -1,15 +1,15 @@
 I attempted to make a new webpage by having wiki code with
-    [[new page]]
+    [[!new page]]
     [newpage]
 
 This was converted to literal:
-    [[new page]]
+    [[!new page]]
 and the correct hyperlink:
     ?newpage
 
 So when has a space it doesn't let you create a new page. I am using 1.35. Let's see what happens here:
 
-[[new page]]
+[[!new page]]
 
 A moment later ... same thing ... it is not a link (no question mark to create).
 
diff --git a/doc/bugs/special_characters_in_tag_names_need_manual_escaping.mdwn b/doc/bugs/special_characters_in_tag_names_need_manual_escaping.mdwn
index 1a43ec3fc..4ff6763a3 100644
--- a/doc/bugs/special_characters_in_tag_names_need_manual_escaping.mdwn
+++ b/doc/bugs/special_characters_in_tag_names_need_manual_escaping.mdwn
@@ -1,3 +1,3 @@
-Having read i18n_characters_in_post_title, I have a page named `St John's` in a file named `St_John__39__s.mdwn`.  Regular wikilinks like `\\[[St_John's]]` successfully point to that page.  However, if I tag a page with `\[[tag St_John's]]`, that link is shown as pointing to a non-existant page.  Modify the tag to read `\[[tag St_John__39__s]]` works around the problem.
+Having read i18n_characters_in_post_title, I have a page named `St John's` in a file named `St_John__39__s.mdwn`.  Regular wikilinks like `\\[[St_John's]]` successfully point to that page.  However, if I tag a page with `\[[!tag St_John's]]`, that link is shown as pointing to a non-existant page.  Modify the tag to read `\[[!tag St_John__39__s]]` works around the problem.
 
 [[done]] in 1.49 --[[Joey]]
diff --git a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
index 1d1e62092..171874951 100644
--- a/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
+++ b/doc/bugs/ssl_certificates_not_checked_with_openid.mdwn
@@ -22,4 +22,4 @@ For now, I want to try and resolve the issues with net\_ssl\_test, and run more
 > is good.
 > --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/tags_base_dir_not_used_when_creating_new_tags.mdwn b/doc/bugs/tags_base_dir_not_used_when_creating_new_tags.mdwn
index 71a9ece33..9c6189b08 100644
--- a/doc/bugs/tags_base_dir_not_used_when_creating_new_tags.mdwn
+++ b/doc/bugs/tags_base_dir_not_used_when_creating_new_tags.mdwn
@@ -3,7 +3,7 @@ I'm using the tags plugin with tagbase="tags".
 Already existing tags, corresponding to pages like tags/foo.html work just
 fine.
 
-If I add to a page a tag which is not existing (e.g. with [[tag newtag]])
+If I add to a page a tag which is not existing (e.g. with [[!tag newtag]])
 the just modified page will have a link which point to tags/newtag. This is
 in theory correct, but in practice leads to creating a tags/newtag subpage
 of the page I'm editing, while my tagbase is supposed to be relative to the
diff --git a/doc/bugs/taint_issue_with_regular_expressions.mdwn b/doc/bugs/taint_issue_with_regular_expressions.mdwn
index 8fe411e5f..172b49fd1 100644
--- a/doc/bugs/taint_issue_with_regular_expressions.mdwn
+++ b/doc/bugs/taint_issue_with_regular_expressions.mdwn
@@ -13,7 +13,7 @@ which is exactly the same regular expression drawn out as a constant.  It appear
 > even in 5.8. See also: [[prune_causing_taint_mode_failures]],
 > [[Insecure_dependency_in_mkdir]],
 > [[Insecure_dependency_in_eval_while_running_with_-T_switch]],
-> and especially [[debbug 411786]]
+> and especially [[!debbug 411786]]
 >
 > The last of those was the last straw for me, and I disabled taint
 > checking in the debian package. You can do the same by building ikiwiki
diff --git a/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn b/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
index 8a2456529..ac895896a 100644
--- a/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
+++ b/doc/bugs/tbasewiki__95__brokenlinks.t_broken.mdwn
@@ -53,7 +53,7 @@ After some step through I figured out that the template directory was invalid, a
 
 Other than ikiwiki.in, am I missing something here?
 
->> I think this is [[debbug 425891]]. I have sent there a patch that incorporates the original
+>> I think this is [[!debbug 425891]]. I have sent there a patch that incorporates the original
 >> author's two diffs but has a more correct solution to the first problem described 
 >> above. -- Thomas, 2007-06-26
 
diff --git a/doc/bugs/teximg_fails_if_same_tex_is_used_on_multiple_pages.mdwn b/doc/bugs/teximg_fails_if_same_tex_is_used_on_multiple_pages.mdwn
index 86f47edba..700492345 100644
--- a/doc/bugs/teximg_fails_if_same_tex_is_used_on_multiple_pages.mdwn
+++ b/doc/bugs/teximg_fails_if_same_tex_is_used_on_multiple_pages.mdwn
@@ -21,4 +21,4 @@ I think this will be a own dir for images for every page.
 
 --[[PatrickWinnertz]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn b/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn
index 13ebe1cab..b01fc44f2 100644
--- a/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn
+++ b/doc/bugs/undefined_tags_or_mismatched_tags_won__39__t_get_converted.mdwn
@@ -43,4 +43,4 @@ The out put is:
 > alone. If you feel the other things you brought up are bugs, please talk
 > to the markdown maintainer. --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
diff --git a/doc/bugs/wiki_formatting_does_not_work_between_toc_and_an_inline.mdwn b/doc/bugs/wiki_formatting_does_not_work_between_toc_and_an_inline.mdwn
index 1e5fe71df..29e03f2d6 100644
--- a/doc/bugs/wiki_formatting_does_not_work_between_toc_and_an_inline.mdwn
+++ b/doc/bugs/wiki_formatting_does_not_work_between_toc_and_an_inline.mdwn
@@ -1,15 +1,15 @@
-Wiki formatting between `\[[toc ]]` and an inline fails to render.  The
+Wiki formatting between `\[[!toc ]]` and an inline fails to render.  The
 problem does not seem to trigger if the inline uses the titlepage template,
 or if it doesn't match any pages.  See example below; also reproducible
 with a single-file wiki containing the text below, rendered via `ikiwiki
 --plugin toc`.
 
-> This is [[debbug 421843]], and I suspect it affects certian other plugins
+> This is [[!debbug 421843]], and I suspect it affects certian other plugins
 > that also use empty divs as placeholders. It's fixed in markdown 1.0.2 b7
 > (available in debian experimental). So I'll [[close|done]] this as it's
 > not really an ikiwiki bug. --[[Joey]]
 
-[[toc ]]
+[[!toc ]]
 
 **not bold**
 
@@ -19,7 +19,7 @@ with a single-file wiki containing the text below, rendered via `ikiwiki
 
 [not a link](http://ikiwiki.info)
 
-[[inline pages="news/*" description="Sparse News" show=1 feeds=no]]
+[[!inline pages="news/*" description="Sparse News" show=1 feeds=no]]
 
 **bold**
 
diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index f5cbc8894..ede16a029 100644
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -46,4 +46,4 @@ and have it render like:
 > there should give some strong hints how to fix this bug, though I haven't
 > tried to apply the method yet. --[[Joey]]
 
-[[debbug 487397]]
+[[!debbug 487397]]
diff --git a/doc/bugs/wikilink_in_table.mdwn b/doc/bugs/wikilink_in_table.mdwn
index f0dc13eaf..cca01718c 100644
--- a/doc/bugs/wikilink_in_table.mdwn
+++ b/doc/bugs/wikilink_in_table.mdwn
@@ -1,6 +1,6 @@
 I try to create wikilink in table. But it does not work. Here is example:
 
-	\[[table class=table1 data="""
+	\[[!table class=table1 data="""
 	\[[wikilink_test|index]]
 	\[[wikilink_test\|index]]
 	[wikilink test](/servers/webmail1)
@@ -21,7 +21,7 @@ What exactly is a difference between wikilink and URL reference to the same page
 
 Trying to report this I found something weird. I changed in the example [[ with || because wiki renders something wrongly. You can see what I tried originally here:
 
-	\[[table class=table1 data="""
+	\[[!table class=table1 data="""
 	\[[wikilink_test|servers/webmail1]]
 	\[[wikilink_test|servers/webmail1]]
 	[wikilink test](/servers/webmail1)
diff --git a/doc/css.mdwn b/doc/css.mdwn
index bb3c15f51..5b6b9e1af 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -1,4 +1,4 @@
-[[meta title="CSS"]]
+[[!meta title="CSS"]]
 
 ## Using CSS with ikiwiki
 
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 00ad9cf13..4afc6dd83 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -1,4 +1,4 @@
-[[meta title="CSS Market"]]
+[[!meta title="CSS Market"]]
 
 User contributed stylesheet files for ikiwiki. Feel free to add your own
 stylesheets here. (Upload as wiki pages; wiki gnomes will convert them to css
@@ -7,18 +7,18 @@ files..)
 * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]],
   customized mostly for *blogging purposes*, can be seen in action on 
   [zack's blog](http://www.bononia.it/~zack/blog/)
-  [[meta stylesheet="zack"]]
+  [[!meta stylesheet="zack"]]
 
 * **[[css_market/kirkambar.css]]**, contributed by [[Roktas]].  This far from perfect
   stylesheet follows a [Gitweb](http://www.kernel.org/git/?p=git/git.git;a=tree;f=gitweb)
   like theme, so it may provide a consistent look'n feel along with the [[rcs/git]] backend. ;-)
   You can see it in action on [kirkambar](http://kirkambar.net/) (Turkish content).
-  [[meta stylesheet="kirkambar"]]
+  [[!meta stylesheet="kirkambar"]]
 
 * **[[css_market/embeddedmoose.css]]**, contributed by [[JoshTriplett]].
   Designed for [Embedded Moose](http://embeddedmoose.com).  Some ideas from the
   Debian lighttpd index.html page.
-  [[meta stylesheet="embeddedmoose"]]
+  [[!meta stylesheet="embeddedmoose"]]
 
 * **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template
   designed by [styleshout](http://www.styleshout.com).
@@ -34,18 +34,18 @@ files..)
   **[[css_market/02_Template.tmpl]]**. If you prefer 
   [my header image](http://martin.wuertele.net/images/header.png) you can 
   use it under the terms of the MIT License (see png comment).
-  [[meta stylesheet="02_Template"]]
+  [[!meta stylesheet="02_Template"]]
 
 * **[[css_market/cstamas.css]]**, contributed by [[cstamas]].
   This one is based on embeddedmoose, however it is slightly different now.
   [My webpage's](http://users.itk.ppke.hu/~cstamas/tag/english) is not the same.
   You can grab some pictures used as background patterns from there.
-  [[meta stylesheet="cstamas"]]
+  [[!meta stylesheet="cstamas"]]
 
 * **[[css_market/bma.css]]**, contributed by [bma](http://subvert.org.uk/~bma/).
   Not quite the same as I use on my site, since that has slightly modified
   templates.
-  [[meta stylesheet="bma"]]
+  [[!meta stylesheet="bma"]]
 
 If your web browser allows selecting between multiple stylesheets, this
 page can be viewed using many of the stylesheets above. For example, if
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 95c48b456..e35cc0a45 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -11,7 +11,7 @@ Installation steps and requirements are listed on the [[install]] page.
 ## packages
 
 To install with apt, if using Debian (since 4.0), or Ubuntu (since 6.10):
-[[template id=note text="""
+[[!template id=note text="""
 Note that Debian 4.0 and especially Ubuntu 6.10 contain older versions of
 ikiwiki, there have been lots of enhancements and bug fixes since those
 versions.
diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 14e9b3804..3e89c4b99 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -10,7 +10,7 @@ Some additional configuration you might want to do:
 
 * Make sure you have the tag plugin enabled, and tag posts using it. An
   example of how to tag a post is:
-	\[[tag tags/life]]
+	\[[!tag tags/life]]
 
 * Enable the sidebar plugin to get a sidebar listing all the categories
   you've tagged posts with.
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index b0514d575..3b2d46027 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,12 +1,12 @@
-[[meta title="example blog"]]
+[[!meta title="example blog"]]
 
-[[pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*"]]
 
 Welcome to my blog. Have a look at the most recent posts below, or
 browse the tag cloud on the right. An archive of all [[posts]] is also
 available.
 
-[[inline pages="./posts/* and !*/Discussion" show="10"
+[[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="./posts"]]
 
 ----
diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index 71eb9f1b1..4b2939120 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
 Here is a full list of posts to my [[blog|index]].
 
-[[inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
+[[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index f8a698801..3d7174ae8 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the blog/posts/ subdirectory, or use the web form.
 
-[[tag tags/tech]]
+[[!tag tags/tech]]
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 19475d7c7..a9fac388e 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -4,4 +4,4 @@ Example sidebar
 * [[Archive|posts]]
 
 Categories:
-[[map pages="./tags/* and !*/Discussion"]]
+[[!map pages="./tags/* and !*/Discussion"]]
diff --git a/doc/examples/blog/tags.mdwn b/doc/examples/blog/tags.mdwn
index daf77549a..53cc8d368 100644
--- a/doc/examples/blog/tags.mdwn
+++ b/doc/examples/blog/tags.mdwn
@@ -1,3 +1,3 @@
-[[pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*"]]
 
 On the right you can see the tag cloud for this blog.
diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index 2f7a57379..ddc2e646c 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
 This feed contains pages in the "life" category.
 
-[[inline pages="link(tags/life) and ./posts/* and !*/Discussion"
+[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion"
 show="10" actions=yes]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
index dff92f333..e811cac34 100644
--- a/doc/examples/blog/tags/tech.mdwn
+++ b/doc/examples/blog/tags/tech.mdwn
@@ -1,3 +1,3 @@
 This feed contains pages in the "tech" category.
 
-[[inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]]
+[[!inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]]
diff --git a/doc/examples/softwaresite/bugs.mdwn b/doc/examples/softwaresite/bugs.mdwn
index ad8d6cdb4..46ead2b62 100644
--- a/doc/examples/softwaresite/bugs.mdwn
+++ b/doc/examples/softwaresite/bugs.mdwn
@@ -1,4 +1,4 @@
 This is FooBar's bug list. Link bugs to [[bugs/done]] when done.
 
-[[inline pages="./bugs/* and !./bugs/done and !link(done) 
+[[!inline pages="./bugs/* and !./bugs/done and !link(done) 
 and !*/Discussion" actions=yes postform=yes show=0]]
diff --git a/doc/examples/softwaresite/bugs/done.mdwn b/doc/examples/softwaresite/bugs/done.mdwn
index af88c1c7c..ad332e2a2 100644
--- a/doc/examples/softwaresite/bugs/done.mdwn
+++ b/doc/examples/softwaresite/bugs/done.mdwn
@@ -1,3 +1,3 @@
 recently fixed [[bugs]]
 
-[[inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]]
+[[!inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]]
diff --git a/doc/examples/softwaresite/doc/faq.mdwn b/doc/examples/softwaresite/doc/faq.mdwn
index 249c6f779..fe0c3eff0 100644
--- a/doc/examples/softwaresite/doc/faq.mdwn
+++ b/doc/examples/softwaresite/doc/faq.mdwn
@@ -1,6 +1,6 @@
 FooBar frequently asked questions.
 
-[[toc ]]
+[[!toc ]]
 
 ## Is this a real program?
 
diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn
index 20642c203..9b53c7d99 100644
--- a/doc/examples/softwaresite/news.mdwn
+++ b/doc/examples/softwaresite/news.mdwn
@@ -2,4 +2,4 @@ This is where annoucements of new releases, features, and other news is
 posted. FooBar users are recommended to subscribe to this page's RSS
 feed.
 
-[[inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]
+[[!inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]
diff --git a/doc/examples/softwaresite/templates/release.mdwn b/doc/examples/softwaresite/templates/release.mdwn
index 759decb40..ac7ff93c7 100644
--- a/doc/examples/softwaresite/templates/release.mdwn
+++ b/doc/examples/softwaresite/templates/release.mdwn
@@ -3,5 +3,5 @@
 <TMPL_VAR news>
 
 </TMPL_IF>
-FooBar <TMPL_VAR version> released with [[toggle text="these changes" id="changelog"]]
-[[toggleable id="changelog" text="""<TMPL_VAR changelog>"""]]
+FooBar <TMPL_VAR version> released with [[!toggle text="these changes" id="changelog"]]
+[[!toggleable id="changelog" text="""<TMPL_VAR changelog>"""]]
diff --git a/doc/features.mdwn b/doc/features.mdwn
index df963ab4f..c6fc95c0b 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -1,5 +1,5 @@
 An overview of some of ikiwiki's features:
-[[toc ]]
+[[!toc ]]
 
 ## Uses a real RCS
 
diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index cced9636b..bab65cac6 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -4,5 +4,5 @@ _This is a bold experiment by me, since I have exactly such a question. This ove
 
 ## Current topics ##
 
-[[inline pages="forum/*  and !forum/discussion and !forum/*/*" 
+[[!inline pages="forum/*  and !forum/discussion and !forum/*/*" 
 actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=0]]
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 653c2fe82..7ac1ac6b4 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Free Software"]]
+[[!meta title="Free Software"]]
 
 ikiwiki, and this documentation wiki, are licensed under the terms of the
 GNU [[GPL]], version 2 or later.
diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index fa3ac8604..e69fcb31b 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -17,7 +17,7 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
 > [[preprocessor_directive|preprocessordirective]] for it, though.
 > --[[JoshTriplett]]
 
->> [[tag wishlist]]
+>> [[!tag wishlist]]
 >> I'd like to implement such a thing.  Joey, what is this supposed to look like?
 >> `\[[anchor WHATEVER]]`?  --[[tschwinge]]
 
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 1a416d798..b1cd2fbec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -4,7 +4,7 @@ suitable for publishing on a website. Ikiwiki stores pages and history in a
 There are many other [[features]], including support for
 [[blogging|ikiwiki/blog]], as well as a large array of [[plugins]].
 
-[[template id=links]]
+[[!template id=links]]
 
 ## using ikiwiki
 
@@ -15,7 +15,7 @@ with ikiwiki, and some [[tips]].
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
 This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[version ]].
+ikiwiki [[!version ]].
 
 ## developer resources
 
diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index f851643e3..92fe8fa47 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -5,7 +5,7 @@ Do so here..
 Note that for more formal bug reports or todo items, you can also edit the
 [[bugs]] and [[todo]] pages.
 
-[[toc ]]
+[[!toc ]]
 
 # Installation/Setup questions
 
@@ -268,7 +268,7 @@ easily, perl is possible (but I'm not strong in perl).
 
 > Jamey Sharp and I have a set of scripts in progress to convert other wikis to ikiwiki, including history, so that we can migrate a few of our wikis.  We already have support for migrating MoinMoin wikis to ikiwiki, including conversion of the entire history to Git.  We used this to convert the [XCB wiki](http://xcb.freedesktop.org/wiki/) to ikiwiki; until we finalize the conversion and put the new wiki in place of the old one, you can browse the converted result at <http://xcb.freedesktop.org/ikiwiki>.  We already plan to add support for TWiki (including history, since you can just run parsecvs on the TWiki RCS files to get Git), so that we can convert the [Portland State Aerospace Society wiki](http://psas.pdx.edu) (currently in Moin, but with much of its history in TWiki, and with many of its pages still in TWiki format using Jamey's TWiki format for MoinMoin).
 >
-> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[toc ]]`), and then using a modified [[cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
+> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[!toc ]]`), and then using a modified [[!cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
 >
 > We will post the scripts as soon as we have them complete enough to convert our wikis.
 >
diff --git a/doc/install.mdwn b/doc/install.mdwn
index bd8c4b881..d745737aa 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -11,8 +11,8 @@ Ikiwiki is a perl program, and needs a recent version of perl such as
 It's recommended you have a C compiler, as ikiwiki uses one to build
 wrappers.
 
-Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]],
-[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]]
+Ikiwiki requires the [[!cpan Text::Markdown]], [[!cpan URI]],
+[[!cpan HTML::Parser]], [[!cpan HTML::Template]], and [[!cpan HTML::Scrubber]]
 perl modules be installed. It can also use a lot of other perl modules, if
 they are available.
 
diff --git a/doc/news.mdwn b/doc/news.mdwn
index 5d0ab87c6..58413f94c 100644
--- a/doc/news.mdwn
+++ b/doc/news.mdwn
@@ -2,7 +2,7 @@ This is where announcements of new releases, features, and other news are
 posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS
 feed.
 
-[[inline pages="news/* and !news/*/* and !news/discussion"
+[[!inline pages="news/* and !news/*/* and !news/discussion"
 feedpages="created_after(news/Article_on_Ikiwiki_as_a_BTS)" rootpage="news" show="30"]]
 
 By the way, some other pages with RSS feeds about ikiwiki include
diff --git a/doc/news/code_swarm.mdwn b/doc/news/code_swarm.mdwn
index 5302d626b..bdc373432 100644
--- a/doc/news/code_swarm.mdwn
+++ b/doc/news/code_swarm.mdwn
@@ -1,7 +1,7 @@
 I've produced a [code_swarm](http://vis.cs.ucdavis.edu/~ogawa/codeswarm/)
 visualization of the first 2+ years of ikiwiki's commit history. 
 
-[[img screenshot.png size="480x360"]]
+[[!img screenshot.png size="480x360"]]
 
 * [15 mb avi](http://kitenet.net/~joey/screencasts/ikiwiki_swarm.avi)
 * [stream on vimeo](http://vimeo.com/1324348)
diff --git a/doc/news/ikiwiki_version_2.0.mdwn b/doc/news/ikiwiki_version_2.0.mdwn
index 248b21783..e6723c873 100644
--- a/doc/news/ikiwiki_version_2.0.mdwn
+++ b/doc/news/ikiwiki_version_2.0.mdwn
@@ -9,7 +9,7 @@ default configuration:
   the procedure described at [[tips/switching_to_usedirs]]
   or edit your setup file to turn `usedirs` off: `usedirs => 0,`
 * [[plugins/OpenID]] logins are now enabled by default, if the
-  [[cpan Net::OpenID::Consumer]] perl module is available. Password logins
+  [[!cpan Net::OpenID::Consumer]] perl module is available. Password logins
   are also still enabled by default. If you like, you can turn either OpenID
   or password logins off via the `disable_plugins` setting.
 
@@ -29,4 +29,4 @@ An overview of changes in the year since the 1.0 release:
 * Some support for other markup languages than markdown: rst, textile.
 * Unit test suite, with more than 300 tests.
 
-[[meta date="2007-04-30 00:51:57 -0400"]]
+[[!meta date="2007-04-30 00:51:57 -0400"]]
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index c81145fcf..ad76606aa 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
+[[!poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index 181edd0c7..67651f2cf 100644
--- a/doc/news/server_speed.mdwn
+++ b/doc/news/server_speed.mdwn
@@ -1,7 +1,7 @@
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or
 should I move it to my much beefier auxiliary server?
 
-[[poll open=no 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]]
+[[!poll open=no 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]]
 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
diff --git a/doc/news/version_2.50.mdwn b/doc/news/version_2.50.mdwn
index 4863ee256..2c26b27da 100644
--- a/doc/news/version_2.50.mdwn
+++ b/doc/news/version_2.50.mdwn
@@ -1,5 +1,5 @@
-ikiwiki 2.50 released with [[toggle text="these changes"]]
-[[toggleable text="""
+ikiwiki 2.50 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
    * img: Support captions.
    * img: Don't generate empty title attributes, etc.
    * img: Allow setting defaults for class and id too.
diff --git a/doc/news/version_2.51.mdwn b/doc/news/version_2.51.mdwn
index a139d6eb2..87d742ba4 100644
--- a/doc/news/version_2.51.mdwn
+++ b/doc/news/version_2.51.mdwn
@@ -1,5 +1,5 @@
-ikiwiki 2.51 released with [[toggle text="these changes"]]
-[[toggleable text="""
+ikiwiki 2.51 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
    * Improve toplevel parentlink to link directly to index.html when usedirs is
      disabled.
    * map: Add a "show" parameter. "show=title" can be used to display page
diff --git a/doc/news/version_2.52.mdwn b/doc/news/version_2.52.mdwn
index 3bdd12fca..5c9d79959 100644
--- a/doc/news/version_2.52.mdwn
+++ b/doc/news/version_2.52.mdwn
@@ -4,8 +4,8 @@ News for ikiwiki 2.52:
    wiki in /etc/ikiwiki/wikilist this will be done automatically when the
    Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
 
-ikiwiki 2.52 released with [[toggle text="these changes"]]
-[[toggleable text="""
+ikiwiki 2.52 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
    * attachment: New plugin for uploading and managing attachments.
      This includes a fairly powerful PageSpec based admin pref for deciding
      whether to accept a given upload, and an attachment management interface
diff --git a/doc/news/version_2.53.mdwn b/doc/news/version_2.53.mdwn
index 889547ca2..b55773f13 100644
--- a/doc/news/version_2.53.mdwn
+++ b/doc/news/version_2.53.mdwn
@@ -1,5 +1,5 @@
-ikiwiki 2.53 released with [[toggle text="these changes"]]
-[[toggleable text="""
+ikiwiki 2.53 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
    * search: generate configuration files once only when rebuilding
      (Gabriel McManus)
    * attachment: Fix an uninitialised value warning when editing a page
diff --git a/doc/news/version_2.54.mdwn b/doc/news/version_2.54.mdwn
index 299ff377a..075bc65f8 100644
--- a/doc/news/version_2.54.mdwn
+++ b/doc/news/version_2.54.mdwn
@@ -1,5 +1,5 @@
-ikiwiki 2.54 released with [[toggle text="these changes"]]
-[[toggleable text="""
+ikiwiki 2.54 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
  * [ Joey Hess ]
    * Make it possible to load setup files w/o running them. Code
      needing to do so can call IkiWiki::Setup::load, which will return
@@ -43,4 +43,4 @@ ikiwiki 2.54 released with [[toggle text="these changes"]]
      aggregated data to internal-use files, rather than wiki pages. This
      can save disk space, and be faster.
    * ikiwiki-transition: Add a `aggregateinternal` transition to rename
-     the aggregated files."""]]
-\ No newline at end of file
+     the aggregated files."""]]
diff --git a/doc/patch.mdwn b/doc/patch.mdwn
index ca1620225..b570d995c 100644
--- a/doc/patch.mdwn
+++ b/doc/patch.mdwn
@@ -7,5 +7,5 @@ once it's ready to be applied, add a 'patch' tag so it will show up here.
 If your patch is non-trivial and might need several iterations to get
 right, please consider publishing a [[git]] branch.
 
-[[inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
+[[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
 !link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]]
diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 439cecc8a..5ee2bae89 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -1,7 +1,7 @@
 Most of ikiwiki's [[features]] are implemented as plugins. Many of these 
 plugins are included with ikiwiki.
 
-[[pagestats pages="plugins/type/* and !plugins/type/slow"]]
+[[!pagestats pages="plugins/type/* and !plugins/type/slow"]]
 
 There's documentation if you want to [[write]] your own plugins, or you can
 [[install]] plugins [[contributed|contrib]] by others.
@@ -13,7 +13,7 @@ will fit most uses of ikiwiki.
 
 ## Plugin directory
 
-[[inline pages="plugins/* and !plugins/type/* and !plugins/write and 
+[[!inline pages="plugins/* and !plugins/type/* and !plugins/write and 
 !plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"
 feedpages="created_after(plugins/graphviz)" archive="yes"
 rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]
diff --git a/doc/plugins/amazon_s3.mdwn b/doc/plugins/amazon_s3.mdwn
index caa0c0153..331dc4acf 100644
--- a/doc/plugins/amazon_s3.mdwn
+++ b/doc/plugins/amazon_s3.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=amazon_s3 author="[[Joey]]"]]
-[[tag type/special-purpose]]
+[[!template id=plugin name=amazon_s3 author="[[Joey]]"]]
+[[!tag type/special-purpose]]
 
 This plugin allows ikiwiki to publish a wiki in the [Amazon Simple Storage
 Service](http://aws.amazon.com/s3) (S3). As pages are rendered, ikiwiki
 will upload them to Amazon S3. The entire wiki contents, aside from the
 ikiwiki CGI, can then be served directly out of Amazon S3.
 
-You'll need the [[cpan Net::Amazon::S3]] and [[cpan File::MimeInfo]] perl
+You'll need the [[!cpan Net::Amazon::S3]] and [[!cpan File::MimeInfo]] perl
 modules and an Amazon S3 account to use this plugin.
 
 ## configuration
diff --git a/doc/plugins/anonok.mdwn b/doc/plugins/anonok.mdwn
index 2afde29b3..2a8a922cd 100644
--- a/doc/plugins/anonok.mdwn
+++ b/doc/plugins/anonok.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=anonok author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=anonok author="[[Joey]]"]]
+[[!tag type/auth]]
 
 By default, anonymous users cannot edit the wiki. This plugin allows
 anonymous web users, who have not signed in, to edit any page in the wiki
diff --git a/doc/plugins/attachment.mdwn b/doc/plugins/attachment.mdwn
index ce04bcd2f..524a233fa 100644
--- a/doc/plugins/attachment.mdwn
+++ b/doc/plugins/attachment.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=attachment core=0 author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=attachment core=0 author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin allows files to be uploaded to the wiki over the web.
 
@@ -24,7 +24,7 @@ If you enable this plugin, be sure to lock that down, by entering an
 [[enhanced_PageSpec|ikiwiki/pagespec/attachment]] in the "Allowed
 Attachments" field of the wiki admin's preferences page.
 
-This plugin will use the [[cpan File::MimeInfo::Magic]] perl module, if
+This plugin will use the [[!cpan File::MimeInfo::Magic]] perl module, if
 available, for mimetype checking.
 
 The `virusfree` [[PageSpec|ikiwiki/pagespec/attachment]] requires that
diff --git a/doc/plugins/brokenlinks.mdwn b/doc/plugins/brokenlinks.mdwn
index 208d7120b..25c44fef1 100644
--- a/doc/plugins/brokenlinks.mdwn
+++ b/doc/plugins/brokenlinks.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=brokenlinks author="[[Joey]]"]]
-[[tag type/link type/meta]]
+[[!template id=plugin name=brokenlinks author="[[Joey]]"]]
+[[!tag type/link type/meta]]
 
 This plugin generates a list of broken links on pages in the wiki. This is
 a useful way to find pages that still need to be written, or links that
@@ -10,4 +10,4 @@ pages to search for broken links, default is search them all.
 
 If this plugin is turned on, here's a list of broken links on this wiki:
 
-[[brokenlinks pages="* and !recentchanges"]]
+[[!brokenlinks pages="* and !recentchanges"]]
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index d429bde88..20da26400 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -1,16 +1,16 @@
-[[template id=plugin name=calendar author="[[ManojSrivastava]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=calendar author="[[ManojSrivastava]]"]]
+[[!tag type/chrome]]
 
 This plugin displays a calendar, similar to the typical calendars shown on
 some blogs.
 
 # examples
 
-	\[[calendar ]]
+	\[[!calendar ]]
 
-	\[[calendar type="month" pages="blog/* and !*/Discussion"]]
+	\[[!calendar type="month" pages="blog/* and !*/Discussion"]]
 
-	\[[calendar type="year" year="2005" pages="blog/* and !*/Discussion"]]
+	\[[!calendar type="year" year="2005" pages="blog/* and !*/Discussion"]]
 
 This plugin is inspired by the calendar plugin for Blosxom, but
 derives no code from it. This plugin is essentially a fancy front end
diff --git a/doc/plugins/camelcase.mdwn b/doc/plugins/camelcase.mdwn
index 81270f41a..1764b31b2 100644
--- a/doc/plugins/camelcase.mdwn
+++ b/doc/plugins/camelcase.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=camelcase author="[[Joey]]"]]
+[[!template id=plugin name=camelcase author="[[Joey]]"]]
 
 This plugin makes words in CamelCase be treated as a [[ikiwiki/WikiLink]].
 That is to say, any two or more words capitalised and mashed together are
@@ -7,4 +7,4 @@ link.
 
 If this plugin is enabled, this will be a link: SandBox
 
-[[tag type/link]]
+[[!tag type/link]]
diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn
index 7a230fbae..5793cb30e 100644
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@@ -1,10 +1,10 @@
-[[template id=plugin name=conditional core=1 author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=conditional core=1 author="[[Joey]]"]]
+[[!tag type/format]]
 
 With this plugin, you can make text be conditionally displayed on a page.
 For example:
 
-	\[[if test="enabled(smiley)"
+	\[[!if test="enabled(smiley)"
 	      then="The smiley plugin is enabled :-)"
 	      else="No smiley plugin here.."]]
 
diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index 79b8390fa..629d05940 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -14,9 +14,9 @@ is supposed to have *no* blank lines between...
 > The blank lines in this example are coming from the newline after `then="`, and also from the newline before the close quote. If you remove those newlines, I think it should work. --[[Joey]]
 
 >> No, that's unfortunately not it, see here:
->> [[if test="enabled(trallala)" then="foot"]]
+>> [[!if test="enabled(trallala)" then="foot"]]
 >> Continued.  But on the other
->> [[if test="enabled(trallala)" then="foot" else="hand:"]]
+>> [[!if test="enabled(trallala)" then="foot" else="hand:"]]
 >> Continued.  --[[tschwinge]]
 
 >>> Seems ok, no? The only linebreaks I see in the source are the ones you
@@ -25,9 +25,9 @@ is supposed to have *no* blank lines between...
 >>>> Okay, that would explain the linebreak between 1 and 3.  But then, why are all linebreaks removed between 3 and 5?
 
 >>>> 1 No, that's unfortunately not it, see here:
->>>> [[if test="enabled(trallala)" then="foot"]]
+>>>> [[!if test="enabled(trallala)" then="foot"]]
 >>>> 3 Continued.  But on the other
->>>> [[if test="enabled(trallala)" then="foot" else="hand:"]]
+>>>> [[!if test="enabled(trallala)" then="foot" else="hand:"]]
 >>>> 5 Continued.  --[[tschwinge]]
 
 >>>>> The conditional after 1 evaluates to "", so there's a blank line
@@ -38,10 +38,10 @@ I have a sidebar that contains
 <pre>
   #### Archives
 
-  \[[calendar type="year" months_per_row="6"  pages="blog/* and !*/Discussion"]]
-  \[[calendar type="month" pages="blog/* and !*/Discussion"]]
+  \[[!calendar type="year" months_per_row="6"  pages="blog/* and !*/Discussion"]]
+  \[[!calendar type="month" pages="blog/* and !*/Discussion"]]
   &lt;h4&gt;Indices&lt;/h4&gt
-  \[[map pages="archives/* and !*/Discussion"]]
+  \[[!map pages="archives/* and !*/Discussion"]]
 </pre>
 I am trying to make it so that the archives and index only show up if the destpage is either blog/* or / -- the top of the wiki. Unfortunately, I don't think I am getting the
 conditional right -- I have a "]] left over at the end (looking at the rendered html). Ideally, I would like to be able to do todays calendar on the top level pagel and 
diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index d0b3fa750..7a28edaba 100644
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -2,6 +2,6 @@ Contributed [[plugins]]:
 
 (See [[install]] for installation help.)
 
-[[inline pages="plugins/contrib/* !*/Discussion" 
+[[!inline pages="plugins/contrib/* !*/Discussion" 
 feedpages="created_after(plugins/contrib/navbar)" archive="yes"
 rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]
diff --git a/doc/plugins/contrib/attach.mdwn b/doc/plugins/contrib/attach.mdwn
index ab50715c7..f44125b10 100644
--- a/doc/plugins/contrib/attach.mdwn
+++ b/doc/plugins/contrib/attach.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=attach author="[[Ben]]"]]
+[[!template id=plugin name=attach author="[[Ben]]"]]
 
 **Note: This plugin is currently pending upload. It is also most assuredly beta.**
 
diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
index 27e0ffefd..168b35668 100644
--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
@@ -1,7 +1,7 @@
-[[template id=plugin name=copyright author="[[tschwinge]]"]]
-[[template id=plugin name=license author="[[tschwinge]]"]]
+[[!template id=plugin name=copyright author="[[tschwinge]]"]]
+[[!template id=plugin name=license author="[[tschwinge]]"]]
 
-[[meta title="default content for *copyright* and *license*"]]
+[[!meta title="default content for *copyright* and *license*"]]
 
 Someone was just asking for it and I had written these two plugins already some months ago,
 so I'm now publishing them here.
diff --git a/doc/plugins/contrib/gallery.mdwn b/doc/plugins/contrib/gallery.mdwn
index 06c1844f7..ed9e17f32 100644
--- a/doc/plugins/contrib/gallery.mdwn
+++ b/doc/plugins/contrib/gallery.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=gallery author="[[arpitjain]]"]]
+[[!template id=plugin name=gallery author="[[arpitjain]]"]]
 
 This plugin would create a nice looking gallery of the images. It has been build over the img plugin in Ikiwiki
 
@@ -6,7 +6,7 @@ SVN repository of plugin is located at <http://ned.snow-crash.org:8080/svn/ikiwi
 
 
 USAGE : 
-\[[gallery imagedir="images" option="value"]]
+\[[!gallery imagedir="images" option="value"]]
 
 Available options : <br>
     * imagedir(required) => Directory containing images. It will scan all the files with jpg|png|gif extension from the directory and will put it in the gallery.<br>
@@ -35,4 +35,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig
 
 -- [[arpitjain]]
 
-[[tag plugins]] [[tag patch]] [[tag soc]] [[tag wishlist]]
+[[!tag plugins]] [[!tag patch]] [[!tag soc]] [[!tag wishlist]]
diff --git a/doc/plugins/contrib/gallery/discussion.mdwn b/doc/plugins/contrib/gallery/discussion.mdwn
index 37fa6f884..08fc2456f 100644
--- a/doc/plugins/contrib/gallery/discussion.mdwn
+++ b/doc/plugins/contrib/gallery/discussion.mdwn
@@ -6,13 +6,13 @@ rebased it onto the *origin/master*, built a Debian package and installed that o
 However, I can't even get simply things like this to work:
 
     $ cat web/index.mdwn
-    [[gallery imagedir="b" vcs="0"]]
+    [[!gallery imagedir="b" vcs="0"]]
     $ ls web/b/
     1.jpg  2.jpg  3.jpg  4.jpg
     $ ikiwiki [...] --plugin gallery web web.rendered
     [...]
     $ grep gallery web.rendered/index.html 
-    <p>[[gallery Failed to Read Directory b.]]</p>
+    <p>[[!gallery Failed to Read Directory b.]]</p>
 
 When using `vcs="1"` it's no better:
 
@@ -25,7 +25,7 @@ When using `vcs="1"` it's no better:
 Its probably because of the restriction of permissions by plugins in newer version of IkiWiki. 
 For the time being, you can turn resizing off till I look into conditional underlay directory feature. 
 
-USAGE : [[gallery imagedir="directory" resize="0"]]
+USAGE : [[!gallery imagedir="directory" resize="0"]]
 
 New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gallery/
 
diff --git a/doc/plugins/contrib/googlemaps.mdwn b/doc/plugins/contrib/googlemaps.mdwn
index 93f415fb5..953f296ab 100644
--- a/doc/plugins/contrib/googlemaps.mdwn
+++ b/doc/plugins/contrib/googlemaps.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=googlemaps author="Christian Mock"]]
-[[tag type/special-purpose todo/geotagging]]
+[[!template id=plugin name=googlemaps author="Christian Mock"]]
+[[!tag type/special-purpose todo/geotagging]]
 
 `googlemaps` is a plugin that allows using the [Google Maps API][2]
 from ikiwiki.
diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn
index 287afa0f5..ef2fa122a 100644
--- a/doc/plugins/contrib/headinganchors.mdwn
+++ b/doc/plugins/contrib/headinganchors.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=headinganchors author="[[PaulWise]]"]]
+[[!template id=plugin name=headinganchors author="[[PaulWise]]"]]
 
 This is a simple plugin to add ids to all headings, based on their text. It
 works as a postprocessing filter, allowing it to work on mdwn, wiki, html,
diff --git a/doc/plugins/contrib/img.mdwn b/doc/plugins/contrib/img.mdwn
index c55338bf5..6c25966e0 100644
--- a/doc/plugins/contrib/img.mdwn
+++ b/doc/plugins/contrib/img.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=img author="Christian Mock"]]
-[[tag type/chrome]]
+[[!template id=plugin name=img author="Christian Mock"]]
+[[!tag type/chrome]]
 
 `img` is an enhanced image handling plugin.
 
diff --git a/doc/plugins/contrib/img/discussion.mdwn b/doc/plugins/contrib/img/discussion.mdwn
index d4b38fb61..ea4ccb042 100644
--- a/doc/plugins/contrib/img/discussion.mdwn
+++ b/doc/plugins/contrib/img/discussion.mdwn
@@ -10,18 +10,18 @@ differently scaled versions of the image, why not just create three pages
 and use the plugin once per page? Something like this on the first one if
 it's got multiple clickable thumbnails:
 
-	\[[img foo.jpg width=256 link=page2]]
+	\[[!img foo.jpg width=256 link=page2]]
 
 This on the second:
 
-	\[[img foo.jpg width=1024 link=page3]]
+	\[[!img foo.jpg width=1024 link=page3]]
 	\[[small|page1]]
 	\[[medium|page2]]
 	\[[large|page3]]
 
 This on the third:
 	
-	\[[img foo.jpg link=page3]]
+	\[[!img foo.jpg link=page3]]
 	\[[small|page1]]
 	\[[medium|page2]]
 	\[[large|parge3]]
diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn
index 204910290..0c3366846 100644
--- a/doc/plugins/contrib/linguas.mdwn
+++ b/doc/plugins/contrib/linguas.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=linguas author="Jordà Polo"]]
+[[!template id=plugin name=linguas author="Jordà Polo"]]
 
 Linguas
 =======
@@ -20,14 +20,14 @@ Translatable pages and translations must have the following format:
 `pagename.$LANG`, where `$LANG` is a ISO639-1 (two-letter) language code.
 To enable linguas, add the following line in the source code of the page:
 
-	\[[linguas ]]
+	\[[!linguas ]]
 
 Note that linguas is only required in one of the pages (the original,
 for instance); the rest of translations will be automatically
 updated. Additionally, it is also possible to specify the title of
 the translation:
 
-	\[[linguas title="Translated title"]]
+	\[[!linguas title="Translated title"]]
 
 
 Template
@@ -103,4 +103,4 @@ The following fixes it:
         +               push @links, IkiWiki::htmllink($page, $destpage, $trans, noimageinline => 0, forcesubpage => 0, linktext => $link);
                 }
          
-                my $otherlinguas = 'Translations:';
-\ No newline at end of file
+                my $otherlinguas = 'Translations:';
diff --git a/doc/plugins/contrib/navbar.mdwn b/doc/plugins/contrib/navbar.mdwn
index 830179999..061e4588c 100644
--- a/doc/plugins/contrib/navbar.mdwn
+++ b/doc/plugins/contrib/navbar.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=navbar author="[[TobiOetiker]]"]]
+[[!template id=plugin name=navbar author="[[TobiOetiker]]"]]
 
 The Navbar Plugin renders a Navigation Bar into your page. It is based on code
 from the [[sidebar_plugin|plugins/sidebar]].
diff --git a/doc/plugins/contrib/sar.mdwn b/doc/plugins/contrib/sar.mdwn
index a28f79e20..77c41a955 100644
--- a/doc/plugins/contrib/sar.mdwn
+++ b/doc/plugins/contrib/sar.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=sar author="[[VictorMoral]]"]]
-[[tag type/chrome type/slow ]]
+[[!template id=plugin name=sar author="[[VictorMoral]]"]]
+[[!tag type/chrome type/slow ]]
 
 The `sar` plugin is useful to make global or local search and replace operations
 using common or specific terms.
@@ -14,19 +14,19 @@ The global dictionary page is like this:
 
     ## Sites and projects
 
-    - [[sar search="ikiwiki" first="[IkiWiki](http://ikiwiki.info)" next="_IkiWiki_"]]
-    - [[sar search="debian" first="[Debian](http://debian.org)" next="_Debian_"]]
-    - [[sar search="perl" first="[Perl](http://perl.org)" next="_Perl_"]]
-    - [[sar search="linux" replace="GNU/Linux"]]
+    - [[!sar search="ikiwiki" first="[IkiWiki](http://ikiwiki.info)" next="_IkiWiki_"]]
+    - [[!sar search="debian" first="[Debian](http://debian.org)" next="_Debian_"]]
+    - [[!sar search="perl" first="[Perl](http://perl.org)" next="_Perl_"]]
+    - [[!sar search="linux" replace="GNU/Linux"]]
    
     ## Persons
-    - [[sar search="joey" first="[Joey Hess](http://ikiwiki.info/users/joey]]" next="_Joey_" ]]
-    - [[sar search="angel" first="[Angel](http://triptico.com)" next="Angel"]]
+    - [[!sar search="joey" first="[Joey Hess](http://ikiwiki.info/users/joey]]" next="_Joey_" ]]
+    - [[!sar search="angel" first="[Angel](http://triptico.com)" next="Angel"]]
 
     ## Technical terms
 
-    - [[sar search="smtp" first="\[[wp SMTP]]" next="‘SMTP‘"]]
-    - [[sar search="pop3" first="\[[wp POP3]]" next="’POP3’"]]
+    - [[!sar search="smtp" first="\[[!wp SMTP]]" next="‘SMTP‘"]]
+    - [[!sar search="pop3" first="\[[!wp POP3]]" next="’POP3’"]]
 
 The search expressions must be surrounded by double dashes in a source ikiwiki
 page, like this:
@@ -70,11 +70,11 @@ value is `*`, but a recommended value is `link(tag/sar)`.
 
 In a ikiwiki source page we can write this
 
-    \[[sar search=debian replace="__Debian__"]]
+    \[[!sar search=debian replace="__Debian__"]]
 
 for define a global replace for the term `--debian--` or
 
-    \[[sar search=ibm first=’[IBM](http://www.ibm.com)’
+    \[[!sar search=ibm first=’[IBM](http://www.ibm.com)’
             next="_IBM_"]]
 
 to define a replace for the first match of the string `--ibm--` and a different
diff --git a/doc/plugins/contrib/siterel2pagerel.mdwn b/doc/plugins/contrib/siterel2pagerel.mdwn
index 06c9bbc29..956b6728f 100644
--- a/doc/plugins/contrib/siterel2pagerel.mdwn
+++ b/doc/plugins/contrib/siterel2pagerel.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=siterel2pagerel author="[[PaulWise]]"]]
+[[!template id=plugin name=siterel2pagerel author="[[PaulWise]]"]]
 
 This is a simple plugin to convert all site-relative links to page-relative
 links (converts /foo into ../../../foo or similar). It works as a
diff --git a/doc/plugins/contrib/syntax.mdwn b/doc/plugins/contrib/syntax.mdwn
index 3ea3b8e32..5ca6311f9 100644
--- a/doc/plugins/contrib/syntax.mdwn
+++ b/doc/plugins/contrib/syntax.mdwn
@@ -1,7 +1,7 @@
-[[template id=plugin name=syntax author="[[VictorMoral]]"]]
-[[tag type/chrome type/slow]]
+[[!template id=plugin name=syntax author="[[VictorMoral]]"]]
+[[!tag type/chrome type/slow]]
 
-The `syntax` plugin adds support to ikiwiki for syntax highlighting through the *vim* editor and its perl interface [[cpan Text::VimColor]].  It depends on a functional vim installation.
+The `syntax` plugin adds support to ikiwiki for syntax highlighting through the *vim* editor and its perl interface [[!cpan Text::VimColor]].  It depends on a functional vim installation.
 
 The plugin inserts a fragment of HTML with special marks from a file or a string text. It accepts the following parameters:
 
@@ -17,7 +17,7 @@ In the case of file parameter, `syntax` will build a html link for direct downlo
 
 Example:
 
-       \[[syntax type="perl" text="""  
+       \[[!syntax type="perl" text="""  
        #!/usr/bin/perl
 
        my $a = "World";
@@ -26,7 +26,7 @@ Example:
 
 or 
 
-       \[[syntax file="/examples/hello.pl" description="My first perl program"]]
+       \[[!syntax file="/examples/hello.pl" description="My first perl program"]]
 
 This plugin create the following CSS styles:
 
diff --git a/doc/plugins/contrib/texinfo.mdwn b/doc/plugins/contrib/texinfo.mdwn
index c33a370ea..595bd27aa 100644
--- a/doc/plugins/contrib/texinfo.mdwn
+++ b/doc/plugins/contrib/texinfo.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=texinfo author="[[tschwinge]]"]]
+[[!template id=plugin name=texinfo author="[[tschwinge]]"]]
 
 [[I|tschwinge]] started writing a plugin to render
 [GNU Texinfo](http://www.gnu.org/software/texinfo/)
diff --git a/doc/plugins/creole.mdwn b/doc/plugins/creole.mdwn
index b2496adad..b6861ab26 100644
--- a/doc/plugins/creole.mdwn
+++ b/doc/plugins/creole.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=creole author="BerndZeimetz"]]
-[[tag type/format]]
+[[!template id=plugin name=creole author="BerndZeimetz"]]
+[[!tag type/format]]
 
 This plugin allows ikiwiki to process pages written in
 [WikiCreole](http://www.wikicreole.org/) format.
-To use it, you need to have the [[cpan Text::WikiCreole]] perl
+To use it, you need to have the [[!cpan Text::WikiCreole]] perl
 module installed, enable the plugin, then files with the extention `.creole`
 will be processed as creole.
 
diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn
index b2c6df05d..e82760d88 100644
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@@ -1,8 +1,8 @@
-[[template id=plugin name=ddate author="[[Joey]]"]]
-[[tag type/fun]]
+[[!template id=plugin name=ddate author="[[Joey]]"]]
+[[!tag type/fun]]
 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.
 
-This plugin requires the [[cpan DateTime]] and 
-[[cpan DateTime::Calendar::Discordian]] perl modules.
+This plugin requires the [[!cpan DateTime]] and 
+[[!cpan DateTime::Calendar::Discordian]] perl modules.
diff --git a/doc/plugins/editdiff.mdwn b/doc/plugins/editdiff.mdwn
index 61c36a9d6..6351c563f 100644
--- a/doc/plugins/editdiff.mdwn
+++ b/doc/plugins/editdiff.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=editdiff author="[[JeremieKoenig]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=editdiff author="[[JeremieKoenig]]"]]
+[[!tag type/useful]]
 
 This plugin adds a "Diff" button when a page is being edited.
 When clicked, a diff between the stored page and provided content
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index 8140b4f41..a68f7f0a1 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=edittemplate author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=edittemplate author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin allows registering template pages, that provide default
 content for new pages created using the web frontend. To register a
@@ -19,7 +19,7 @@ something like:
 	Reproducible: y/n
 	Details:
 
-The template page can also contain [[cpan HTML::Template]] directives,
+The template page can also contain [[!cpan HTML::Template]] directives,
 similar to other ikiwiki [[templates]]. Currently only one variable is
 set: `<TMPL_VAR name>` is replaced with the name of the page being
 created.
diff --git a/doc/plugins/embed.mdwn b/doc/plugins/embed.mdwn
index ba327da8d..1d43061e0 100644
--- a/doc/plugins/embed.mdwn
+++ b/doc/plugins/embed.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=embed author="[[Joey]]"]]
-[[tag type/html]]
+[[!template id=plugin name=embed author="[[Joey]]"]]
+[[!tag type/html]]
 
 This plugin allows embedding content from external sites on 
 wiki pages.
diff --git a/doc/plugins/favicon.mdwn b/doc/plugins/favicon.mdwn
index 52dbf6a2f..7941f8a6c 100644
--- a/doc/plugins/favicon.mdwn
+++ b/doc/plugins/favicon.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=favicon author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=favicon author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 If this plugin is enabled, then an icon link is added to pages, for web
 browsers to display. The icon is currently hardcoded to be a favicon.ico,
diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn
index b855c18f3..c47c02e6f 100644
--- a/doc/plugins/fortune.mdwn
+++ b/doc/plugins/fortune.mdwn
@@ -1,15 +1,15 @@
-[[template id=plugin name=fortune author="[[Joey]]"]]
-[[tag type/fun]]
+[[!template id=plugin name=fortune author="[[Joey]]"]]
+[[!tag type/fun]]
 
 This just uses the `fortune` program to insert a fortune into the page.
 Usage:
 
-	\[[fortune ]]
+	\[[!fortune ]]
 
-[[if test="enabled(fortune)" then="""
+[[!if test="enabled(fortune)" then="""
 Here's a fortune for you:
 
 ----
 
-[[fortune ]]
+[[!fortune ]]
 """]]
diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index ca888910d..adf2b0a5b 100644
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=goodstuff author="[[Joey]]"]]
-[[tag type/bundle]]
+[[!template id=plugin name=goodstuff author="[[Joey]]"]]
+[[!tag type/bundle]]
 
 This plugin enables a bunch of other plugins -- basically all the ones that
 are not too intrusive, work well with little configuration, and are nice to
diff --git a/doc/plugins/googlecalendar.mdwn b/doc/plugins/googlecalendar.mdwn
index 6d7429d14..bca2ae74f 100644
--- a/doc/plugins/googlecalendar.mdwn
+++ b/doc/plugins/googlecalendar.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=googlecalendar author="[[Joey]]"]]
-[[tag type/special-purpose]]
+[[!template id=plugin name=googlecalendar author="[[Joey]]"]]
+[[!tag type/special-purpose]]
 
 *Note*: This plugin is deprecated. Please switch to the [[embed]] plugin.
 
@@ -11,7 +11,7 @@ content. This plugin is an example of how to deal with this in ikiwiki.
 
 Example use:
 
-	\[[googlecalendar html="""
+	\[[!googlecalendar html="""
 	<iframe src="http://www.google.com/calendar/embed?src=adkrdken8mupngh13jshlbenoc%40group.calendar.google.com&title=OSEL%20Calendar&chrome=NAVIGATION&bgcolor=%2371d873&height=588" style=" border-width:0 " width="480" frameborder="0"	height="588"></iframe>
 	"""]]
 
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index fb669ae21..f8cf094f4 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -1,13 +1,13 @@
-[[template id=plugin name=graphviz author="[[JoshTriplett]]"]]
-[[tag type/chrome type/format]]
+[[!template id=plugin name=graphviz author="[[JoshTriplett]]"]]
+[[!tag type/chrome type/format]]
 
 This plugin allows embedding [graphviz](http://www.graphviz.org/) graphs in a
 page.  Example usage:
 
-	\[[graph src="a -> b -> c; a -> c;"]]
+	\[[!graph src="a -> b -> c; a -> c;"]]
 
 Note that graphs will only show up in previews if your browser has
-[[wikipedia data: URI]] support, or if the same graph already exists on that
+[[!wikipedia data: URI]] support, or if the same graph already exists on that
 page.
 
 Security implications: graphviz does not seem to have any syntax exploitable to
@@ -31,11 +31,11 @@ The `graph` directive supports the following parameters:
   in inches. You must specify both to limit the size; otherwise, graphviz will
   choose a size, without any limit.
 
-[[if test="enabled(graphviz)" then="""
+[[!if test="enabled(graphviz)" then="""
 Some example graphs:
 
-[[graph src="a -> b -> c; a -> b;"]]
-[[graph src="a -- b -- c -- a;" prog="circo" type="graph"]]
+[[!graph src="a -> b -> c; a -> b;"]]
+[[!graph src="a -- b -- c -- a;" prog="circo" type="graph"]]
 """]]
 
-This plugin uses the [[cpan Digest::SHA1]] perl module.
+This plugin uses the [[!cpan Digest::SHA1]] perl module.
diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn
index 259669d67..ac340e42d 100644
--- a/doc/plugins/haiku.mdwn
+++ b/doc/plugins/haiku.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=haiku author="[[Joey]]"]]
-[[tag type/fun]]
+[[!template id=plugin name=haiku author="[[Joey]]"]]
+[[!tag type/fun]]
 
 This plugin allows inserting a randomly generated haiku into a wiki page.
 Just type:
 
-	\[[haiku hint="argument"]]
+	\[[!haiku hint="argument"]]
 
-[[haiku hint="argument test"]]
+[[!haiku hint="argument test"]]
 
 The hint parameter can be omitted, it only provides the generator a hint of
 what to write the haiku about. If no hint is given, it might base it on the
diff --git a/doc/plugins/hnb.mdwn b/doc/plugins/hnb.mdwn
index 647fe19c1..afe04c943 100644
--- a/doc/plugins/hnb.mdwn
+++ b/doc/plugins/hnb.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=hnb author="[[XTaran]]"]]
-[[tag type/format type/slow]]
+[[!template id=plugin name=hnb author="[[XTaran]]"]]
+[[!tag type/format type/slow]]
 
 This plugin allows ikiwiki to process `.hnb` XML files, as created by 
 the Hierachical Notebook [hnb](http://hnb.sourceforge.net/). To use it, you need to have 
diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn
index 8efefcbcb..55e11bff0 100644
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=html author="[[Joey]]"]]
-[[tag type/html type/format]]
+[[!template id=plugin name=html author="[[Joey]]"]]
+[[!tag type/html type/format]]
 
 This plugin lets html pages be used as source pages for the wiki. The
 html pages will still be wrapped in the same html template as any other
diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
index b32c264df..b651ffc99 100644
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=htmlscrubber core=1 author="[[Joey]]"]]
-[[tag type/html]]
+[[!template id=plugin name=htmlscrubber core=1 author="[[Joey]]"]]
+[[!tag type/html]]
 
 This plugin is enabled by default. It sanitizes the html on pages it renders
 to avoid XSS attacks and the like.
@@ -13,7 +13,7 @@ All attributes that can be used to specify an url are checked to make sure
 that the url is in a known, safe scheme, and to block embedded javascript
 in such urls.
 
-It uses the [[cpan HTML::Scrubber]] perl module to perform its html
+It uses the [[!cpan HTML::Scrubber]] perl module to perform its html
 sanitisation, and this perl module also deals with various entity encoding
 tricks.
 
diff --git a/doc/plugins/htmltidy.mdwn b/doc/plugins/htmltidy.mdwn
index dae812df2..f675a01ae 100644
--- a/doc/plugins/htmltidy.mdwn
+++ b/doc/plugins/htmltidy.mdwn
@@ -1,6 +1,6 @@
-[[template id=plugin name=htmltidy author="Faidon Liambotis"]]
-[[tag type/html]]
-[[tag type/slow]]
+[[!template id=plugin name=htmltidy author="Faidon Liambotis"]]
+[[!tag type/html]]
+[[!tag type/slow]]
 
 This plugin uses [tidy](http://tidy.sourceforge.net/) to tidy up the html
 emitted by ikiwiki. Besides being nicely formatted, this helps ensure that
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 26f258bd3..fbf366291 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=httpauth author="Alec Berryman"]]
-[[tag type/auth]]
+[[!template id=plugin name=httpauth author="Alec Berryman"]]
+[[!tag type/auth]]
 
 This plugin allows HTTP basic authentication to be used to log into the
 wiki. To use the plugin, your web server should be set up to perform HTTP
diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn
index a4661f1a8..898609a29 100644
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=img author="Christian Mock"]]
-[[tag type/chrome]]
+[[!template id=plugin name=img author="Christian Mock"]]
+[[!tag type/chrome]]
 
 This is an image handling plugin. While ikiwiki supports inlining full-size
 images by making a [[ikiwiki/WikiLink]] that points to the image, using
@@ -14,7 +14,7 @@ Note that this is a stripped down version of Christian Mock's
 
 ## usage
 
-	\[[img image1.jpg size="200x200" alt="clouds"]]
+	\[[!img image1.jpg size="200x200" alt="clouds"]]
 
 The image file will be searched for using the same rules as used to find
 the file pointed to by a [[ikiwiki/WikiLink]].
@@ -35,7 +35,7 @@ to another page instead, or "link=no" to disable the link, or
 You can also set default values that will be applied to all later images on
 the page, unless overridden. Useful when including many images on a page.
 
-	\[[img defaults size=200x200 alt="wedding photo"]]
-	\[[img photo1.jpg]]
-	\[[img photo2.jpg]]
-	\[[img photo3.jpg size=200x600]]
+	\[[!img defaults size=200x200 alt="wedding photo"]]
+	\[[!img photo1.jpg]]
+	\[[!img photo2.jpg]]
+	\[[!img photo3.jpg size=200x600]]
diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index fc6f9e8af..e66c9103f 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=inline core=1 author="[[Joey]]"]]
+[[!template id=plugin name=inline core=1 author="[[Joey]]"]]
 
 This is a [[ikiwiki/PreProcessorDirective]] that allows including one wiki page
 inside another. For example:
 
-	\[[inline pages="blog/*"]]
+	\[[!inline pages="blog/*"]]
 
 The most common use of inlining is generating blogs and RSS or Atom feeds.
 See [[ikiwiki/blog]] for details.
diff --git a/doc/plugins/install.mdwn b/doc/plugins/install.mdwn
index 3efcb4c4b..900662eec 100644
--- a/doc/plugins/install.mdwn
+++ b/doc/plugins/install.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Installing third party plugins"]]
+[[!meta title="Installing third party plugins"]]
 
 Most ikiwiki plugins are perl modules and should be installed somewhere in
 the perl module search path. See the @INC list at the end of the output of
diff --git a/doc/plugins/link.mdwn b/doc/plugins/link.mdwn
index 03f299282..330e0040e 100644
--- a/doc/plugins/link.mdwn
+++ b/doc/plugins/link.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=link core=1 author="[[Joey]]"]]
-[[tag type/link]]
+[[!template id=plugin name=link core=1 author="[[Joey]]"]]
+[[!tag type/link]]
 
 This plugin implements standard [[WikiLinks|WikiLink]].
diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn
index 6cd23b5cb..935f3d3cd 100644
--- a/doc/plugins/linkmap.mdwn
+++ b/doc/plugins/linkmap.mdwn
@@ -1,10 +1,10 @@
-[[template id=plugin name=linkmap author="[[Joey]]"]]
-[[tag type/meta]]
-[[tag type/slow]]
+[[!template id=plugin name=linkmap author="[[Joey]]"]]
+[[!tag type/meta]]
+[[!tag type/slow]]
 This plugin uses [graphviz](http://www.graphviz.org/) to generate a graph showing the links between a
 set of pages in the wiki. Example usage:
 
-	\[[linkmap pages="* and !blog/* and !*/Discussion"]]
+	\[[!linkmap pages="* and !blog/* and !*/Discussion"]]
 
 Only links between mapped pages will be shown; links pointing to or from
 unmapped pages will be omitted. If the pages to include are not specified,
@@ -22,8 +22,8 @@ directive:
   in inches. Both must be specified for the limiting to take effect, otherwise
   the map's size is not limited.
 
-[[if test="enabled(linkmap)" then="""
+[[!if test="enabled(linkmap)" then="""
 Here is an example link map, of the index page and all pages it links to:
 
-[[linkmap pages="index or (backlink(index) and !*.png)"]]
+[[!linkmap pages="index or (backlink(index) and !*.png)"]]
 """]]
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index 8dd448558..01b0f157d 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=lockedit core=1 author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=lockedit core=1 author="[[Joey]]"]]
+[[!tag type/auth]]
 
 This plugin enables [[page_locking]]. It is enabled by default.
diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn
index 472f62461..3700fadd8 100644
--- a/doc/plugins/map.mdwn
+++ b/doc/plugins/map.mdwn
@@ -1,7 +1,7 @@
-[[template id=plugin name=map author="Alessandro Dotti Contra"]]
-[[tag type/meta]]
+[[!template id=plugin name=map author="Alessandro Dotti Contra"]]
+[[!tag type/meta]]
 
-[[meta description="some page description"]]
+[[!meta description="some page description"]]
 
 This plugin generates a hierarchical page map for the wiki. Example usage:
 
@@ -19,7 +19,7 @@ the [[meta]] plugin). For example:
 Hint: To limit the map to displaying pages less than a certain level deep,
 use a [[ikiwiki/PageSpec]] like this: `pages="* and !*/*/*"`
 
-[[if test="enabled(map)" then="""
+[[!if test="enabled(map)" then="""
 Here's an example map, for the plugins section of this wiki:
 
 [[!map pages="(plugins or plugins/*) and !*/*/*"]]
diff --git a/doc/plugins/map/discussion.mdwn b/doc/plugins/map/discussion.mdwn
index 814e4f934..c724a6492 100644
--- a/doc/plugins/map/discussion.mdwn
+++ b/doc/plugins/map/discussion.mdwn
@@ -16,5 +16,5 @@ Thoughts, anyone?  --[[KarlMW]]
 
 We'd also very much like to have an option to display the title of the page instead of the filename in the map plugin. --Andrew
 
-There's a patch implementing this in [[debbug 484510]]. It needs a few fixes
+There's a patch implementing this in [[!debbug 484510]]. It needs a few fixes
 before I merge it. Now applied. --[[Joey]]
diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index b5ce9c79c..6ad1fb229 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=mdwn core=1 author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=mdwn core=1 author="[[Joey]]"]]
+[[!tag type/format]]
 
 This plugin lets ikwiki convert files with names ending in ".mdwn" to html.
 It uses the [[ikiwiki/markdown]] minimal markup language.
@@ -10,9 +10,9 @@ are also available in other plugins.
 There are several implementations of markdown support that can be used by
 this plugin. The [original version of
 markdown](http://daringfireball.net/projects/markdown/) can be used, or the
-[[cpan Text::Markdown]] perl module.
+[[!cpan Text::Markdown]] perl module.
 
-[[cpan Text::Markdown]] also includes a markdown variant called
+[[!cpan Text::Markdown]] also includes a markdown variant called
 [multimarkdown](http://fletcherpenney.net/MultiMarkdown/), which supports
 tables, footnotes, and other new features. Multimarkdown is not enabled by
 default, but can be turned on via the `multimarkdown` option in the setup
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index b1e0cb757..599d9cbd8 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=meta author="[[Joey]]"]]
-[[tag type/meta]]
+[[!template id=plugin name=meta author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin allows inserting arbitrary metadata into the source of a page.
 Enter the metadata as follows:
@@ -55,7 +55,7 @@ Supported fields:
 * date
 
   Specifies the creation date of the page. The date can be entered in
-  nearly any format, since it's parsed by [[cpan TimeDate]].
+  nearly any format, since it's parsed by [[!cpan TimeDate]].
 
 * stylesheet
 
diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn
index 25bad0585..89022e5ab 100644
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=mirror author="[[Joey]]"]]
-[[tag type/special-purpose]]
+[[!template id=plugin name=mirror author="[[Joey]]"]]
+[[!tag type/special-purpose]]
 
 This plugin allows adding links a list of mirrors to each page in the
 wiki. For each mirror, a name and an url should be specified. Pages are
diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn
index 44a777813..a17e78eb2 100644
--- a/doc/plugins/more.mdwn
+++ b/doc/plugins/more.mdwn
@@ -1,10 +1,10 @@
-[[template id=plugin name=more author="Ben"]]
-[[tag type/format]]
+[[!template id=plugin name=more author="Ben"]]
+[[!tag type/format]]
 
 This plugin provides a way to have a "more" link on a page in a blog, that
 leads to the full version of the page. Use it like this:
 
-	\[[more linktext="click for more" text="""
+	\[[!more linktext="click for more" text="""
 	This is the rest of my post. Not intended for people catching up on
 	their blogs at 30,000 feet. Because I like to make things
 	difficult.
diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn
index cf0036c4c..b2ba68bf7 100644
--- a/doc/plugins/opendiscussion.mdwn
+++ b/doc/plugins/opendiscussion.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=opendiscussion author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=opendiscussion author="[[Joey]]"]]
+[[!tag type/auth]]
 
 This plugin allows editing of Discussion pages by anonymous users who have
 not logged into the wiki.
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index a85727eca..d4aa18c7d 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=openid core=1 author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=openid core=1 author="[[Joey]]"]]
+[[!tag type/auth]]
 
 This plugin allows users to use their [OpenID](http://openid.net/) to log
 into the wiki.
 
-The plugin needs the [[cpan Net::OpenID::Consumer]] perl module. The
-[[cpan LWPx::ParanoidAgent]] perl module is used if available, for added
-security. Finally, the [[cpan Crypt::SSLeay]] perl module is needed to support
+The plugin needs the [[!cpan Net::OpenID::Consumer]] perl module. The
+[[!cpan LWPx::ParanoidAgent]] perl module is used if available, for added
+security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed to support
 users entering "https" OpenID urls.
 
 This plugin has a configuration option. You can set `--openidsignup`
diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn
index f7a856ef1..136ce42a7 100644
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=orphans author="[[Joey]]"]]
-[[tag type/meta]]
+[[!template id=plugin name=orphans author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin generates a list of possibly orphaned pages -- pages that no
 other page links to.
@@ -11,10 +11,10 @@ Note that it takes [[BackLinks]] into account, but does not count inlining a
 page as linking to it, so will generally count many blog-type pages as
 orphans.
 
-[[if test="enabled(orphans)" then="""
+[[!if test="enabled(orphans)" then="""
 Here's a list of orphaned pages on this wiki:
 
-[[orphans pages="* and !news/* and !todo/* and !bugs/* and !users/* and
+[[!orphans pages="* and !news/* and !todo/* and !bugs/* and !users/* and
 !recentchanges and !examples/* and !tips/* and !sandbox/* and !templates/* and
 !wikiicons/* and !plugins/*"]]
 """]]
diff --git a/doc/plugins/otl.mdwn b/doc/plugins/otl.mdwn
index 013a5072a..d890b0126 100644
--- a/doc/plugins/otl.mdwn
+++ b/doc/plugins/otl.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=otl author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=otl author="[[Joey]]"]]
+[[!tag type/format]]
 
 This plugin allows ikiwiki to process `.otl` outline files, as created by 
 [vimoutliner](http://www.vimoutliner.org/). To use it, you need to have 
diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn
index 8f7029df8..790f033ca 100644
--- a/doc/plugins/pagecount.mdwn
+++ b/doc/plugins/pagecount.mdwn
@@ -1,7 +1,7 @@
-[[template id=plugin name=pagecount author="[[Joey]]"]]
-[[tag type/meta]]
+[[!template id=plugin name=pagecount author="[[Joey]]"]]
+[[!tag type/meta]]
 
-Provides a \\[[pagecount ]] [[ikiwiki/PreProcessorDirective]] that is
+Provides a \\[[!pagecount ]] [[ikiwiki/PreProcessorDirective]] that is
 replaced with the total number of pages currently in the wiki.
 
 The optional parameter "pages" can be a [[ikiwiki/PageSpec]] specifying the
@@ -10,5 +10,5 @@ pages to count, default is to count them all.
 This plugin is included in ikiwiki, but is not enabled by default.
 
 If it is turned on it can tell us that this wiki includes
-[[pagecount pages="* and !recentchanges"]]
-pages, of which [[pagecount pages="*/Discussion"]] are discussion pages.
+[[!pagecount pages="* and !recentchanges"]]
+pages, of which [[!pagecount pages="*/Discussion"]] are discussion pages.
diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn
index f766a1ac8..ab32fb002 100644
--- a/doc/plugins/pagestats.mdwn
+++ b/doc/plugins/pagestats.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=pagestats author="Enrico Zini"]]
-[[tag type/meta type/tags]]
+[[!template id=plugin name=pagestats author="Enrico Zini"]]
+[[!tag type/meta type/tags]]
 
 This plugin can generate stats about how pages link to each other. It can
 produce either a del.icio.us style cloud, or a table counting the number of
@@ -7,8 +7,8 @@ links to each page.
 
 Here's how to use it to create a [[tag]] cloud:
 
-	\[[pagestats pages="tags/*"]]
+	\[[!pagestats pages="tags/*"]]
 
 And here's how to create a table of all the pages on the wiki:
 
-	\[[pagestats style="table"]]
+	\[[!pagestats style="table"]]
diff --git a/doc/plugins/pagetemplate.mdwn b/doc/plugins/pagetemplate.mdwn
index bea154340..57d78483d 100644
--- a/doc/plugins/pagetemplate.mdwn
+++ b/doc/plugins/pagetemplate.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=pagetemplate author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=pagetemplate author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 This plugin allows a page to be created using a different
 [[template|wikitemplates]]. The page text is inserted into the template, so
@@ -11,4 +11,4 @@ This plugin can only use templates that are already installed in
 /usr/share/ikiwiki/templates (or wherever ikiwiki is configured to look for
 them). You can choose to use any .tmpl files in that directory. Example:
 
-	\[[pagetemplate template=my_fancy.tmpl]]
+	\[[!pagetemplate template=my_fancy.tmpl]]
diff --git a/doc/plugins/passwordauth.mdwn b/doc/plugins/passwordauth.mdwn
index 473424764..fe680a0f8 100644
--- a/doc/plugins/passwordauth.mdwn
+++ b/doc/plugins/passwordauth.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=passwordauth core=1 author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=passwordauth core=1 author="[[Joey]]"]]
+[[!tag type/auth]]
 
 This plugin lets ikiwiki prompt for a user name and password when logging
 into the wiki. It also handles registering users, resetting passwords, and
@@ -18,7 +18,7 @@ as an "ask an existing member to get an account" system.)
 
 Users' passwords are stored in the `.ikiwiki/userdb` file, which needs to
 be kept safe to prevent exposure of passwords. If the
-[[cpan Authen::Passphrase]] perl module is installed, only hashes of the
+[[!cpan Authen::Passphrase]] perl module is installed, only hashes of the
 passwords will be stored. This is strongly recommended.
 
 The `password_cost` configuration option can be used to make the stored
diff --git a/doc/plugins/pingee.mdwn b/doc/plugins/pingee.mdwn
index 03eeb581c..d012004f9 100644
--- a/doc/plugins/pingee.mdwn
+++ b/doc/plugins/pingee.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=pingee author="[[Joey]]"]]
-[[tag type/special-purpose]]
+[[!template id=plugin name=pingee author="[[Joey]]"]]
+[[!tag type/special-purpose]]
 
 This plugin causes ikiwiki to listen for pings, typically delivered from
 another ikiwiki instance using the [[pinger]] plugin. When a ping is
diff --git a/doc/plugins/pinger.mdwn b/doc/plugins/pinger.mdwn
index f747a9f0b..f2dd12e62 100644
--- a/doc/plugins/pinger.mdwn
+++ b/doc/plugins/pinger.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=pinger author="[[Joey]]"]]
-[[tag type/special-purpose]]
+[[!template id=plugin name=pinger author="[[Joey]]"]]
+[[!tag type/special-purpose]]
 
 This plugin allows ikiwiki to be configured to hit a URL each time it
 updates the wiki. One way to use this is in conjunction with the [[pingee]]
@@ -16,9 +16,9 @@ the pinging. This is used to prevent ping loops.
 The "to" parameter is the url to ping. The example shows how to ping
 another ikiwiki instance.
 
-The [[cpan LWP]] perl module is used for pinging. Or the [[cpan
+The [[!cpan LWP]] perl module is used for pinging. Or the [[!cpan
 LWPx::ParanoidAgent]] perl module is used if available, for added security.
-Finally, the [[cpan Crypt::SSLeay]] perl module is needed to support pinging
+Finally, the [[!cpan Crypt::SSLeay]] perl module is needed to support pinging
 "https" urls.
 
 By default the pinger will try to ping a site for 15 seconds before timing
diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn
index 94d5fa339..17b1c4efc 100644
--- a/doc/plugins/poll.mdwn
+++ b/doc/plugins/poll.mdwn
@@ -1,10 +1,10 @@
-[[template id=plugin name=poll author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=poll author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin allows you to create online polls in the wiki. Here's an
 example use:
 
-	\[[poll 0 "red" 0 "green" 0 "blue"]]
+	\[[!poll 0 "red" 0 "green" 0 "blue"]]
 
 The numbers indicate how many users voted for that choice. When a user
 votes for a choice in the poll, the page is modified and the number
diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn
index 8d6794073..09195e694 100644
--- a/doc/plugins/polygen.mdwn
+++ b/doc/plugins/polygen.mdwn
@@ -1,29 +1,29 @@
-[[template id=plugin name=polygen author="Enrico Zini"]]
-[[tag type/fun]]
+[[!template id=plugin name=polygen author="Enrico Zini"]]
+[[!tag type/fun]]
 
 This plugin allows inserting text generated by polygen into a wiki page.
 For example:
 
-	\[[polygen grammar="genius"]]
+	\[[!polygen grammar="genius"]]
 
 It's also possible to specify a starting nonterminal for the grammar by
 including `symbol="text"` in the directive.
 
-[[if test="enabled(polygen)" then="""
+[[!if test="enabled(polygen)" then="""
 ----
 
 Here are a few notes about ikiwiki, courtesy of polygen:
 
-Ikiwiki is internally based on a [[polygen grammar="designpatterns"]]
-coupled to a [[polygen grammar="designpatterns"]], as described in
-"[[polygen grammar="paper"]]" by [[polygen grammar="nipponame"]] of
-[[polygen grammar="boyband"]].
+Ikiwiki is internally based on a [[!polygen grammar="designpatterns"]]
+coupled to a [[!polygen grammar="designpatterns"]], as described in
+"[[!polygen grammar="paper"]]" by [[!polygen grammar="nipponame"]] of
+[[!polygen grammar="boyband"]].
 
 Ikiwiki reviews:
 <ul>
-<li>[[polygen grammar="reviews"]]</li>
-<li>[[polygen grammar="reviews"]]</li>
-<li>[[polygen grammar="reviews"]]</li>
+<li>[[!polygen grammar="reviews"]]</li>
+<li>[[!polygen grammar="reviews"]]</li>
+<li>[[!polygen grammar="reviews"]]</li>
 </ul>
 
 """]]
diff --git a/doc/plugins/postsparkline.mdwn b/doc/plugins/postsparkline.mdwn
index d716022e1..73c6801a1 100644
--- a/doc/plugins/postsparkline.mdwn
+++ b/doc/plugins/postsparkline.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=postsparkline author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=postsparkline author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 This plugin uses the [[sparkline]] plugin to create a sparkline of
 statistics about a set of pages, such as posts to a blog.
@@ -7,11 +7,11 @@ statistics about a set of pages, such as posts to a blog.
 # examples
 
 	Post interval: 
-	\[[postsparkline pages="blog/* and !*/Discussion" max=100
+	\[[!postsparkline pages="blog/* and !*/Discussion" max=100
 	formula=interval style=bar barwidth=2 barspacing=1 height=13]]
 	
 	Posts per month this year: 
-	\[[postsparkline pages="blog/* and !*/Discussion" max=12
+	\[[!postsparkline pages="blog/* and !*/Discussion" max=12
 	formula=permonth style=bar barwidth=2 barspacing=1 height=13]]
 
 # usage
diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn
index 49feaa8e6..9a67f5dca 100644
--- a/doc/plugins/prettydate.mdwn
+++ b/doc/plugins/prettydate.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=prettydate author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=prettydate author="[[Joey]]"]]
+[[!tag type/format]]
 
 Enabling this plugin changes the dates displayed on pages in the wiki to
 a format that is nice and easy to read. Examples: "late Wednesday evening, 
@@ -16,4 +16,4 @@ The format used for the date can be customised using the `prettydateformat`
 configuration variable in the setup file. `%X` will be expanded to the
 prettified time value. The default prettydateformat is `"%X, %B %o, %Y"`.
 
-This plugin uses the [[cpan TimeDate]] perl module.
+This plugin uses the [[!cpan TimeDate]] perl module.
diff --git a/doc/plugins/rawhtml.mdwn b/doc/plugins/rawhtml.mdwn
index 237fb1db6..3b2d3d06c 100644
--- a/doc/plugins/rawhtml.mdwn
+++ b/doc/plugins/rawhtml.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=rawhtml author="[[Joey]]"]]
-[[tag type/html type/format]]
+[[!template id=plugin name=rawhtml author="[[Joey]]"]]
+[[!tag type/html type/format]]
 
 This plugin changes how ikiwiki handles html files, making it treat html
 or xhtml files not as source files but as data files that are copied
diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn
index b48dcbacf..4ab2cd078 100644
--- a/doc/plugins/recentchanges.mdwn
+++ b/doc/plugins/recentchanges.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=recentchanges core=1 author="[[Joey]]"]]
+[[!template id=plugin name=recentchanges core=1 author="[[Joey]]"]]
 
 This plugin examines the [[revision_control_system|rcs]] history and
 generates a page describing each recent change made to the wiki. These
@@ -8,19 +8,19 @@ pages can be joined together with [[inline]] to generate the
 Typically only the RecentChanges page will use the pages generated by this
 plugin, but you can use it elsewhere too if you like. It's used like this:
 
-	\[[inline pages="internal(recentchanges/change_*)"
+	\[[!inline pages="internal(recentchanges/change_*)"
 	template=recentchanges show=0]]
 
 Here's an example of how to show only changes to "bugs/*".
 This matches against the title of the change, which includes a list of
 modified pages.
 
-	\[[inline pages="internal(recentchanges/change_*) and title(*bugs/*)"
+	\[[!inline pages="internal(recentchanges/change_*) and title(*bugs/*)"
 	template=recentchanges show=0]]
 
 Here's an example of how to show only changes that Joey didn't make.
 (Joey commits sometimes as user `joey`, and sometimes via openid.)
 	
-	\[[inline pages="internal(recentchanges/change_*) and
+	\[[!inline pages="internal(recentchanges/change_*) and
 	!author(joey) and !author(http://joey.kitenet.net*)"
 	template=recentchanges show=0]]
diff --git a/doc/plugins/recentchangesdiff.mdwn b/doc/plugins/recentchangesdiff.mdwn
index f805eabe1..a7b113ade 100644
--- a/doc/plugins/recentchangesdiff.mdwn
+++ b/doc/plugins/recentchangesdiff.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]]
+[[!template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]]
 
 This plugin extends the [[recentchanges]] plugin, adding a diff for each
 change. The diffs are by default hidden from display on the recentchanges
diff --git a/doc/plugins/rst.mdwn b/doc/plugins/rst.mdwn
index 49dd81e70..b415ecdb9 100644
--- a/doc/plugins/rst.mdwn
+++ b/doc/plugins/rst.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=rst author="martin f. krafft"]]
-[[tag type/format]]
+[[!template id=plugin name=rst author="martin f. krafft"]]
+[[!tag type/format]]
 
 This plugin lets ikwiki convert files with names ending in ".rst" to html.
 It uses the [reStructuredText](http://docutils.sourceforge.net/rst.html)
-markup syntax. You need to have [[cpan RPC::XML]], python and the
+markup syntax. You need to have [[!cpan RPC::XML]], python and the
 python-docutils module installed to use it.
 
 Note that this plugin does not interoperate very well with the rest of
diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn
index 9336b2403..cc8190567 100644
--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@@ -1,10 +1,10 @@
-[[template id=plugin name=search author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=search author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its
 [omega](http://xapian.org/docs/omega/overview.html) frontend, and the
-[[cpan Search::Xapian]], [[cpan Digest::SHA1]], and [[cpan HTML::Scrubber]]
+[[!cpan Search::Xapian]], [[!cpan Digest::SHA1]], and [[!cpan HTML::Scrubber]]
 perl modules.
 
 The [[ikiwiki/searching]] page describes how to write search queries.
diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn
index 8a31a9bd1..e879debbd 100644
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=shortcut author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=shortcut author="[[Joey]]"]]
+[[!tag type/format]]
 
 This plugin allows external links to commonly linked to sites to be made
 more easily using shortcuts.
diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index 9ddfa19fb..36982eff3 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=sidebar author="Tuomo Valkonen"]]
-[[tag type/chrome]]
+[[!template id=plugin name=sidebar author="Tuomo Valkonen"]]
+[[!tag type/chrome]]
 
 If this plugin is enabled, then a sidebar is added to pages in the wiki.
 The content of the sidebar is simply the content of a page named
diff --git a/doc/plugins/signinedit.mdwn b/doc/plugins/signinedit.mdwn
index 525a90fe8..814ab5508 100644
--- a/doc/plugins/signinedit.mdwn
+++ b/doc/plugins/signinedit.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=signinedit core=1 author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=signinedit core=1 author="[[Joey]]"]]
+[[!tag type/auth]]
 
 This plugin, which is enabled by default, requires users be logged in
 before editing pages in the wiki.
diff --git a/doc/plugins/smiley.mdwn b/doc/plugins/smiley.mdwn
index 4e03f09e4..e4153c612 100644
--- a/doc/plugins/smiley.mdwn
+++ b/doc/plugins/smiley.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=smiley author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=smiley author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 This plugin makes it easy to insert smileys and other special symbols into
 pages in the wiki. The symbols are all listed on the [[smileys]] page,
diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn
index 9a5d0eb74..19b07b812 100644
--- a/doc/plugins/sparkline.mdwn
+++ b/doc/plugins/sparkline.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=sparkline author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=sparkline author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 This plugin allows for easily embedding sparklines into wiki pages. A
 sparkline is a small word-size graphic chart, that is designed to be
@@ -15,32 +15,32 @@ to use the plugin, you will need:
   php can find it when `sparkline/Sparkline.php` is required.
 * The GD PHP module used by the Sparkline library.
 * A "php" program in the path, that can run standalone php programs.
-* [[cpan Digest::SHA1]]
+* [[!cpan Digest::SHA1]]
 
 On a Debian system, this can be accomplished by installing these packages:
 `libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl`
 
-This plugin also uses the [[cpan Digest::SHA1]] perl module.
+This plugin also uses the [[!cpan Digest::SHA1]] perl module.
 
 # examples
 
-	\[[sparkline 1 3 5 -3 10 0 width=40 height=16
+	\[[!sparkline 1 3 5 -3 10 0 width=40 height=16
 	featurepoint="4,-3,red,3" featurepoint="5,10,green,3"]]
 
 This creates a simple line graph, graphing several points.
-[[if test="enabled(sparkline)" then="""
-[[sparkline 1 3 5 -3 10 0 width=40 height=16
+[[!if test="enabled(sparkline)" then="""
+[[!sparkline 1 3 5 -3 10 0 width=40 height=16
 featurepoint="4,-3,red,3" featurepoint="5,10,green,3"]]
 """]]
 It will be drawn 40 pixels wide and 16 pixels high. The high point in the
 line has a green marker, and the low point has a red marker.
 
-	\[[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2
+	\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2
 	barspacing=1 height=13]]
 
 This more complex example generates a bar graph. 
-[[if test="enabled(sparkline)" then="""
-[[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
+[[!if test="enabled(sparkline)" then="""
+[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red)
 style=bar barwidth=2 barspacing=1 height=13]]
 """]]
 The bars are 2 pixels wide, and separated by one pixel, and the graph is 13
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 6920c8f80..b99bb7cd5 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -1,21 +1,21 @@
-[[template id=plugin name=table author="[[VictorMoral]]"]]
-[[tag type/format]]
+[[!template id=plugin name=table author="[[VictorMoral]]"]]
+[[!tag type/format]]
 
 This plugin can build HTML tables from data in CSV (comma-separated values)
 or DSV (delimiter-separated values) format.
 
-It needs the perl module [[cpan Text::CSV]] for the CSV data.
+It needs the perl module [[!cpan Text::CSV]] for the CSV data.
 
 ## examples
 
-	\[[table data="""
+	\[[!table data="""
 	Customer|Amount
 	Fulanito|134,34
 	Menganito|234,56
 	Menganito|234,56
 	"""]]
     
-	\[[table class="book_record" format=csv file="data/books/record1"]]
+	\[[!table class="book_record" format=csv file="data/books/record1"]]
 
 In this second example the `record1` page should be similar to:
 
@@ -26,7 +26,7 @@ In this second example the `record1` page should be similar to:
 To make a cell span multiple columns, follow it with one or more empty
 cells. For example:
 
-	\[[table data="""
+	\[[!table data="""
 	left||right|
 	a|b|c|d
 	this cell spans 4 columns|||
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index edae03887..a2f0c7e57 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=tag author="[[Joey]]"]]
-[[tag type/tags type/link]]
+[[!template id=plugin name=tag author="[[Joey]]"]]
+[[!tag type/tags type/link]]
 
 This plugin allows tagging pages. List tags as follows:
 
-	\[[tag tech life linux]]
+	\[[!tag tech life linux]]
 
 The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on
 the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all
@@ -14,8 +14,8 @@ in RSS and Atom feeds.
 If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink
 instead:
 
-	\[[taglink foo]]
-	\[[taglink tagged_as_foo|foo]]
+	\[[!taglink foo]]
+	\[[!taglink tagged_as_foo|foo]]
 
 This plugin has a configuration option. Set --tagbase=tags and links to tags
 will be located under the specified base page. If ikiwiki is configured
@@ -24,7 +24,7 @@ tags/tech, tags/life, and tags/linux. This is a useful way to avoid
 having to write the full path to tags, if you want to keep them grouped
 together out of the way.
 
-[[if test="enabled(tag)" then="""
+[[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
 """]]
diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn
index 7e830fc13..7e7b88bc5 100644
--- a/doc/plugins/tag/discussion.mdwn
+++ b/doc/plugins/tag/discussion.mdwn
@@ -1,4 +1,4 @@
-I'd like to modify this plugin such that the tag pages are automatically created and populated with a list of relevant posts. The content of the tag page is simply `"\[[inline pages="link(tag/$tag)"]]`. The tag plugin will have to determine whether a page for the given tag already exists, and if not use that Markdown fragment to  generate it.
+I'd like to modify this plugin such that the tag pages are automatically created and populated with a list of relevant posts. The content of the tag page is simply `"\[[!inline pages="link(tag/$tag)"]]`. The tag plugin will have to determine whether a page for the given tag already exists, and if not use that Markdown fragment to  generate it.
 
 There are clearly many ways to do this, but any opinions on which is the cleanest?
 
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index daa2403cc..9652bf8ee 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=template author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=template author="[[Joey]]"]]
+[[!tag type/format]]
 
 With this plugin, you can set up templates, and cause them to be filled out
 and inserted into pages in the wiki. It's documented and existing templates
diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn
index 9a13ab590..a173f5a96 100644
--- a/doc/plugins/testpagespec.mdwn
+++ b/doc/plugins/testpagespec.mdwn
@@ -1,23 +1,23 @@
-[[template id=plugin name=testpagespec author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=testpagespec author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin allows testing a [[ikiwiki/PageSpec]] to see if it matches a
 page, and to see the part that matches, or causes the match to fail.
 
 Example uses:
 
-	\[[testpagespec pagespec="foopage and barpage" match="foopage"]]
+	\[[!testpagespec pagespec="foopage and barpage" match="foopage"]]
 
 This will print out something like "no match: barpage does not match
 foopage", highlighting which part of the [[ikiwiki/PageSpec]] is causing
 the match to fail.
 	
-	\[[testpagespec pagespec="foopage or !bar*" match="barpage"]]
+	\[[!testpagespec pagespec="foopage or !bar*" match="barpage"]]
 
 This will print out something like "no match: bar* matches barpage", since
 the part of the [[ikiwiki/PageSpec]] that fails is this negated match.
 	
-	\[[testpagespec pagespec="foopage or barpage" match="barpage"]]
+	\[[!testpagespec pagespec="foopage or barpage" match="barpage"]]
 
 This will print out something like "match: barpage matches barpage",
 indicating the part of the [[ikiwiki/PageSpec]] that caused it to match.
diff --git a/doc/plugins/teximg.mdwn b/doc/plugins/teximg.mdwn
index 588bf5407..1908cfb79 100644
--- a/doc/plugins/teximg.mdwn
+++ b/doc/plugins/teximg.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=teximg author="[[PatrickWinnertz]]"]]
-[[tag type/chrome type/slow]]
+[[!template id=plugin name=teximg author="[[PatrickWinnertz]]"]]
+[[!tag type/chrome type/slow]]
 
 This plugin renders LaTeX formulas into images.
 
@@ -9,14 +9,14 @@ may not be part of a regular texlive installation.
 
 ## examples
 
-	\[[teximg code="\ce{[Cu(NH3)3]^{2+}}"]]
-	\[[teximg code="\frac{1}{2}"]]
-	\[[teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]
+	\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}"]]
+	\[[!teximg code="\frac{1}{2}"]]
+	\[[!teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]
 
 To scale the image, use height=x:
 
-	\[[teximg code="\ce{[Cu(NH3)3]^{2+}}" height="17"]]
-	\[[teximg code="\ce{[Cu(NH3)3]^{2+}}" height="8"]]
+	\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="17"]]
+	\[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="8"]]
 
 If no height is choosen the default height 12 is used. Valid heights are: 8, 9,
 10, 11, 12, 14, 17, 20. If another height is entered, the closest available
@@ -24,6 +24,6 @@ height is used.
 
 To add an alt text to the image, use alt="text":
 
-	\[[teximg code="\frac{1}{2}" alt="1/2"]]
+	\[[!teximg code="\frac{1}{2}" alt="1/2"]]
 
 See [this site](http://www.der-winnie.de/opensource/gsoc2007) for rendered images.
diff --git a/doc/plugins/textile.mdwn b/doc/plugins/textile.mdwn
index c32b55e4b..4ed7d4e81 100644
--- a/doc/plugins/textile.mdwn
+++ b/doc/plugins/textile.mdwn
@@ -1,6 +1,6 @@
-[[template id=plugin name=syntax author="mazirian"]]
-[[tag type/format]]
+[[!template id=plugin name=syntax author="mazirian"]]
+[[!tag type/format]]
 
 Textile is a versatile markup language. So here's a plugin that will use the
 Textile  markup language to render .txtl files in your data directory. 
-You must have [[cpan Text::Textile]] installed for it to work.
+You must have [[!cpan Text::Textile]] installed for it to work.
diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn
index c1f8f25f0..149ac041e 100644
--- a/doc/plugins/toc.mdwn
+++ b/doc/plugins/toc.mdwn
@@ -1,20 +1,20 @@
-[[template id=plugin name=toc author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=toc author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 Add a table of contents to a page:
 
-	\[[toc ]]
+	\[[!toc ]]
 
 The table of contents will be automatically generated based on the
 headers of the page. By default only the largest headers present on the
 page will be shown; to control how many levels of headers are shown, use
 the `levels` parameter:
 
-	\[[toc levels=2]]
+	\[[!toc levels=2]]
 
 The toc plugin will take the level of the first header as the topmost
 level, even if there are higher levels seen later in the file.
 
 The table of contents will be created as an ordered list. If you want
 an unordered list instead, you can change the list-style in your local
-style sheet.
-\ No newline at end of file
+style sheet.
diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn
index b33575824..5e0b8392a 100644
--- a/doc/plugins/toggle.mdwn
+++ b/doc/plugins/toggle.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=toggle author="[[Joey]]"]]
-[[tag type/chrome]]
+[[!template id=plugin name=toggle author="[[Joey]]"]]
+[[!tag type/chrome]]
 
 With this plugin you can create links on pages that, when clicked, toggle
 display of other parts of the page.
@@ -9,15 +9,15 @@ always see the full page content.
 
 Example use:
 
-	\[[toggle id="ipsum" text="show"]]
+	\[[!toggle id="ipsum" text="show"]]
 
-	\[[toggleable id="ipsum" text="""
+	\[[!toggleable id="ipsum" text="""
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
 	eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
 	ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
 	aliquip ex ea commodo consequat.
 
-	[[toggle id="ipsum" text="hide"]]
+	[[!toggle id="ipsum" text="hide"]]
 	"""]]
 
 Note that you can include wiki markup in the toggleable text,
diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index 8d8cb55c2..c27728929 100644
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=txt author="[[Gabriel]]"]]
-[[tag type/format]]
+[[!template id=plugin name=txt author="[[Gabriel]]"]]
+[[!tag type/format]]
 
 This plugin makes ikiwiki treat files with names ending in ".txt"
 as wiki pages.
@@ -10,5 +10,5 @@ with html markup characters such as ">" escaped.
 
 The only exceptions are that [[WikiLinks|WikiLink]] and
 [[PreprocessorDirectives|PreprocessorDirective]] are still expanded by
-ikiwiki, and that, if the [[cpan URI::Find]] perl module is installed, URLs
+ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs
 in the txt file are converted to hyperlinks.
diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn
index b03c2a086..030ef8052 100644
--- a/doc/plugins/typography.mdwn
+++ b/doc/plugins/typography.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=typography author="[[Roktas]]"]]
-[[tag type/format]]
+[[!template id=plugin name=typography author="[[Roktas]]"]]
+[[!tag type/format]]
 
 This plugin, also known as
 [SmartyPants](http://daringfireball.net/projects/smartypants/), translates
 plain ASCII punctuation characters into ``smart'' typographic punctuation HTML
-entities. To use it, you need to have the [[cpan Text::Typography]] module
+entities. To use it, you need to have the [[!cpan Text::Typography]] module
 installed.
 
 This plugin has a configuration option. To change the attributes,
 set `--typographyattributes=whatever`. See the documentation for
-[[cpan Text::Typography]] for available attributes.
+[[!cpan Text::Typography]] for available attributes.
diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn
index ec9062947..7c076362e 100644
--- a/doc/plugins/version.mdwn
+++ b/doc/plugins/version.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=version author="[[Joey]]"]]
-[[tag type/useful]]
+[[!template id=plugin name=version author="[[Joey]]"]]
+[[!tag type/useful]]
 
 This plugin allows inserting the version of ikiwiki onto a page.
 
@@ -8,4 +8,4 @@ updating the version number.
 
 Use is simple:
 
-	\[[version ]]
+	\[[!version ]]
diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn
index a87ab06fd..483712130 100644
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@@ -1,8 +1,8 @@
-[[template id=plugin name=wikitext author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=wikitext author="[[Joey]]"]]
+[[!tag type/format]]
 
 This plugin allows ikiwiki to process pages written in the original wiki
-text format. To use it, you need to have the [[cpan Text::WikiFormat]] perl
+text format. To use it, you need to have the [[!cpan Text::WikiFormat]] perl
 module installed, enable the plugin, then files with the extention `.wiki`
 will be processed as wiki text.
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index b4acb237d..22bd5d114 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -3,7 +3,7 @@ written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
 
-[[toc levels=2]]
+[[!toc levels=2]]
 
 ## Types of plugins
 
@@ -189,7 +189,7 @@ ikiwiki, like generating a page, or part of a blog page, or an rss feed, or
 a cgi. This hook allows modifying the variables available on those
 templates. The function is passed named parameters. The "page" and
 "destpage" parameters are the same as for a preprocess hook. The "template"
-parameter is a [[cpan HTML::Template]] object that is the template that
+parameter is a [[!cpan HTML::Template]] object that is the template that
 will be used to generate the page. The function can manipulate that
 template object.
 
@@ -325,7 +325,7 @@ It can modify the content as desired, and should return the content.
 	hook(type => "formbuilder_setup", id => "foo", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "foo", call => \&formbuilder);
 
-These hooks allow tapping into the parts of ikiwiki that use [[cpan
+These hooks allow tapping into the parts of ikiwiki that use [[!cpan
 CGI::FormBuilder]] to generate web forms. These hooks are passed named
 parameters: `cgi`, `session`, `form`, and `buttons`. These are, respectively,
 the `CGI` object, the user's `CGI::Session`, a `CGI::FormBuilder`, and a
@@ -433,7 +433,7 @@ the entire wiki build and make the wiki unusable.
 
 #### `template($;@)`
 
-Creates and returns a [[cpan HTML::Template]] object. The first parameter
+Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the file in the template directory. The optional remaining
 parameters are passed to `HTML::Template->new`.
 
diff --git a/doc/plugins/write/external.mdwn b/doc/plugins/write/external.mdwn
index 47834567a..cbcd9bf19 100644
--- a/doc/plugins/write/external.mdwn
+++ b/doc/plugins/write/external.mdwn
@@ -13,7 +13,7 @@ easier you can do the same thing in your favorite language. ;-)
 There's now a second external plugin, the [[rst]] plugin, written in
 python. It uses a `proxy.py`, a helper library for ikiwiki python plugins.
 
-[[toc ]]
+[[!toc ]]
 
 ## How external plugins use XML RPC
 
@@ -85,7 +85,7 @@ language as part of their XML RPC interface.
 
 XML RPC has a limitation that it does not have a way to pass
 undef/NULL/None. There is an extension to the protocol that supports this,
-but it is not yet available in the [[cpan XML::RPC]] library used by
+but it is not yet available in the [[!cpan XML::RPC]] library used by
 ikiwiki.
 
 Until the extension is available, ikiwiki allows undef to be communicated
diff --git a/doc/plugins/write/tutorial.mdwn b/doc/plugins/write/tutorial.mdwn
index 94b72c763..5b810a18f 100644
--- a/doc/plugins/write/tutorial.mdwn
+++ b/doc/plugins/write/tutorial.mdwn
@@ -5,7 +5,7 @@ What should the plugin do? Let's make it calculate and output the Fibonacci
 sequence. To output the next number in the sequence, all a user has to do
 is write this on a wiki page:
 
-	[[fib ]]
+	[[!fib ]]
 
 When the page is built, the [[ikiwiki/PreProcessorDirective]] will be
 replaced by the next number in the sequence.
@@ -44,7 +44,7 @@ that "fib" has shown up again. It doesn't actually have to match the module
 name this time, but it generally will. This "fib" is telling ikiwiki what
 kind of PreprocessorDirective to handle, namely one that looks like this:
 
-	[[fib ]]
+	[[!fib ]]
 
 Notice the `\&preprocess`? This is how you pass a reference to a function,
 and the `preprocess` function is the one that ikiwiki will call to expand
@@ -98,7 +98,7 @@ And let's change the `preprocess` sub to use it:
 
 Feel free to try it out with a simple page like this:
 
-	[[fib ]], [[fib ]], [[fib ]], [[fib ]], [[fib ]]
+	[[!fib ]], [[!fib ]], [[!fib ]], [[!fib ]], [[!fib ]]
 
 Looks like it works ok, doesn't it? That creates a page that lists:
 
@@ -139,7 +139,7 @@ Ok, one more enhancement. Just incrementing the numbers is pretty boring.
 It would be nice to be able to jump directly to a given point in the
 sequence:
 
-	\[[fib seed=20]], [[fib ]], [[fib ]]
+	\[[!fib seed=20]], [[!fib ]], [[!fib ]]
 
 Just insert these lines of code inside `preprocess`, in the appropriate
 spot:
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index a6f3849f4..f66b85495 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Revision Control Systems"]]
+[[!meta title="Revision Control Systems"]]
 
 Ikiwiki supports using several revision control systems for storing page
 histories. 
@@ -10,7 +10,7 @@ generic that it can be adapted to work with many systems by writing a
 [[git]] is another well-tested option.
 
 These are all the supported revision control systems:
-[[inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]]
+[[!inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]]
 
 There is a page with [[details]] about how the different systems work with
 ikiwiki, for the curious.
diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index a6174f439..9bf65762f 100644
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -1,6 +1,6 @@
 A few bits about the RCS backends
 
-[[toc ]]
+[[!toc ]]
 
 ## Terminology
 
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 74402e155..98daf66da 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Git"]]
+[[!meta title="Git"]]
 
 [Git][git] is a distributed revison control system originally developed for
 the Linux kernel. Ikiwiki supports storing a wiki in git.
diff --git a/doc/rcs/tla.mdwn b/doc/rcs/tla.mdwn
index cafd9b49b..cad5d51f4 100644
--- a/doc/rcs/tla.mdwn
+++ b/doc/rcs/tla.mdwn
@@ -7,4 +7,4 @@ come in. When running as a [[cgi]] with tla, ikiwiki automatically
 commits edited pages to the Arch repostory, and uses the Arch
 log to generate the [[RecentChanges]] page.
 
-Note that the tla support needs the [[cpan MailTools]] perl module.
+Note that the tla support needs the [[!cpan MailTools]] perl module.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5c7368fc3..63537bcc2 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -55,8 +55,8 @@ Bulleted list
 
 ----
 
-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
 
 ----
 
@@ -78,4 +78,4 @@ The haiku will change after every save, mind you.
 
 This sandbox is also a [[ikiwiki/blog]]!
 
-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
diff --git a/doc/sandbox/test_nested_inlines.mdwn b/doc/sandbox/test_nested_inlines.mdwn
index e8ef805c9..0e6074fbd 100644
--- a/doc/sandbox/test_nested_inlines.mdwn
+++ b/doc/sandbox/test_nested_inlines.mdwn
@@ -1,3 +1,3 @@
 Testing nested inlines:
 
-[[inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]
+[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 52ef486e6..498d2b4e7 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -6,7 +6,7 @@ security issues with this program than with cat(1). If, however, you let
 others edit pages in your wiki, then some possible security issues do need
 to be kept in mind.
 
-[[toc levels=2]]
+[[!toc levels=2]]
 
 ----
 
@@ -362,9 +362,9 @@ allow the security hole to be exploited.
 
 The htmlscrubber did not block javascript in uris. This was fixed by adding
 a whitelist of valid uri types, which does not include javascript. 
-([[cve CVE-2008-0809]]) Some urls specifyable by the meta plugin could also
+([[!cve CVE-2008-0809]]) Some urls specifyable by the meta plugin could also
 theoretically have been used to inject javascript; this was also blocked
-([[cve CVE-2008-0808]]).
+([[!cve CVE-2008-0808]]).
 
 This hole was discovered on 10 February 2008 and fixed the same day
 with the release of ikiwiki 2.31.1. (And a few subsequent versions..)
@@ -377,7 +377,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page to be modified by a logged-in user. ([[cve CVE-2008-0165]])
+page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -391,7 +391,7 @@ pre-emtively guard against that, current versions of ikiwiki store password
 hashes (using Eksblowfish).
 
 If you use the [[plugins/passwordauth]] plugin, I recommend upgrading to
-ikiwiki 2.48, installing the [[cpan Authen::Passphrase]] perl module, and running
+ikiwiki 2.48, installing the [[!cpan Authen::Passphrase]] perl module, and running
 `ikiwiki-transition hashpassword` to replace all existing cleartext passwords
 with strong blowfish hashes. 
 
@@ -404,7 +404,7 @@ passwords in cleartext over the net to log in, either.
 This hole allowed ikiwiki to accept logins using empty passwords, to openid
 accounts that didn't use a password. It was introduced in version 1.34, and
 fixed in version 2.48. The [bug](http://bugs.debian.org/483770) was
-discovered on 30 May 2008 and fixed the same day. ([[cve CVE-2008-0169]])
+discovered on 30 May 2008 and fixed the same day. ([[!cve CVE-2008-0169]])
 
 I recommend upgrading to 2.48 immediatly if your wiki allows both password
 and openid logins.
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index ed15da274..174d6ceb9 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,6 +1,6 @@
 This tutorial will walk you through setting up a wiki with ikiwiki.
 
-[[toc ]]
+[[!toc ]]
 
 ## [[Download]] and [[install]] ikiwiki.
 
@@ -32,8 +32,8 @@ This will create a simple main page for the wiki.
 	$EDITOR index.mdwn
 
 In the editor, you could start by entering a simple page like
-[[toggle id=page text="this one"]].
-[[toggleable id=page text="""
+[[!toggle id=page text="this one"]].
+[[!toggleable id=page text="""
 	Welcome to your new wiki.
 
 	All wikis are supposed to have a \[[SandBox]],
@@ -116,14 +116,14 @@ should be preserved, but not checked into revision control.
 The new [[ikiwiki-makerepo]] command automates setting up a wiki in
 revision control.
 
-[[toggle id=subversion text="Subversion"]]
-[[toggleable id=subversion text="""
+[[!toggle id=subversion text="Subversion"]]
+[[!toggleable id=subversion text="""
 	REPOSITORY=~/wikirepo
 	ikiwiki-makerepo svn $SRCDIR $REPOSITORY
 """]]
 
-[[toggle id=git text="Git"]]
-[[toggleable id=git text="""
+[[!toggle id=git text="Git"]]
+[[!toggleable id=git text="""
 	REPOSITORY=~/wiki.git
 	ikiwiki-makerepo git $SRCDIR $REPOSITORY
 
@@ -132,20 +132,20 @@ ikiwiki uses git repositories, and some important caveats
 about using the git repositories.
 """]]
 
-[[toggle id=mercurial text="Mercurial"]]
-[[toggleable id=mercurial text="""
+[[!toggle id=mercurial text="Mercurial"]]
+[[!toggleable id=mercurial text="""
 	REPOSITORY=$SRCDIR
 	ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
-[[toggle id=bazaar text="Bazaar"]]
-[[toggleable id=bazaar text="""
+[[!toggle id=bazaar text="Bazaar"]]
+[[!toggleable id=bazaar text="""
 	REPOSITORY=$SRCDIR
 	ikiwiki-makerepo bzr $SRCDIR
 """]]
 
-[[toggle id=tla text="TLA"]]
-[[toggleable id=tla text="""
+[[!toggle id=tla text="TLA"]]
+[[!toggleable id=tla text="""
 	REPOSITORY=~/wikirepo
 	tla make-archive me@localhost--wiki $REPOSITORY
 	tla my-id "<me@localhost>"
@@ -158,8 +158,8 @@ about using the git repositories.
 	tla import
 """]]
 
-[[toggle id=monotone text="Monotone"]]
-[[toggleable id=monotone text="""
+[[!toggle id=monotone text="Monotone"]]
+[[!toggleable id=monotone text="""
 	# These instructions are standard instructions to import a directory into monotone
 	# and set it up so that you don't need any passwords to use it
 	REPOSITORY=~/.ikiwiki/mtn.db
diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn
index 836ccdb9a..3c11ed423 100644
--- a/doc/sitemap.mdwn
+++ b/doc/sitemap.mdwn
@@ -1,6 +1,6 @@
 This map excludes discussion pages, as well as subpages that are in feeds.
 
-[[map pages="* and !*/discussion and !recentchanges
+[[!map pages="* and !*/discussion and !recentchanges
 and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/*
 and !sandbox/* and !todo/* and !users/*
 and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]]
diff --git a/doc/soc.mdwn b/doc/soc.mdwn
index fffb5bed4..e05543bd5 100644
--- a/doc/soc.mdwn
+++ b/doc/soc.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Summer of Code"]]
+[[!meta title="Summer of Code"]]
 
 This page includes information about ikiwiki's involvement in
 [Google Summer of Code](http://code.google.com/soc/).
diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn
index 870f2ca9b..88f06b0f1 100644
--- a/doc/soc/ideas.mdwn
+++ b/doc/soc/ideas.mdwn
@@ -3,6 +3,6 @@ have a great idea for an ikiwiki project not on this list, please file it
 as a todo item, and ask us if it might work as a Summer of Code project,
 but please don't add the `soc` tag yourself.
 
-[[inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and
+[[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and
 !link(todo/done) and !bugs/done and !link(bugs/done) and 
 !*/Discussion" actions=yes show=0]]
diff --git a/doc/tags.mdwn b/doc/tags.mdwn
index a210df09c..4fc98bdbf 100644
--- a/doc/tags.mdwn
+++ b/doc/tags.mdwn
@@ -9,11 +9,11 @@ special link that ikiwiki knows is intended to be used as a tag.
 Generally you will tag a page without putting a visible link on it.
 The [[tag_plugin|plugins/tag]] allows you to do so, like this:
 
-	\[[tag mytag othertag thirdtag]]
+	\[[!tag mytag othertag thirdtag]]
 
 You can also tag a page with a visible link:
 
-	\[[taglink mytag]]
+	\[[!taglink mytag]]
 
 This tag will be displayed just like a regular [[ikiwiki/WikiLink]].
 
diff --git a/doc/tags/discussion.mdwn b/doc/tags/discussion.mdwn
index a45ecf6e2..d7a6297c0 100644
--- a/doc/tags/discussion.mdwn
+++ b/doc/tags/discussion.mdwn
@@ -1,6 +1,6 @@
 In another blog, I could tag a post with arbitrary words and not have to do
 anything else for the software to recognize it as a tag.  In Ikiwiki if you
-want to tag something \[[tag foo]] you also have to go to tags/ and create
+want to tag something \[[!tag foo]] you also have to go to tags/ and create
 foo.mkdn (even if it's zero-length), because "tags are links", and links
 don't actually *link* if they have no destination.  This allows for
 customization of how you present different tag feeds, but this (to me) is
diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index d29e721a9..c1d1974d6 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -1,13 +1,13 @@
 <span class="infobox">
 Plugin: <TMPL_VAR name><br />
 Author: <TMPL_VAR author><br />
-Included in ikiwiki: [[if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br />
+Included in ikiwiki: [[!if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br />
 Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
-Included in [[/plugins/goodstuff]]: [[if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
-Currently enabled: [[if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
+Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
+Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
-[[if test="sourcepage(plugins/contrib/*)" then="""[[meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
-<TMPL_IF core>[[tag plugins/type/core]]</TMPL_IF>
+[[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
+<TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
 <TMPL_UNLESS NAME="name">
 This template is used to create an infobox for an ikiwiki plugin. It uses
 these parameters:
diff --git a/doc/tips.mdwn b/doc/tips.mdwn
index f0eb43f0c..53f966001 100644
--- a/doc/tips.mdwn
+++ b/doc/tips.mdwn
@@ -1,5 +1,5 @@
 This page is a place to document tips and techniques for using ikiwiki.
 
-[[inline pages="tips/* and !tips/*/*" 
+[[!inline pages="tips/* and !tips/*/*" 
 feedpages="created_after(tips/howto_avoid_flooding_aggregators)" archive="yes"
 rootpage="tips" postformtext="Add a new tip about:" show=0]]
diff --git a/doc/tips/inside_dot_ikiwiki.mdwn b/doc/tips/inside_dot_ikiwiki.mdwn
index 268910ebc..b649636dc 100644
--- a/doc/tips/inside_dot_ikiwiki.mdwn
+++ b/doc/tips/inside_dot_ikiwiki.mdwn
@@ -1,4 +1,4 @@
-[[meta title="inside .ikiwiki"]]
+[[!meta title="inside .ikiwiki"]]
 
 The `.ikiwiki` directory contains ikiwiki's internal state. Normally,
 you don't need to look in it, but here's some tips for how to do so if
diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
index 8331c9ad9..ea7835b33 100644
--- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
+++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
@@ -1,14 +1,14 @@
-[[meta title="Integrated issue tracking with Ikiwiki"]]
+[[!meta title="Integrated issue tracking with Ikiwiki"]]
 
-[[meta author="Joey Hess, LinuxWorld.com"]]
+[[!meta author="Joey Hess, LinuxWorld.com"]]
 
-[[meta copyright="""
+[[!meta copyright="""
 Copyright 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com  
 [First published](http://www.linuxworld.com/news/2007/040607-integrated-issue-tracking-ikiwiki.html)
 on [LinuxWorld.com](http://www.linuxworld.com/), a publication of Network
 World Inc., 118 Turnpike Rd., Southboro, MA 01772.
 """]]
-[[meta license="[[GPL|freesoftware]]"]]
+[[!meta license="[[GPL|freesoftware]]"]]
 
 Wikis are not just for encyclopedias and websites anymore. You can use
 Ikiwiki in combination with your revision control system to handle issue
@@ -137,7 +137,7 @@ etc, to document different stages of
 their lifecycle. A developer can take ownership of a
 bug by tagging it with something like "owner/Joey".
 
-To tag a wiki page, edit it and add text such as "\[[tag done]]". Note that
+To tag a wiki page, edit it and add text such as "\[[!tag done]]". Note that
 adding a wiki link to "\[[done]]" will have the same categorisation effect
 as a tag, but the link will show up in the body of the page, which is a
 nice effect if used in a sentence such as "This was \[[done]] in version
@@ -155,23 +155,23 @@ be inlined into a given page. A few examples:
 * A typical list of all open bugs, with their full text, and a form to post new
   bugs.
 
-        \[[inline pages="bugs/* and !link(done) and !*/Discussion" actions=yes postform=yes show=0]]
+        \[[!inline pages="bugs/* and !link(done) and !*/Discussion" actions=yes postform=yes show=0]]
 
 * Index of the 30 most recently fixed bugs.
 
-        \[[inline pages="bugs/* and link(done) and !*/Discussion" sort=mtime show=30 archive=yes]]
+        \[[!inline pages="bugs/* and link(done) and !*/Discussion" sort=mtime show=30 archive=yes]]
 
 * Index of the 10 most recently active bugs.
 
-        \[[inline pages="bugs/* and !link(done) and !*/Discussion" sort=mtime show=10]]
+        \[[!inline pages="bugs/* and !link(done) and !*/Discussion" sort=mtime show=10]]
 
 * Open security issues.
 
-        \[[inline pages="bugs/* and link(security) and !link(done) and !*/Discussion"]]
+        \[[!inline pages="bugs/* and link(security) and !link(done) and !*/Discussion"]]
 
 * Full text of bugs assigned to Joey.
 
-        \[[inline pages="bugs/* and link(owner/Joey) and !link(done) and !*/Discussion" show=0]]
+        \[[!inline pages="bugs/* and link(owner/Joey) and !link(done) and !*/Discussion" show=0]]
 
 It may seem strange to consider using a wiki for issue tracking when there
 are several dedicated bug tracking systems, like Bugzilla, that handle all
diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 851b4d6b3..75314c75b 100644
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -3,19 +3,19 @@ as any [[patches|patch]]. If it seems more like a bug in the existing code,
 post it to [[bugs]] instead. Link items to [[todo/done]] when done.
 
 <!-- currently commented out because I lost all my mtimes :-)
-[[if test="enabled(postsparkline)"
+[[!if test="enabled(postsparkline)"
 then="""
 How long will it take your todo item to be fixed? Well...  
-[[postsparkline pages="todo/* and !todo/done and !link(todo/done) and !todo/*/*"
+[[!postsparkline pages="todo/* and !todo/done and !link(todo/done) and !todo/*/*"
 max=12 ymin=10 formula=permonth style=bar barwidth=2 barspacing=1 height=13]]
 this many are being added per month  
-[[postsparkline pages="todo/* and !todo and link(todo/done)"
+[[!postsparkline pages="todo/* and !todo and link(todo/done)"
 max=12 ymin=10 formula=permonth time=mtime style=bar barwidth=2 barspacing=1 height=13]]
 while this many are being fixed.
 """]]
 -->
 
-[[inline pages="todo/* and !todo/done and !link(todo/done) and
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
 !link(patch) and !link(wishlist) and !todo/*/*"
 feedpages="created_after(todo/supporting_comments_via_disussion_pages)"
 actions=yes archive=yes rootpage="todo" postformtext="Add a new todo item titled:" show=0]]
diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index 1e068cb07..6b23acfae 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -21,7 +21,7 @@ something, that I think is very valuable.
 >>>> Which would rule out openid, or other fun forms of auth. And routing all access
 >>>> through the CGI sort of defeats the purpose of ikiwiki. --[[Ethan]]
 
-Also see [[debbug 443346]].
+Also see [[!debbug 443346]].
 
 I am considering giving this a try, implementing it as a module.
 Here is how I see it:
@@ -30,10 +30,10 @@ Here is how I see it:
     for a given (user, page, operation), as in:
 
     <pre>
-    \[[acl user=joe page=*.png allow=upload]]
-    \[[acl user=bob page=/blog/bob/* allow=*]]
-    \[[acl user=* page=/blog/bob/* deny=*]]
-    \[[acl user=http://jeremie.koenig.myopenid.com/ page=/todo/* deny=create
+    \[[!acl user=joe page=*.png allow=upload]]
+    \[[!acl user=bob page=/blog/bob/* allow=*]]
+    \[[!acl user=* page=/blog/bob/* deny=*]]
+    \[[!acl user=http://jeremie.koenig.myopenid.com/ page=/todo/* deny=create
            reason="spends his time writing todo items instead of source code"]]
     </pre>
 
@@ -43,5 +43,5 @@ Here is how I see it:
     Possibly could refer to other ACL pages, as in:
 
     <pre>
-    \[[acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
+    \[[!acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
     </pre>
diff --git a/doc/todo/A_page_that_inlines_pages__61____34____42____34___results_in_unnecessary_feed_generation.mdwn b/doc/todo/A_page_that_inlines_pages__61____34____42____34___results_in_unnecessary_feed_generation.mdwn
index 8a4a41971..543c346ac 100644
--- a/doc/todo/A_page_that_inlines_pages__61____34____42____34___results_in_unnecessary_feed_generation.mdwn
+++ b/doc/todo/A_page_that_inlines_pages__61____34____42____34___results_in_unnecessary_feed_generation.mdwn
@@ -3,7 +3,7 @@ getting regenerated even when I edited only a page that did not affect
 any feed.
 
 I found that the problem only occurs in the presence of a file that
-contains \[[inline pages="*"]].
+contains \[[!inline pages="*"]].
 
 > How is this unexpected? By inlining _every_ page in the wiki, you're
 > making that page depend on every other page; any change to any page in
@@ -15,7 +15,7 @@ contains \[[inline pages="*"]].
 > N+1th page that its PageSpec matches is a no-op.
 > --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
 
 Here's a short script for replicating the bug. Just cut and paste this
 to a shell, (it will only muck in a new /tmp/ikiwiki-test directory
@@ -23,7 +23,7 @@ that it will create):
 
 	cd /tmp
 	mkdir ikiwiki-test; cd ikiwiki-test; mkdir src
-	echo '\[[inline pages="blog/*"]]' > src/myblog.mdwn
+	echo '\[[!inline pages="blog/*"]]' > src/myblog.mdwn
 	mkdir src/blog; echo "A blog entry" > src/blog/entry.mdwn
 	echo 'use IkiWiki::Setup::Standard {
 		srcdir => "src",
@@ -41,7 +41,7 @@ that it will create):
 	echo "not a blog entry" > src/not-a-blog.mdwn
 	ikiwiki --setup setup
 	ls -l --time-style=full-iso output/myblog/index.rss
-	echo '\[[inline pages="*"]]' > src/archives.mdwn
+	echo '\[[!inline pages="*"]]' > src/archives.mdwn
 	ikiwiki --setup setup
 	ls -l --time-style=full-iso output/myblog/index.rss
 	echo "still not blogging" >> src/not-a-blog.mdwn
@@ -58,7 +58,7 @@ Here's the tail of the output that I see for this command:
 	done
 	$ ls -l --time-style=full-iso output/myblog/index.rss
 	-rw-r--r-- 1 cworth cworth 459 2007-06-01 06:34:36.000000000 -0700 output/myblog/index.rss
-	$ echo '\[[inline pages="*"]]' > src/archives.mdwn
+	$ echo '\[[!inline pages="*"]]' > src/archives.mdwn
 	$ ikiwiki --setup setup
 	refreshing wiki..
 	scanning archives.mdwn
diff --git a/doc/todo/Account_moderation.mdwn b/doc/todo/Account_moderation.mdwn
index a03abb196..6ef7a65f1 100644
--- a/doc/todo/Account_moderation.mdwn
+++ b/doc/todo/Account_moderation.mdwn
@@ -7,6 +7,6 @@ the account gets approved.)
 
 --[[JoshTriplett]]
 
-[[tag soc]]
+[[!tag soc]]
 
 [[wishlist]]
diff --git a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
index 859e6af95..c908f57c8 100644
--- a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
+++ b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn
@@ -83,4 +83,4 @@ regenerate this one against that).
 	-- 
 	1.5.2.2
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn b/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
index 0a509ae2a..222cd8c46 100644
--- a/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
+++ b/doc/todo/Add_support_for_latest_Text::Markdown_as_found_on_CPAN.mdwn
@@ -8,7 +8,7 @@ This patch allows IkiWiki to work with either of the two:
 > be a good idea to check out current git master before spending time on
 > patches in the future. Thanks for the work anyway.. --[[Joey]]
 
-[[tag done]]
+[[!tag done]]
 
     --- IkiWiki/Plugin/mdwn.pm.orig	2008-03-08 11:33:50.000000000 +0100
     +++ IkiWiki/Plugin/mdwn.pm	2008-03-08 13:37:21.000000000 +0100
@@ -42,4 +42,4 @@ The above patch, which is against ikiwiki-2.40, should fix [[bugs/markdown_modul
 
 -- [[HenrikBrixAndersen]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/Allow_web_edit_form_comment_field_to_be_mandatory.mdwn b/doc/todo/Allow_web_edit_form_comment_field_to_be_mandatory.mdwn
index 2439cd65f..da68b04c2 100644
--- a/doc/todo/Allow_web_edit_form_comment_field_to_be_mandatory.mdwn
+++ b/doc/todo/Allow_web_edit_form_comment_field_to_be_mandatory.mdwn
@@ -1,7 +1,7 @@
-[[tag wishlist]]
-[[tag patch]]
+[[!tag wishlist]]
+[[!tag patch]]
 
-In our team internal wiki, we wish to impose a policy that all edits must have a comment. Patch in [[debbug 450620]].
+In our team internal wiki, we wish to impose a policy that all edits must have a comment. Patch in [[!debbug 450620]].
 
 > Good idea! I also hate empty commit comments, but I know that it's also a matter
 > of human mentality. Of course, you can forbid users to commit empty comments,
diff --git a/doc/todo/BTS_integration.mdwn b/doc/todo/BTS_integration.mdwn
index c3cd51e04..b504698c4 100644
--- a/doc/todo/BTS_integration.mdwn
+++ b/doc/todo/BTS_integration.mdwn
@@ -6,6 +6,6 @@ This seems somewhat difficult, as ikiwiki would need to maintain a cache of the
 
 [scmbug](http://www.mkgnu.net/?q=scmbug) might help here. --[[JoshTriplett]]
 
-[[tag soc]]
+[[!tag soc]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
index 180355875..73157a326 100644
--- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
+++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn
@@ -45,4 +45,4 @@ This patch adds function bestdir() which returns best directory from the directo
 ---- 
 -[[users/arpitjain]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/BibTeX.mdwn b/doc/todo/BibTeX.mdwn
index 1ab0b2e81..1ac9e99b8 100644
--- a/doc/todo/BibTeX.mdwn
+++ b/doc/todo/BibTeX.mdwn
@@ -69,4 +69,4 @@ Any thoughts on the best way to proceed?
 --[[JasonBlevins]], March 23, 2008 21:41 EDT
 
 
-[[tag soc]] [[tag wishlist]]
+[[!tag soc]] [[!tag wishlist]]
diff --git a/doc/todo/CGI_method_to_pullrefresh.mdwn b/doc/todo/CGI_method_to_pullrefresh.mdwn
index 6b5824bd3..f01c2f65a 100644
--- a/doc/todo/CGI_method_to_pullrefresh.mdwn
+++ b/doc/todo/CGI_method_to_pullrefresh.mdwn
@@ -2,6 +2,6 @@
 
 In some situations, it makes sense to have the repository in use by ikiwiki reside on a different machine. In that case, one could juggle SSH keys for the `post-update` hook. A better way may be to provide a different `do` parameter handler for the CGI, which would pull new commits to the working clone and refresh the wiki. Then, the remote `post-update` hook could just `wget` that URL. To prevent simple DoS attacks, one might assign a simple password.
 
-[[tag wishlist]]
+[[!tag wishlist]]
 
 > [[done]] via the pinger and pingee plugins --[[Joey]]
diff --git a/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
index 0210c38c3..7870281ae 100644
--- a/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
+++ b/doc/todo/Configurable_minimum_length_of_log_message_for_web_edits.mdwn
@@ -1,3 +1,3 @@
 It would be nice to specify a minimum length for the change log for web edits, and if it's only required vs. non-required. I realise this is not going to solve the problem of crap log messages, but it helps guard against accidental submissions which one would have logged. Mediawiki/wikipedia has that option, and I find it a useful reminder. --[[madduck]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Enable_filtering_of_files_indexed_for_search.mdwn b/doc/todo/Enable_filtering_of_files_indexed_for_search.mdwn
index e9b3690d0..7e692dcd8 100644
--- a/doc/todo/Enable_filtering_of_files_indexed_for_search.mdwn
+++ b/doc/todo/Enable_filtering_of_files_indexed_for_search.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 A useful item, I think, would be for an option to disable certain pages from being indexed.
 
diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index ebfd437e6..fbf1802fd 100644
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -28,9 +28,9 @@ That's one way to do it, and it has some nice benefits, like being able to edit
 
 --[[Joey]]
 
-[[tag soc]]
+[[!tag soc]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
 
 ----
 
@@ -39,7 +39,7 @@ I have implemented the first version of the Gallery Plugin for Ikiwiki as part o
 Plugin can be downloaded from [here](http://myweb.unomaha.edu/~ajain/gallery.tar). 
 
 It can be used as : <br>
-\[[gallery imagedir="images" thumbnailsize="200x200" cols="3" alt="Can not be displayed" title="My Pictures"]]
+\[[!gallery imagedir="images" thumbnailsize="200x200" cols="3" alt="Can not be displayed" title="My Pictures"]]
 
 where-<br>
 * imagedir  => Directory containing images. It will scan all the files with jpg|png|gif extension from the directory and will put it in the gallery.<br>
@@ -59,7 +59,7 @@ For any feedback or query, feel free to mail me at arpitjain11 [AT] gmail.com
 
 Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikigallery.html).
 
-[[tag patch]]
+[[!tag patch]]
 
 > I'd love to merge this into ikiwiki.
 > 
diff --git a/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn b/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
index 14dfa82d9..a644e236b 100644
--- a/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
+++ b/doc/todo/Give_access_to_more_TMPL__95__VAR_variables_in_templates_inserted_by_the_template_plugin.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist patch]]
+[[!tag wishlist patch]]
 
 # Context
 
@@ -54,7 +54,7 @@ of the pages tagged d1.
 
 My current plan is :
 
-- thanks to the edittemplate plugin, `/view/dev/*` and `/view/howto/*` would contain respectively `\[[template id=dev_direction]]` and `\[[template id=howto_usage]]`
+- thanks to the edittemplate plugin, `/view/dev/*` and `/view/howto/*` would contain respectively `\[[!template id=dev_direction]]` and `\[[!template id=howto_usage]]`
 - `/templates/dev_direction.mdwn` and `/templates/howto_usage.mdwn` would use `\[[!map ...]]` directives to build their views
 
 # My issue
@@ -68,7 +68,7 @@ Where `BASENAME` value would be, e.g., `u1` or `d2`, depending on the
 page inserting the template. But `BASENAME` does not exist. I found
 that `<TMPL_VAR PAGE>` is replaced with the full path to the page, but
 I did not found how to get the page's basename in a template included
-with a `\[[template id=...]]` directive.
+with a `\[[!template id=...]]` directive.
 
 Any idea ?
 
@@ -88,7 +88,7 @@ avoid the ad-hoc plugin solution.
 most possible of these pages.
 
 > The following patch adds a `basename` `TMPL_VAR` variable that can be
-> used in the templates inserted by \[[template plugin]] :
+> used in the templates inserted by \[[!template plugin]] :
 
 >        diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
 >        index a6e34fc..bb9dd8d 100644
diff --git a/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn b/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
index 3e596656d..d264bd209 100644
--- a/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
+++ b/doc/todo/Location_of_pages_starting_with___36__tagbase_should_be_in__by_default.mdwn
@@ -10,4 +10,4 @@ subpage: `<current>/$tagbase/<tagname>`.
 
 See also: [[bugs/tags_base_dir_not_used_when_creating_new_tags]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Moving_Pages.mdwn b/doc/todo/Moving_Pages.mdwn
index 38a5d3ad2..e1447bfb7 100644
--- a/doc/todo/Moving_Pages.mdwn
+++ b/doc/todo/Moving_Pages.mdwn
@@ -30,14 +30,14 @@ Brad
 >
 > This could also be implemented using a combination of raw inline and meta
 > to change the title (add a "redirected from etc." page. This could be done
-> with a plugin. A redirect page would be [[redirect page="newpage"]].
+> with a plugin. A redirect page would be [[!redirect page="newpage"]].
 > But then if you click "edit" on this redirect page, you won't be able
 > to edit the new page, only the call to redirect.
 > --Ethan
 
 -----
 
-[[tag patch]]
+[[!tag patch]]
 
 This is my second cut at a feature like that requested here.
 It can also be found [here](http://ikidev.betacantrips.com/patches/move.patch).
diff --git a/doc/todo/New_preprocessor_directive_syntax.mdwn b/doc/todo/New_preprocessor_directive_syntax.mdwn
index b37985994..2215cc4b4 100644
--- a/doc/todo/New_preprocessor_directive_syntax.mdwn
+++ b/doc/todo/New_preprocessor_directive_syntax.mdwn
@@ -14,8 +14,8 @@ Making this transition would fix two major warts:
 
 * The inability to use spaces in wikilinks or link text
 * The requirement to use a trailing space on a preprocessor directive
-  with no arguments, such as `\[[toc ]]`
+  with no arguments, such as `\[[!toc ]]`
 
 --[[JoshTriplett]]
 
-[[done]] in version 2.21, using the '!'-prefixed syntax. --[[JoshTriplett]]
-\ No newline at end of file
+[[done]] in version 2.21, using the '!'-prefixed syntax. --[[JoshTriplett]]
diff --git a/doc/todo/OpenSearch.mdwn b/doc/todo/OpenSearch.mdwn
index 467a7115a..e63ded688 100644
--- a/doc/todo/OpenSearch.mdwn
+++ b/doc/todo/OpenSearch.mdwn
@@ -1,6 +1,6 @@
 [[plugins/search]] could provide [OpenSearch](http://www.opensearch.org/)
 metadata.  Various software supports OpenSearch (see the Wikipedia article on
-[[wikipedia OpenSearch]]); in particular, browsers like Firefox and Iceweasel
+[[!wikipedia OpenSearch]]); in particular, browsers like Firefox and Iceweasel
 will automatically discover an OpenSearch search and offer it in the search
 box.
 
diff --git a/doc/todo/Option_to_make_title_an_h1__63__.mdwn b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
index ff2997bee..efa07ad79 100644
--- a/doc/todo/Option_to_make_title_an_h1__63__.mdwn
+++ b/doc/todo/Option_to_make_title_an_h1__63__.mdwn
@@ -1,4 +1,4 @@
-Currently, the page title (either the name of the page or the title specified with `\[[meta title="..."]]`) shows up in a `<div class="header">`.  I tend to follow the [w3c guideline recommending the use of h1 for the title](http://www.w3.org/QA/Tips/Use_h1_for_Title); for this purpose, how about an option to make the page title an `<h1 class="header">`, and shift the markdown headings down by one (making # an h2, ## an h3, etc; or alternatively making # equivalent to `\[[meta title="..."]]`)?
+Currently, the page title (either the name of the page or the title specified with `\[[!meta title="..."]]`) shows up in a `<div class="header">`.  I tend to follow the [w3c guideline recommending the use of h1 for the title](http://www.w3.org/QA/Tips/Use_h1_for_Title); for this purpose, how about an option to make the page title an `<h1 class="header">`, and shift the markdown headings down by one (making # an h2, ## an h3, etc; or alternatively making # equivalent to `\[[!meta title="..."]]`)?
 
 > The reason I don't use a h1 for the navbar is that while it incorporates
 > the page title, it's not just a page title, it has the links to parent pages.
diff --git a/doc/todo/Overlay_directory_for_pagetemplates.mdwn b/doc/todo/Overlay_directory_for_pagetemplates.mdwn
index 9d0524f1d..c4f261d03 100644
--- a/doc/todo/Overlay_directory_for_pagetemplates.mdwn
+++ b/doc/todo/Overlay_directory_for_pagetemplates.mdwn
@@ -6,4 +6,4 @@ Instead, I wonder whether it would be possible to create an overlay directory su
 
 [[madduck]]: Update: I did try setting `templates` in `ikiwiki.setup` but could not get it to work. Then I found in the code that ikiwiki already checks that dir before the `/usr/share/ikiwiki` one, and tried it again, and now it works... sorry.
 
-Thus [[taglink done]].
-\ No newline at end of file
+Thus [[!taglink done]].
+\ No newline at end of file
diff --git a/doc/todo/RSS_fields.mdwn b/doc/todo/RSS_fields.mdwn
index 8902f6426..54a2f98ad 100644
--- a/doc/todo/RSS_fields.mdwn
+++ b/doc/todo/RSS_fields.mdwn
@@ -22,4 +22,4 @@ new blog post is created, and then the edit link would work fine.
 
 > I would really like for some additional TMP variables to be present in the rss template as well.  For the inline page template, the CTIME TMPL_VAR results in nice phrases like: <q>Posted late Tuesday morning, November 13th, 2007</q>, and it would be neat to let the planet Debian people see that as well :-) Manoj
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Raw_view_link.mdwn b/doc/todo/Raw_view_link.mdwn
index 11673a6d8..e4f941743 100644
--- a/doc/todo/Raw_view_link.mdwn
+++ b/doc/todo/Raw_view_link.mdwn
@@ -10,4 +10,4 @@ The configuration setting for Mercurial could be something like this:
 > Not that I'm opposed to the idea of a plugin that adds a Raw link
 > --[[Joey]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
index 2d14c827d..a26433919 100644
--- a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
+++ b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn
@@ -1,4 +1,4 @@
-[[tag patch]]
+[[!tag patch]]
 
 Here's my next version of the patch - still a work in progress.
 
@@ -6,7 +6,7 @@ It provides the following new features. The features are designed to preserve th
 
  * If you specify an event preprocessor in a post, such as:
 
-    [[event time="2008-06-24"]]
+    [[!event time="2008-06-24"]]
 
  That date will be used instead of the post creation time when displaying the calendar.
 
diff --git a/doc/todo/Short_wikilinks.mdwn b/doc/todo/Short_wikilinks.mdwn
index 05f894dfe..b9aec9112 100644
--- a/doc/todo/Short_wikilinks.mdwn
+++ b/doc/todo/Short_wikilinks.mdwn
@@ -58,9 +58,9 @@ Other alternatives would be
 > I agree that a plugin would probably be more cumbersome, but it is very
 > doable. It might look something like this:
 
-	\[[link bar]]
+	\[[!link bar]]
 
-	\[[link bar=VeryLongPageName]]
+	\[[!link bar=VeryLongPageName]]
 
 >> This is, however, still missing specifying the link text, and adding that option would seem to me to complicate the plugin syntax a lot, unless support is added for the |-syntax for specifying a particular parameter to every plugin.
 
@@ -74,13 +74,13 @@ Other alternatives would be
 >> ... Returning to this, the syntax infact wouldn't be so bad with the |-syntax, given a short name for the plugin:
 
        [[whatever|ref 1]]
-       \[[ref 1=page_with_long_name]]
+       \[[!ref 1=page_with_long_name]]
 
 >>> A way to do this that doesn't need hacking at the preprocessor syntax
 >>> follows: --[[Joey]]
 
-	\[[link bar=1]]
-	\[[dest 1=page_with_long_name]]
+	\[[!link bar=1]]
+	\[[!dest 1=page_with_long_name]]
 
 >>>> But this doesn't work so well for links that aren't valid keys. Such
 >>>> as stuff with spaces in it. I'd like to be able to write any kind of
@@ -88,8 +88,8 @@ Other alternatives would be
 
 >>>>> You're right, and to fix that it could be turned around: --[[Joey]]
 
-	\[[link 1=bar]]
-	\[[dest 1=page_with_long_name]]
+	\[[!link 1=bar]]
+	\[[!dest 1=page_with_long_name]]
 
 >> It also shouldn't be difficult to support non-wiki links in this same
 >> way, so that you could still link everywhere in an uniform manner, as
diff --git a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
index 998d7f0c2..c651b0a45 100644
--- a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
+++ b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
@@ -21,4 +21,4 @@ that we're at the root of a (sub-)hierarchy.
 > 
 > IMHO, what you really want is [[Moving_pages]]. :-) --[[Joey]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Support_XML-RPC-based_blogging.mdwn b/doc/todo/Support_XML-RPC-based_blogging.mdwn
index 3afbc59bc..f9685be73 100644
--- a/doc/todo/Support_XML-RPC-based_blogging.mdwn
+++ b/doc/todo/Support_XML-RPC-based_blogging.mdwn
@@ -1,6 +1,6 @@
 Perhaps ikiwiki should support XML-RPC-based blogging, using the [standard
 MetaWeblog protocol](http://www.xmlrpc.com/metaWeblogApi).  This would allow
-the use of applets like [[debpkg gnome-blog]] to post to an ikiwiki blog.  The
+the use of applets like [[!debpkg gnome-blog]] to post to an ikiwiki blog.  The
 protocol supports multiple blog names, so one standard URL with page names as
 blog names would work. --[[JoshTriplett]]
 
@@ -9,6 +9,6 @@ blog names would work. --[[JoshTriplett]]
 
 >> I'd love to see support for this and would be happy to contribute towards a bounty (say US$100) :-).  [PmWiki](http://www.pmwiki.org/) has a plugin which [implements this](http://www.pmwiki.org/wiki/Cookbook/XMLRPC) in a way which seems fairly sensible as an end user.  --[[AdamShand]]
 
-[[tag soc]]
+[[!tag soc]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/Support_tab_insertion_in_textarea.mdwn b/doc/todo/Support_tab_insertion_in_textarea.mdwn
index bed8381be..10d94343f 100644
--- a/doc/todo/Support_tab_insertion_in_textarea.mdwn
+++ b/doc/todo/Support_tab_insertion_in_textarea.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 It'd be nice to be allowed to insert tabs into the textarea, as opposed to
 having to insert 4-spaces for lists/etc.  This would require JavaScript to
diff --git a/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn b/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
index 24f9054f7..2837634d9 100644
--- a/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
+++ b/doc/todo/Support_wildcard_inside_of_link__40____41___within_a_pagespec.mdwn
@@ -2,7 +2,7 @@ I don't segregate my blog entries into a directory, but instead want
 my blog to simply consist of all pages that have been tagged. That is,
 I'd like to have my blog page look like this:
 
-	\[[inline pages="link(tag/*)"]]
+	\[[!inline pages="link(tag/*)"]]
 
 That doesn't work in ikiwiki 2.1, but I have it
 [working](http://www.cworth.org/blog) with the following patch:
diff --git a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn
index 842c87e2d..61b19d302 100644
--- a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn
+++ b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn
@@ -1,4 +1,4 @@
-Here is a patch [[tag patch]] to add a *forward*ing functionality
+Here is a patch [[!tag patch]] to add a *forward*ing functionality
 to the [[`meta`_plugin|plugins/meta]].
 
 > [[done]], with some changes --[[Joey]]
@@ -22,7 +22,7 @@ I can also submit a Git patch, if desired.
 
 **OPT_DELAY** = delay=**D** | empty (*immediatelly*)
 
-\[[meta forward="**WHITHER**" **OPT_DELAY**]]
+\[[!meta forward="**WHITHER**" **OPT_DELAY**]]
 
 
 # Extensions and Ideas
diff --git a/doc/todo/absolute_urls_in_wikilinks.mdwn b/doc/todo/absolute_urls_in_wikilinks.mdwn
index 50c2fe16f..a0fe83e44 100644
--- a/doc/todo/absolute_urls_in_wikilinks.mdwn
+++ b/doc/todo/absolute_urls_in_wikilinks.mdwn
@@ -1,8 +1,8 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 An option to have absolute urls in wikilinks instead of relative ones would be useful, 
 for pages included into other pages out of the wiki rendering process (shtml for example)
-since these pages can be included from a subdir. Ditto, links from \[[ inline ..]] or \[[map ..]].
+since these pages can be included from a subdir. Ditto, links from \[[!inline ..]] or \[[!map ..]].
 
 > You can make a wikilink absolute by prefixing it with a /, see 
 > [[ikiwiki/subpage/linkingrules/]]. Pagespecs match absolute by default. But what do
@@ -10,11 +10,11 @@ since these pages can be included from a subdir. Ditto, links from \[[ inline ..
 > change. --Ethan
 
 >> I want the "last pages" in my sidebar. and some links to a few special pages.
->> \[[inline ]] or \\[[map ]] in the sidebar is a bad idea, (because each update rebuilds
+>> \[[!inline ]] or \\[[!map ]] in the sidebar is a bad idea, (because each update rebuilds
 >> all the wiki), so I use server-side-include instead of the sidebar plugin; 
 >> this reduces the dependencies
 >> my sidebar is generated as http://foo.org/menu/index.html, so all the links generated by 
->> \[[inline ]] or \[[map ]] are relative to this position. 
+>> \[[!inline ]] or \[[!map ]] are relative to this position. 
 >> Included from http://foo.org/section/sub/blah/index.shtml, the links are broken.
 >>
 >> — NicolasLimare
diff --git a/doc/todo/aggregate_401_handling.mdwn b/doc/todo/aggregate_401_handling.mdwn
index 4f7c96946..125e74e76 100644
--- a/doc/todo/aggregate_401_handling.mdwn
+++ b/doc/todo/aggregate_401_handling.mdwn
@@ -1,5 +1,5 @@
 The aggregate plugin's handling of http 301 (moved permanently) could be
-improved. Per [[rfc 1945]]:
+improved. Per [[!rfc 1945]]:
 
 > The requested resource has been assigned a new permanent URL
 > and any future references to this resource should be done
diff --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn
index 38427133f..272e146f4 100644
--- a/doc/todo/aggregate_to_internal_pages.mdwn
+++ b/doc/todo/aggregate_to_internal_pages.mdwn
@@ -56,4 +56,4 @@ change their pagespecs to use `internal()`.
 > "ikiwiki-transition aggregateinternal $setupfile" moves the pages around,
 > although it doesn't update the pagespecs (I wouldn't know how...) --[[smcv]]
 
-[[tag patch done]]
+[[!tag patch done]]
diff --git a/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn
index 6125bc413..7f51f79d0 100644
--- a/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn
+++ b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn
@@ -1,3 +1,3 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 It would be cool if the CGI could be used to render dynamic pages. For instance, I might want to create a page with a `\[[map]]` according to a [[pagespec]] to be passed in the query string, instead of creating/hardcoding all possible pagespecs I might want to call.
diff --git a/doc/todo/allow_full_post_from_the___34__add_a_new_post__34___form.mdwn b/doc/todo/allow_full_post_from_the___34__add_a_new_post__34___form.mdwn
index 8ef8a1533..a604182b1 100644
--- a/doc/todo/allow_full_post_from_the___34__add_a_new_post__34___form.mdwn
+++ b/doc/todo/allow_full_post_from_the___34__add_a_new_post__34___form.mdwn
@@ -9,4 +9,4 @@ comment form.
 > I agree that having this as an option is reasonable. Although it would
 > take a fair amount of work. --[[Joey]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/attachments.mdwn b/doc/todo/attachments.mdwn
index 430817d3f..56b2249ea 100644
--- a/doc/todo/attachments.mdwn
+++ b/doc/todo/attachments.mdwn
@@ -11,4 +11,4 @@ nice to add:
   srcdir. This would allow the admin to review them, and manually
   add/delete them before they bloat history.
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index fac450a22..bfb4a863b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -4,6 +4,6 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte
 
 Also see: <http://madduck.net/blog/2008.01.06:new-blog/> and <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/autocreatetagpage/>
 
-[[tag wishlist]]
+[[!tag wishlist]]
 
 I would love to see this as well. -- dato
diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
index e9706653f..cd5ff34de 100644
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
@@ -7,7 +7,7 @@ as the type argument.
 
 Together with the ability to have
 [[wiki-formatted_comments|wiki-formatted_comments_with_syntax_plugin]],
-this would allow the use of ikiwiki for [[wikipedia literate programming]].
+this would allow the use of ikiwiki for [[!wikipedia literate programming]].
 
 * I have started something along these lines see [[plugins/contrib/sourcehighlight]].  For some reason I started with source-highlight [[DavidBremner]]
 
diff --git a/doc/todo/blogpost_plugin.mdwn b/doc/todo/blogpost_plugin.mdwn
index aade457d0..60b1e2515 100644
--- a/doc/todo/blogpost_plugin.mdwn
+++ b/doc/todo/blogpost_plugin.mdwn
@@ -153,4 +153,4 @@ Index: IkiWiki.pm
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 </pre>
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn b/doc/todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn
index caff54780..0a036d315 100644
--- a/doc/todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn
+++ b/doc/todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn
@@ -1,6 +1,6 @@
 I am serving notice that I am starting work on a calendar plugin inspired by Blosxom's calendar plugin. The current plan is to create a plugin that looks through all the source files matching a certain pagespec, and optionally spit out a month view for the specified month (default to current), or spit out a year view for a given year (defaulting to the current year), of a list  of year with posts in them. The output would be a table, with the same CSS directives that the Blosxom plugin used to use (so that I can just reuse my css file).  The links would be created to a $config{archivedir}/$year or $config{archivedir}/$year-$month file, which can just have 
 
-     \[[inline pages="blog/* and !*/Discussion and creation_year($year) and creation_month($month)" rss="no" atom="no" show="0"]]
+     \[[!inline pages="blog/* and !*/Discussion and creation_year($year) and creation_month($month)" rss="no" atom="no" show="0"]]
 
 or some thing to generate a archive of postings. 
 
@@ -10,21 +10,21 @@ ManojSrivastava
 
 This plugin is inspired by the calendar plugin for Blosxom, but derivesno code from it. This plugin is essentially a fancy front end to archives of previous pages, usually used for blogs. It can produce a calendar for a given month, or a list of months for a given year. To invoke the calendar, just use the preprocessor directive:
 
-     \[[calendar ]]
+     \[[!calendar ]]
 
 or
 
-      \[[calendar type="month" pages="blog/* and !*/Discussion"]]
+      \[[!calendar type="month" pages="blog/* and !*/Discussion"]]
 
 or
 
-       \[[calendar type="year"  year="2005" pages="blog/* and !*/Discussion"]]
+       \[[!calendar type="year"  year="2005" pages="blog/* and !*/Discussion"]]
 
 
 The year and month entities in the out put have links to archive index pages, which are supposed to exist already. The idea is to create an archives hierarchy, rooted in the subdirectory specified in the site-wide customization variable, archivebase. archivebase defaults to "archives".  Links are created to pages "$archivebase/$year" and "$archivebase/$year/$month". The idea is to create annual and monthly indices, for example, by using something like this sample from my archives/2006/01.mdwn 
 
-          \[[meta title="Archives for 2006/01"]]
-          \[[inline rootpage="blog" atom="no" rss="no" show="0" pages="blog/* and !*/Discussion and creation_year(2006) and creation_month(01)" ]]
+          \[[!meta title="Archives for 2006/01"]]
+          \[[!inline rootpage="blog" atom="no" rss="no" show="0" pages="blog/* and !*/Discussion and creation_year(2006) and creation_month(01)" ]]
 
 I'll send in the patch via email.
 
@@ -38,7 +38,7 @@ mailed me, and my response to it. --[[Joey]]
 > > I'm sending in an updated package, and have removed the older version you had here.--ManojSrivastava
 
 
-[[tag patch]]
+[[!tag patch]]
 
 ----
 
diff --git a/doc/todo/canonical_feed_location.mdwn b/doc/todo/canonical_feed_location.mdwn
index b294e594a..694f67633 100644
--- a/doc/todo/canonical_feed_location.mdwn
+++ b/doc/todo/canonical_feed_location.mdwn
@@ -13,4 +13,4 @@ with all news or the one with the latest news only, I don't know yet.)
 >> wouldn't embed the feed link into `<head>` so that browsers can automatically
 >> find it.
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/clickable-openid-urls-in-logs.mdwn b/doc/todo/clickable-openid-urls-in-logs.mdwn
index acf2c2d49..ab2a6b51f 100644
--- a/doc/todo/clickable-openid-urls-in-logs.mdwn
+++ b/doc/todo/clickable-openid-urls-in-logs.mdwn
@@ -6,7 +6,7 @@ for SVN. If this is OK, I'll patch the other RCS modules, too.
 > recognise such commit messages when parsing the logs. Do that and extend
 > to the other modules and I'll accept it. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
 
 <pre>
 --- IkiWiki/Rcs/svn.pm  (revision 2650)
diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index 069e2d4c2..cb3e85b74 100644
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -23,7 +23,7 @@ What do you think about it? --[[Paweł|ptecza]]
 > `<span>`. A preprocessor directive is not really any less ugly than html
 > tags, though at least it could play nicely with nested markdown: --[[Joey]]
 > 
->	\[[color red,green """
+>	\[[!color red,green """
 >	Xmas-colored markdown here
 >	"""]]
 
diff --git a/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn b/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
index c6f1fefe1..4bdcf3d01 100644
--- a/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
+++ b/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
@@ -1,6 +1,6 @@
 I'd like to see some way to conditionally include wiki text based on
 whether the wiki enables or disables certain features.  For example,
-[[ikiwiki/formatting]], could use `\[[if (enabled smiley) """Also, because
+[[ikiwiki/formatting]], could use `\[[!if (enabled smiley) """Also, because
 this wiki has the smiley plugin enabled, you can insert \[[smileys]] and
 some other useful symbols."""]]`, and a standard template for [[plugins]]
 pages could check for the given plugin name to print "enabled" or
@@ -52,7 +52,7 @@ Syntax could vary greatly here, both for the
 > As to the syntax, to fit it into standard preprocessor syntax, it would
 > need to look something like this:
 >
->	\[[if test="enabled(smiley)" """foo"""]]
+>	\[[!if test="enabled(smiley)" """foo"""]]
 > 
 > --[[Joey]]
 
@@ -70,7 +70,7 @@ Syntax could vary greatly here, both for the
 >>
 >> A few use cases for `included`, which I would really like to see:
 >>
->> * On the sidebar page, you could say something like \[[if test="!included"
+>> * On the sidebar page, you could say something like \[[!if test="!included"
 >>   """This page, without this help message, appears as a sidebar on all
 >>   pages."""]].  The help text would then only appear on the sidebar page
 >>   itself, not the sidebar included on all pages.
@@ -110,7 +110,7 @@ This is now completely [[todo/done]]! See [[plugins/conditional]].
 Is there a way to test features other than plugins? For example,
 to add to [[ikiwiki/Markdown]] something like
 
-    \[[if test="enabled(multimarkdown)" then="You can also use..."]]
+    \[[!if test="enabled(multimarkdown)" then="You can also use..."]]
 
 (I tried it like that just to see if it would work, but I wasn't that lucky.)
 --ChapmanFlack
diff --git a/doc/todo/correct_published_and_updated_time_information_for_the_feeds.mdwn b/doc/todo/correct_published_and_updated_time_information_for_the_feeds.mdwn
index 082f0800c..565f3b16c 100644
--- a/doc/todo/correct_published_and_updated_time_information_for_the_feeds.mdwn
+++ b/doc/todo/correct_published_and_updated_time_information_for_the_feeds.mdwn
@@ -110,4 +110,4 @@ Index: IkiWiki/Plugin/inline.pm
 
 [[done]] --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index 84c99daba..e757867d2 100644
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -9,8 +9,8 @@ Here's Thomas Schwinge unfinished darcs support for ikiwiki.
 
 -- [Thomas Schwinge](mailto:tschwinge@gnu.org)
 
-[[toggle text="show"]]
-[[toggleable text="""
+[[!toggle text="show"]]
+[[!toggleable text="""
 	# Support for the darcs rcs, <URL:http://darcs.net/>.
 	# Copyright (C) 2006  Thomas Schwinge <tschwinge@gnu.org>
 	#
@@ -206,8 +206,8 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
 
 `rcs_commit()` uses backticks instead of `system()`, to prevent darcs' output being sent to the browser and mucking with the HTTP headers (`darcs record` has no --quiet option). And `rcs_recentchanges()` uses regexes rather than parsing darcs' XML output.
 
-[[toggle text="show" id="bma"]]
-[[toggleable id="bma" text="""
+[[!toggle text="show" id="bma"]]
+[[!toggleable id="bma" text="""
 
 	#!/usr/bin/perl
 	
@@ -334,8 +334,8 @@ This is my ([bma](bma@bmalee.eu)) darcs.pm - it's messy (my Perl isn't up to muc
 
 Well, here's my version too. It only does getctime -- using a real XML parser, instead of regexp ugliness -- and maybe recentchanges, but that may be bitrotted, or maybe I never finished it, as I only need the getctime. As for actual commits, I have previously voiced my opinion, that this should be done by the plugin generating a patch bundle, and forwarding it to darcs in some way (`darcs apply` or even email to another host, possibly moderated), instead of the hacky direct modification of a working copy. It could also be faster to getctime in a batch. Just reading in all the changes the first time they're needed, might not be a big improvement in many cases, but if we got a batch request from ikiwiki, we could keep reaing the changes until all the files in this batch request have been met.  --[[tuomov]]
 
-[[toggle text="show" id="tuomov"]]
-[[toggleable id="tuomov" text="""
+[[!toggle text="show" id="tuomov"]]
+[[!toggleable id="tuomov" text="""
 <pre>
 #!/usr/bin/perl
 # Stubs for no revision control.
@@ -484,4 +484,4 @@ I have addressed the recentchanges bit, you can find my hacked up darcs.pm at <h
 
 It's got couple of FIXMEs, and a very site-specific filter for recentchanges. Not sure how to do that better though. I will eventually add web commits, probably of my own (and mention it here).
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/datearchives-plugin.mdwn b/doc/todo/datearchives-plugin.mdwn
index 4264b5895..5a5560d6c 100644
--- a/doc/todo/datearchives-plugin.mdwn
+++ b/doc/todo/datearchives-plugin.mdwn
@@ -74,4 +74,4 @@ created and populated with the relevant posts. A [[ikiwiki/Pagespec]] works perf
 >>> might move it to the contributed plugins directory as it's a bit
 >>> specialised to be included in ikiwiki though. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/discussion_page_as_blog.mdwn b/doc/todo/discussion_page_as_blog.mdwn
index 577ced17d..c7a3d6ac9 100644
--- a/doc/todo/discussion_page_as_blog.mdwn
+++ b/doc/todo/discussion_page_as_blog.mdwn
@@ -30,4 +30,4 @@ I don't think that the nesting is very clear, I found it confusing..
 
 Would each page be its own individual blog? Or its own blog post? To me it seems like an entire wiki can be viewed as a blog, with threaded or unthreaded comments underneath.
 
-[[tag soc]]
+[[!tag soc]]
diff --git a/doc/todo/discussion_page_as_blog/discussion/castle/discussion.mdwn b/doc/todo/discussion_page_as_blog/discussion/castle/discussion.mdwn
index 10f7a066f..c95fb0e20 100644
--- a/doc/todo/discussion_page_as_blog/discussion/castle/discussion.mdwn
+++ b/doc/todo/discussion_page_as_blog/discussion/castle/discussion.mdwn
@@ -1 +1 @@
-[[inline pages="sandbox/castle/discussion/* and !sandbox/castle/discussion/*/*" rootpage="sandbox/castle/discussion"]]
-\ No newline at end of file
+[[!inline pages="sandbox/castle/discussion/* and !sandbox/castle/discussion/*/*" rootpage="sandbox/castle/discussion"]]
+\ No newline at end of file
diff --git a/doc/todo/discussion_page_as_blog/discussion/castle/discussion/Don__39__t_like_foo.mdwn b/doc/todo/discussion_page_as_blog/discussion/castle/discussion/Don__39__t_like_foo.mdwn
index 65672f14e..48ca72a9c 100644
--- a/doc/todo/discussion_page_as_blog/discussion/castle/discussion/Don__39__t_like_foo.mdwn
+++ b/doc/todo/discussion_page_as_blog/discussion/castle/discussion/Don__39__t_like_foo.mdwn
@@ -1,3 +1,3 @@
 I don't like foo. Have you tried living without foo?
 
-[[inline pages="sandbox/castle/discussion/Don__39__t_like_foo/*" rootpage="sandbox/castle/discussion/Don__39__t_like_foo"]]
-\ No newline at end of file
+[[!inline pages="sandbox/castle/discussion/Don__39__t_like_foo/*" rootpage="sandbox/castle/discussion/Don__39__t_like_foo"]]
+\ No newline at end of file
diff --git a/doc/todo/done.mdwn b/doc/todo/done.mdwn
index 0ad5656a0..ed161fb5b 100644
--- a/doc/todo/done.mdwn
+++ b/doc/todo/done.mdwn
@@ -1,3 +1,3 @@
 recently fixed [[TODO]] items
 
-[[inline pages="link(todo/done) and !todo and !*/Discussion" sort=mtime show=10]]
+[[!inline pages="link(todo/done) and !todo and !*/Discussion" sort=mtime show=10]]
diff --git a/doc/todo/doxygen_support.mdwn b/doc/todo/doxygen_support.mdwn
index ae31c1603..4625da904 100644
--- a/doc/todo/doxygen_support.mdwn
+++ b/doc/todo/doxygen_support.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 Given that ikiwiki has a suggested use as a tool for developers, I was thinking it might be cool if ikiwiki had [Doxygen](http://www.doxygen.org/) support.  I'm not exactly sure how the integration would work.  Something along the lines of a plugin to support .dox files would be my first thought.  I'd leave generating the documentation from any source files for a separate run of Doxygen - it'd be easier and you probably don't want the source being edited over the web.
 
diff --git a/doc/todo/else_parameter_for_map_plugin.mdwn b/doc/todo/else_parameter_for_map_plugin.mdwn
index 50fe39357..12a91b4ee 100644
--- a/doc/todo/else_parameter_for_map_plugin.mdwn
+++ b/doc/todo/else_parameter_for_map_plugin.mdwn
@@ -14,14 +14,14 @@ documentation yet, I'm waiting for feedback first, but I'll do it for sure. -- [
 >> Hmmm, what do you mean? Adding a syntax such as the one below?
 >> Or something else?
 
-        \[[if test="map(" then="..." else="..."]]
+        \[[!if test="map(" then="..." else="..."]]
 
 >> What would you write in the `then` clause?
 >> I'm not opposed at all to rewrite my two-liner, but I don't understand.
 >> --[[intrigeri]]
 
-	\[[if  test="foo/*" then="""
-	[[map pages="foo/*"]]
+	\[[!if  test="foo/*" then="""
+	[[!map pages="foo/*"]]
 	""" else="no pages"]]
 
 --[[Joey]]
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 4d377d3f6..b3c174fba 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -12,7 +12,7 @@
                     qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
            wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
 
-[[tag patch]]
+[[!tag patch]]
 
 This lets the site administrator have a `.htaccess` file in their underlay
 directory, say, then get it copied over when the wiki is built. Without
@@ -37,7 +37,7 @@ Hi, I would like to have my htaccess files in svn repository so ikiwiki would ex
 That way I have revision control on that file too. That may be a security concern, but I trust everybody that has svn commit
 access and such .htaccess files should not be accessible through wiki cgi. Of course, it could default to 'off'.
 
-> See [[debbug 447267]] for a patch for this.
+> See [[!debbug 447267]] for a patch for this.
 
 ---
 
@@ -47,4 +47,4 @@ but I use ikiwiki with a very small group of people collaborating so svn/web acc
 and htaccess is for limiting access to some areas of wiki.   
 It should be off by default of course. --Max
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/fileupload.mdwn b/doc/todo/fileupload.mdwn
index 9a9106229..8c9b18b19 100644
--- a/doc/todo/fileupload.mdwn
+++ b/doc/todo/fileupload.mdwn
@@ -60,4 +60,4 @@ pagespec lock like the above prevents an edit or upload from happening,
 ikiwiki could display a reasonable message to the user, indicating what
 they've done wrong.)
 
-[[tag soc done]]
+[[!tag soc done]]
diff --git a/doc/todo/fileupload/soc-proposal/discussion.mdwn b/doc/todo/fileupload/soc-proposal/discussion.mdwn
index 1ce52f0ca..f85a956db 100644
--- a/doc/todo/fileupload/soc-proposal/discussion.mdwn
+++ b/doc/todo/fileupload/soc-proposal/discussion.mdwn
@@ -29,7 +29,7 @@ For images, videos, etc. it would be nice to have some kind of meta data file to
 height, compression, etc. which could be initially created by 'ikiwiki --generate-meta-stuff'. 
 Then PageSpec should be
 teached to use these. Galleries could then be generated by means of
-\[[inline pages="type(image/*) and year(2007)" template="gallery"]].  It
+\[[!inline pages="type(image/*) and year(2007)" template="gallery"]].  It
 should of course be possible to edit this information via ikiwiki.cgi and with any
 text editor (Name: value). This should also allow for creations of default .html pages with
 the image/video/file/... and a discussion page. Probably named image.mdwn and image/discussion.
diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn
index 45002f0c6..315b2d88f 100644
--- a/doc/todo/format_escape.mdwn
+++ b/doc/todo/format_escape.mdwn
@@ -97,7 +97,7 @@ I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-fo
 --Ryan Koppenhaver
 
 ## Original patch
-[[tag patch]]
+[[!tag patch]]
 
 <pre>
 Index: debian/changelog
diff --git a/doc/todo/geotagging.mdwn b/doc/todo/geotagging.mdwn
index 0f2514e0c..cb07e5e0c 100644
--- a/doc/todo/geotagging.mdwn
+++ b/doc/todo/geotagging.mdwn
@@ -2,4 +2,4 @@ Would be nice to see a way of geotagging pages in an ikiwiki,
 and search/sort pages by distance to a given location, as well as
 showing page locations on a map (Google Map, OpenStreetMap, etc). -- [[users/vibrog]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn b/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn
index d811b8ea9..ec7d61b90 100644
--- a/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn
+++ b/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn
@@ -21,4 +21,4 @@ Better to strip the path out in getctime, I guess.
 
 --[[Joey]]
 
-[[tag patch done]]
+[[!tag patch done]]
diff --git a/doc/todo/git_attribution.mdwn b/doc/todo/git_attribution.mdwn
index ef59c221f..baa522adc 100644
--- a/doc/todo/git_attribution.mdwn
+++ b/doc/todo/git_attribution.mdwn
@@ -4,6 +4,6 @@ on the semantics you want to imply (does a web edit constitute a commit by
 the user or by the script?), it could also set `GIT_COMMITTER_NAME` and
 `GIT_COMMITTER_EMAIL` to the same values.  --[[JoshTriplett]]
 
-> See [[debbug 451023]] for a [[patch]] --[[Joey]]
+> See [[!debbug 451023]] for a [[patch]] --[[Joey]]
 
 [[done]]
diff --git a/doc/todo/graphviz.mdwn b/doc/todo/graphviz.mdwn
index c55a4aa23..66ca0ae32 100644
--- a/doc/todo/graphviz.mdwn
+++ b/doc/todo/graphviz.mdwn
@@ -1,6 +1,6 @@
 How about a plugin providing a
 [[preprocessor_directive|ikiwiki/preprocessordirective]] to render a
-[[debpkg graphviz]] file as an image via one of the graphviz programs
+[[!debpkg graphviz]] file as an image via one of the graphviz programs
 ("dot" by default) and include the resulting image on the page, using the
 "cmapx" image map format?  graphviz files themselves could also render the
 same way into an HTML file with the same basename as the graphviz file;
diff --git a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
index 2ef231dde..a6a6ec1e1 100644
--- a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
+++ b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
@@ -12,7 +12,7 @@ while the default stays as it is now.
 > INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not
 > adding new variables where MakeMaker already has them. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
 
 <pre>
 
diff --git a/doc/todo/index.html_allowed.mdwn b/doc/todo/index.html_allowed.mdwn
index dabba6914..13ed49211 100644
--- a/doc/todo/index.html_allowed.mdwn
+++ b/doc/todo/index.html_allowed.mdwn
@@ -3,7 +3,7 @@ providing the usedirs option for output. The remaining patch, discussed
 below, concerns wanting to use foo/index.mdwn source files and get an
 output page name of foo, rather than foo/index. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
 
 ---
 
diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn
index 2d1a56696..33098c601 100644
--- a/doc/todo/language_definition_for_the_meta_plugin.mdwn
+++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn
@@ -1,5 +1,5 @@
 Here is a patch for the [[plugins/meta]] plugin. It adds the possibility to define the language 
-used for a page, with \[[meta lang="ja"]]
+used for a page, with \[[!meta lang="ja"]]
 
 It doesn't insert the langage information in the xhtml meta elements, but defines a LANG
 variable to use in the templates, for example with
@@ -81,4 +81,4 @@ This may be useful for sites with a few pages in different languages, but no ful
 > Please resolve lang somewhere reusable rather than within meta plugin: It is certainly usable outside
 > the scope of the meta plugin as well. --[[JonasSmedegaard]]
 
-[[tag wishlist patch plugins/meta translation]]
+[[!tag wishlist patch plugins/meta translation]]
diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index 01d927552..e96e4b782 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -1,7 +1,7 @@
 How about a plugin adding a
 [[preprocessor_directive|ikiwiki/preprocessordirective]] to render some given LaTeX
 and include it in the page?  This could either render the LaTeX as a PNG via
-[[debpkg dvipng]] and include the resulting image in the page, or perhaps
+[[!debpkg dvipng]] and include the resulting image in the page, or perhaps
 render via [HeVeA](http://pauillac.inria.fr/~maranget/hevea/index.html),
 [TeX2page](http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html), or
 similar. Useful for mathematics, as well as for stuff like the LaTeX version
@@ -197,7 +197,7 @@ This are of course the minority of people (but I guess also the minority of peop
 
 
 > I'm thinking about renameing the preprocessor directive to teximg.
-> \[[teximg code="" alt="foo"]] makes sense.. Would it make sense to rename
+> \[[!teximg code="" alt="foo"]] makes sense.. Would it make sense to rename
 > the whole plugin, or do you think that other tex stuff should go in this
 > same plugin?
 
@@ -216,5 +216,5 @@ Ah yes.. sorry forgot to update the plugin in my public_html folder %-). This wa
 > 
 > --[[Joey]]
 
-[[tag soc]]
-[[tag wishlist]]
+[[!tag soc]]
+[[!tag wishlist]]
diff --git a/doc/todo/let_inline_plugin_use_pagetemplates.mdwn b/doc/todo/let_inline_plugin_use_pagetemplates.mdwn
index 94351fe5c..b220c8f6b 100644
--- a/doc/todo/let_inline_plugin_use_pagetemplates.mdwn
+++ b/doc/todo/let_inline_plugin_use_pagetemplates.mdwn
@@ -2,4 +2,4 @@ Is there any reason why the inline plugin's template parameter couldn't take any
 
 --[[madduck]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/limit_the_markup_formats_available_for_editing.mdwn b/doc/todo/limit_the_markup_formats_available_for_editing.mdwn
index 7ac4c0771..c3eb09e52 100644
--- a/doc/todo/limit_the_markup_formats_available_for_editing.mdwn
+++ b/doc/todo/limit_the_markup_formats_available_for_editing.mdwn
@@ -5,4 +5,4 @@ For `aggregate` to work, I have to have the `html` plugin enabled, and this allo
 
 --[[madduck]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/meta_rcsid.mdwn b/doc/todo/meta_rcsid.mdwn
index a09a48a64..81a2c1328 100644
--- a/doc/todo/meta_rcsid.mdwn
+++ b/doc/todo/meta_rcsid.mdwn
@@ -3,7 +3,7 @@ of CVS/SVN-style keywords (like '$Id$', etc.) from the source file in the page t
 
 > So the idea is you'd write something like:
 > 
->	\[[meta rcsid="$Id$"]]
+>	\[[!meta rcsid="$Id$"]]
 > 
 > And this would be put at the bottom of the page or somewhere like that by
 > the template?
diff --git a/doc/todo/metadata.mdwn b/doc/todo/metadata.mdwn
index bf8191330..361f00351 100644
--- a/doc/todo/metadata.mdwn
+++ b/doc/todo/metadata.mdwn
@@ -1,7 +1,7 @@
 There should be a way to add metadata to a page. Probably a plugin could do
 this, for example:
 
-	\[[meta foo="bar"]]
+	\[[!meta foo="bar"]]
 
 Uses for this include:
 
@@ -11,9 +11,9 @@ Uses for this include:
   except it doesn't have to show up in the page text.
 * Recording page licenses.
 
-[[meta link=done]]
-[[meta title="supporting metadata..."]]
-[[meta author="Joey Hess"]]
-[[meta link="foo.css" rel="stylesheet" type="text/css"]]
+[[!meta link=done]]
+[[!meta title="supporting metadata..."]]
+[[!meta author="Joey Hess"]]
+[[!meta link="foo.css" rel="stylesheet" type="text/css"]]
 
 [[todo/done]]
diff --git a/doc/todo/minor_adjustment_to_setup_documentation_for_recentchanges_feeds.mdwn b/doc/todo/minor_adjustment_to_setup_documentation_for_recentchanges_feeds.mdwn
index fe47ab52f..c2dd5fbf4 100644
--- a/doc/todo/minor_adjustment_to_setup_documentation_for_recentchanges_feeds.mdwn
+++ b/doc/todo/minor_adjustment_to_setup_documentation_for_recentchanges_feeds.mdwn
@@ -18,7 +18,7 @@ turn on feeds for recentchanges.
             # Allow generating feeds even if not generated by default?
             #allowrss => 1,
 
-[[tag patch]]
+[[!tag patch]]
 
 > Hmm, recentchanges is just a blog. Of course the word "blog" is perhaps
 > being used in too broad a sense here, since it tends to imply personal
diff --git a/doc/todo/missingparents.pm.mdwn b/doc/todo/missingparents.pm.mdwn
index a85630ea3..0cc7137ba 100644
--- a/doc/todo/missingparents.pm.mdwn
+++ b/doc/todo/missingparents.pm.mdwn
@@ -4,9 +4,9 @@ has a child). Basically, you give it a page called missingparents.mdwn,
 something like this:
 
 <pre>
-[[missingparents pages="posts/* and !posts/*/*" generate="""[[template id=year text="$page"]]"""]]
-[[missingparents pages="posts/*/* and !posts/*/*/*" generate="""[[template id=month text="$page"]]"""]]
-[[missingparents pages="posts/*/*/* and !posts/*/*/*/*" generate="""[[template id=day text="$page"]]"""]]
+[[!missingparents pages="posts/* and !posts/*/*" generate="""[[!template id=year text="$page"]]"""]]
+[[!missingparents pages="posts/*/* and !posts/*/*/*" generate="""[[!template id=month text="$page"]]"""]]
+[[!missingparents pages="posts/*/*/* and !posts/*/*/*/*" generate="""[[!template id=day text="$page"]]"""]]
 </pre>
 
 And it scans the whole wiki for pages that match the pagespecs but are missing
@@ -105,7 +105,7 @@ Index: IkiWiki/Plugin/missingparents.pm
 +	my %params=@_;
 +
 +	if (! defined $params{pages} || ! defined $params{generate}) {
-+		return "[[missingparents ".gettext("missing pages or generate parameter")."]]";
++		return "[[!missingparents ".gettext("missing pages or generate parameter")."]]";
 +	}
 +
 +	push @pagespecs, \%params;
@@ -258,4 +258,4 @@ Index: IkiWiki.pm
  	my $page=shift;
 </pre>
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/more_class__61____34____34___for_css.mdwn b/doc/todo/more_class__61____34____34___for_css.mdwn
index ea914e9ed..4712c12b3 100644
--- a/doc/todo/more_class__61____34____34___for_css.mdwn
+++ b/doc/todo/more_class__61____34____34___for_css.mdwn
@@ -36,7 +36,7 @@ added after an inlined page (namely: the post date, the tags, and the actions):
     +
     +</div>
 
-[[tag patch]]
+[[!tag patch]]
 
 > Unfortunately, the inlinepage content passes through markdown, and markdown
 > gets confused by these nested div's and puts p's around one of them, generating
@@ -53,7 +53,7 @@ added after an inlined page (namely: the post date, the tags, and the actions):
 >> alternatives is always a good thing and perhaps, the fact that pandoc can make markdown->LaTeX
 >> conversion may lead to new possibilities. --[[Roktas]]
 
->>> I confirm that this ([[debbug 405058]]) has just been fixed in markdown
+>>> I confirm that this ([[!debbug 405058]]) has just been fixed in markdown
 >>> [`1.0.2b7`](http://packages.debian.org/experimental/web/markdown) (BTW, thanks to your bug
 >>> report Joey).  FYI, I've observed some performance drop with `1.0.2b7` compared to `1.0.1`,
 >>> especially noticable with big files.  This was also confirmed by someone else, for example,
diff --git a/doc/todo/multiple_output_formats.mdwn b/doc/todo/multiple_output_formats.mdwn
index 00623be39..0538f894c 100644
--- a/doc/todo/multiple_output_formats.mdwn
+++ b/doc/todo/multiple_output_formats.mdwn
@@ -14,4 +14,4 @@ would be impractical to say the least.
 
 --[[bma]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/multiple_repository_support.mdwn b/doc/todo/multiple_repository_support.mdwn
index 33d794790..0625dba7e 100644
--- a/doc/todo/multiple_repository_support.mdwn
+++ b/doc/todo/multiple_repository_support.mdwn
@@ -12,4 +12,4 @@ manually configure it in the setup file.
 
 --[[Joey]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/nested_preprocessor_directives.mdwn b/doc/todo/nested_preprocessor_directives.mdwn
index 7e7ef3a49..b5080dc3c 100644
--- a/doc/todo/nested_preprocessor_directives.mdwn
+++ b/doc/todo/nested_preprocessor_directives.mdwn
@@ -11,8 +11,8 @@ nesting, a new syntax would be needed. Maybe something xml-like?
 >
 > For example, I *think* you can unambiguously parse the following:
 >
->     \[[if test="enabled(template) and templates/foo" then="""
->     [[template id=foo content="""Flying Purple People Eater"""]]
+>     \[[!if test="enabled(template) and templates/foo" then="""
+>     [[!template id=foo content="""Flying Purple People Eater"""]]
 >     """]]
 >
 > --[[JoshTriplett]]
diff --git a/doc/todo/pagespec_relative_to_a_target.mdwn b/doc/todo/pagespec_relative_to_a_target.mdwn
index 62bb3ea29..f7b248670 100644
--- a/doc/todo/pagespec_relative_to_a_target.mdwn
+++ b/doc/todo/pagespec_relative_to_a_target.mdwn
@@ -88,7 +88,7 @@ diff -urNX ignorepats ikiwiki/IkiWiki/Plugin/relative.pm ikidev/IkiWiki/Plugin/r
 +1
 </pre>
 
-[[tag patch]]
+[[!tag patch]]
 
 > This looks really interesting.  It reminds me of XPath and its conditionals.
 > Those might actually work well adapted to pagespecs.  For instance, to write
diff --git a/doc/todo/parse_debian_packages.mdwn b/doc/todo/parse_debian_packages.mdwn
index 266686605..2425645d9 100644
--- a/doc/todo/parse_debian_packages.mdwn
+++ b/doc/todo/parse_debian_packages.mdwn
@@ -67,4 +67,4 @@ automatically.
 >>> Sure, a plugin is just a perl library so can easily be packaged
 >>> separately.
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn
index 4bbda6565..9598af234 100644
--- a/doc/todo/passwordauth:_sendmail_interface.mdwn
+++ b/doc/todo/passwordauth:_sendmail_interface.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 For sending out password reminder emails, the [[plugins/passwordauth]] plugin currently uses
 the *[Mail::Sendmail](http://search.cpan.org/perldoc?Mail::Sendmail)* module.
@@ -24,7 +24,7 @@ in the ikiwiki source code, where emailing is done.
 
 --[[tschwinge]]
 
-> One that is in Debian is [[cpan Email::Send]], which can do SMTP and
+> One that is in Debian is [[!cpan Email::Send]], which can do SMTP and
 > sendmail and some other methods and falls back through methods until one
 > succeeds. I haven't tried to use it but it looks like a feasable
 > candidate.
@@ -34,13 +34,13 @@ in the ikiwiki source code, where emailing is done.
 
 OK, so I'll have a look at replacing all email handling with *Email::Send*.
 
-[[tag patch]]
+[[!tag patch]]
 *<http://www.thomas.schwinge.homeip.net/tmp/ikiwiki-sendmail.patch>*
 
 Remaining TODOs:
 
   * Resolve TODOs as denoted inside the patch.
-  * Is it worthwhile to use and depend on [[cpan Return::Value]]
+  * Is it worthwhile to use and depend on [[!cpan Return::Value]]
     just for this bit of functionality?
   * Debian news file.
   * ikiwiki news file.
diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index 2839659f4..1977c3d4d 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -191,4 +191,4 @@ Merged, nice work. (Overkill having a test suite. ;-) --[[Joey]]
 > (master language + translations) support. Expect news from me on
 > this front in the next weeks. --[[intrigeri]]
 
-[[tag patch done]]
+[[!tag patch done]]
diff --git a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
index e73e6c09e..c0af59eba 100644
--- a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
+++ b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
@@ -10,11 +10,11 @@ and wait for someone with the access/confidence to apply them.
 Maybe this can be enhanced with a [[ikiwiki/PreprocessorDirective]]:
 
 <pre>
-\[[suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]
+\[[!suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]
 
-\[[suggest op=move srcpage=/blog dstpage=/blog_support]]
+\[[!suggest op=move srcpage=/blog dstpage=/blog_support]]
 
-\[[suggest patch="""
+\[[!suggest patch="""
 Index: IkiWiki/CGI.pm
 ===================================================================
 --- IkiWiki/CGI.pm      (révision 4119)
diff --git a/doc/todo/provide_a_mailing_list.mdwn b/doc/todo/provide_a_mailing_list.mdwn
index f34ed77c6..6e0cd51e6 100644
--- a/doc/todo/provide_a_mailing_list.mdwn
+++ b/doc/todo/provide_a_mailing_list.mdwn
@@ -37,4 +37,4 @@ more users, the number of such requests will also increase. --[[madduck]]
 >> can use that as an alternative. I'm happy to chat about this, ping me..
 >> --[sm](http://joyful.com)
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
index 43700337d..7724576f5 100644
--- a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
+++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
@@ -1,3 +1,3 @@
 It would rock if I could view diffs from the web without going via feeds. I envision toggle-style buttons on the recentchanges page, or just links to the CGI, which then displays the diff... --[[madduck]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/quieten-bzr.mdwn b/doc/todo/quieten-bzr.mdwn
index 11ce139b4..c6d83a519 100644
--- a/doc/todo/quieten-bzr.mdwn
+++ b/doc/todo/quieten-bzr.mdwn
@@ -20,7 +20,7 @@ The fix is simply to call `bzr` with the _--quiet_ switch. Something like this a
     > 
 
 
-[[tag patch]]
+[[!tag patch]]
 
 > [[done]], although I left off the escapeHTML thing which seems to be in
 > your patch by accident.
diff --git a/doc/todo/rcs.mdwn b/doc/todo/rcs.mdwn
index 3793f7533..3cc572516 100644
--- a/doc/todo/rcs.mdwn
+++ b/doc/todo/rcs.mdwn
@@ -3,7 +3,7 @@ I have used it probably over hundred times but needs some work.
 
 <http://www.reedmedia.net/~reed/tmp-sfhkcjkfrfh/rcs.pm>
 
-[[tag patch]]
+[[!tag patch]]
 
 > Clearly needs some cleanup and perhaps some of the missing stubs
 > implemented, before it can be included into ikiwiki. 
diff --git a/doc/todo/recentchanges.mdwn b/doc/todo/recentchanges.mdwn
index 91128a860..25a8ea4db 100644
--- a/doc/todo/recentchanges.mdwn
+++ b/doc/todo/recentchanges.mdwn
@@ -92,7 +92,7 @@ your pages. --Ethan
 Here's a full design for redoing recentchanges, based on Ethan's ideas:
 
 * Add a recentchanges plugin that has a preprocessor directive:
-	\[[recentchanges num=100 pages=* template=recentchanges.tmpl]]
+	\[[!recentchanges num=100 pages=* template=recentchanges.tmpl]]
   If put on the [[recentchanges]] page, this would result in up to 100
   recentchanges/change_$id.mdwn files being created.
 * Which means the plugin has to store state and use a checkconfig hook
diff --git a/doc/todo/rel_attribute_for_links.mdwn b/doc/todo/rel_attribute_for_links.mdwn
index 331721b55..3b4cea436 100644
--- a/doc/todo/rel_attribute_for_links.mdwn
+++ b/doc/todo/rel_attribute_for_links.mdwn
@@ -16,4 +16,4 @@ This can also help for css decoraton. An example of these patches in use: http:/
 
 — NicolasLimare
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index c73b53e53..dfeacbabd 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -1,4 +1,4 @@
-[[tag wishlist]]
+[[!tag wishlist]]
 
 HTML::Template is an okay templating kit, but it lacks a lot of powerful
 features and thus makes it rather hard to give an ikiwiki site a consistent
diff --git a/doc/todo/review_mechanism.mdwn b/doc/todo/review_mechanism.mdwn
index 5e4ba212e..66ed58144 100644
--- a/doc/todo/review_mechanism.mdwn
+++ b/doc/todo/review_mechanism.mdwn
@@ -32,4 +32,4 @@ Change queues would be wiki pages as well (probably using [[inlines|plugins/inli
 >
 > -- [[JoshTriplett]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/shortcut_link_text.mdwn b/doc/todo/shortcut_link_text.mdwn
index d03d37411..765c445ab 100644
--- a/doc/todo/shortcut_link_text.mdwn
+++ b/doc/todo/shortcut_link_text.mdwn
@@ -1,19 +1,19 @@
 [[plugins/shortcut]] creates link shortcut [[ikiwiki/PreprocessorDirective]]s,
 which substitute their argument into the specified shortcut URL to generate
 the link target, and use the argument as the link text.  For example, given
-the example [[shortcuts]], `\[[wikipedia ikiwiki]]` generates a link to
+the example [[shortcuts]], `\[[!wikipedia ikiwiki]]` generates a link to
 <http://en.wikipedia.org/wiki/ikiwiki>, with the link text "ikiwiki".  This
 works well in many cases; however, for things like the `debbug` example, it
 simply uses the number as the link text, which does not always provide
 enough context to understand the link at first glance.  For example,
-`\[[debbug 397501]]` generates a link to <http://bugs.debian.org/397501>,
+`\[[!debbug 397501]]` generates a link to <http://bugs.debian.org/397501>,
 with just "397501" as the link text.  While [[plugins/template]] provides a
 general solution for arbitrary cases, it would help to have a simple option
 via the shortcut plugin to set the link text, with a `%s` substitution.
-Thus, something like `\[[shortcut name=debbug
+Thus, something like `\[[!shortcut name=debbug
 url="http://bugs.debian.org/%s" desc="bug #%s"]]` might suffice on a
 Debian-specific wiki to indicate a bug number, while a more general wiki
-might use something like `\[[shortcut name=debbug
+might use something like `\[[!shortcut name=debbug
 url="http://bugs.debian.org/%s" desc="Debian bug #%s"]]`.
 
 > [[todo/done]] --[[Joey]]
diff --git a/doc/todo/shortcut_optional_parameters.mdwn b/doc/todo/shortcut_optional_parameters.mdwn
index daec3696a..445404315 100644
--- a/doc/todo/shortcut_optional_parameters.mdwn
+++ b/doc/todo/shortcut_optional_parameters.mdwn
@@ -6,39 +6,39 @@ Consider the "All files in this package search" on
 To create a "debfiles" [[shortcut|shortcuts]] that takes a package name, you
 could just hardcode the architecture and distribution:
 
-    \[[shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=unstable&arch=i386"]]
-    \[[debfiles ikiwiki]]
+    \[[!shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=unstable&arch=i386"]]
+    \[[!debfiles ikiwiki]]
 
 But what if you could have them as optional parameters instead?  The syntax
 for the invocation should look like this:
 
-    \[[debfiles ikiwiki dist=testing]]
+    \[[!debfiles ikiwiki dist=testing]]
 
 Some possible syntax choices for the shortcut definition:
 
-    \[[shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%(dist)s&arch=%(arch)s" dist="unstable" arch="i386"]]
-    \[[shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%(dist=unstable)s&arch=%(arch=i386)s"]]
-    \[[shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%{dist=unstable}&arch=%{arch=i386}"]]
-    \[[shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=$*&searchmode=filelist&case=insensitive&version=${dist=unstable}&arch=${arch=i386}"]]
+    \[[!shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%(dist)s&arch=%(arch)s" dist="unstable" arch="i386"]]
+    \[[!shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%(dist=unstable)s&arch=%(arch=i386)s"]]
+    \[[!shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=%s&searchmode=filelist&case=insensitive&version=%{dist=unstable}&arch=%{arch=i386}"]]
+    \[[!shortcut name=debfiles url="http://packages.debian.org/cgi-bin/search_contents.pl?word=$*&searchmode=filelist&case=insensitive&version=${dist=unstable}&arch=${arch=i386}"]]
 
 --[[JoshTriplett]]
 
 Well, you can already do this kind of thing with templates. Invocation does
 look different:
 
-    \[[template id=debfiles package=ikiwiki dist=testing]]
+    \[[!template id=debfiles package=ikiwiki dist=testing]]
 
 --[[Joey]]
 
 > I think I would find templates sufficient, if:
 >
 > 1. I could use the name of the template as a preprocessor directive
->    (`\[[templatename ...]]`), rather than using the `template` directive
->    with an `id` argument (`\[[template id=templatename]]`).
+>    (`\[[!templatename ...]]`), rather than using the `template` directive
+>    with an `id` argument (`\[[!template id=templatename]]`).
 > 2. Template invocation allowed bare values in addition to `key=value`
 >    arguments, and template definition supported some means to access the
->    value.  This would allow `\[[debfiles ikiwiki]]` rather than
->    `\[[debfiles package=ikiwiki]]`.
+>    value.  This would allow `\[[!debfiles ikiwiki]]` rather than
+>    `\[[!debfiles package=ikiwiki]]`.
 > 3. I could use ikiwiki syntax in the template, not just HTML and
 >    HTML::Template.  (If I can already do that, then [[/plugins/template]]
 >    should make that more clear.)
diff --git a/doc/todo/shortcut_with_different_link_text.mdwn b/doc/todo/shortcut_with_different_link_text.mdwn
index 93f9651a4..8615b2754 100644
--- a/doc/todo/shortcut_with_different_link_text.mdwn
+++ b/doc/todo/shortcut_with_different_link_text.mdwn
@@ -11,7 +11,7 @@ Window System protocol".  --[[JoshTriplett]]
 > If I don't understand this, can you give an HTML example? --[[JeremyReed]]
 
 >> The problem is like that in [[bugs/shortcuts_don't_escape_from_Markdown]]. We would like to use 
->> the shortcuts plugin but add a descriptive text -- in this case \[[xcbgit src/xcb.xsd|XML Schema...]]
+>> the shortcuts plugin but add a descriptive text -- in this case \[[!xcbgit src/xcb.xsd|XML Schema...]]
 >> The file src/xcb.xsd could be any url, and the point of shortcuts is that you get to shorten it.
 >> --Ethan
 
@@ -22,7 +22,7 @@ Window System protocol".  --[[JoshTriplett]]
 >>> However, I want to define a [[plugins/shortcut]] to save the typing.  If I
 >>> define something like `protogit` pointing to
 >>> `http://gitweb.freedesktop.org/?p=xcb/proto.git;a=blob;hb=HEAD;f=%s`, then
->>> I can write `\[[protogit src/xcb.xsd]]`; however, I then can't change the
+>>> I can write `\[[!protogit src/xcb.xsd]]`; however, I then can't change the
 >>> link text to anything other than what the shortcut defines as the link
 >>> text. I want to write something like
 >>> `\[[XML Schema for the X Window System Protocol|protogit src/xcb.xsd]]`,
@@ -44,22 +44,22 @@ Window System protocol".  --[[JoshTriplett]]
 
 ---
 
-One possible alternative, would be a general `\[[url ]]` scheme for all kinds of links. As mentioned in [[Short_wikilinks]], I have wanted a way to enter links to the wiki with markdown-style references,
+One possible alternative, would be a general `\[[!url ]]` scheme for all kinds of links. As mentioned in [[Short_wikilinks]], I have wanted a way to enter links to the wiki with markdown-style references,
 specifying the actual target elsewhere from the text, with just a short reference in the text. To facilitate automatic conversion from earlier (already markdownised) "blog", I finally ended up writing a custom plugin that simply gets the location of wikipage, and use markdown mechanisms:
 
     Here [is][1] a link.
 
-      [1]: [[l a_page_in_the_wiki]]
+      [1]: [[!l a_page_in_the_wiki]]
 
-    Obviously [this]([[l another_page]]) also works, although the syntax is quite cumbersome.
+    Obviously [this]([[!l another_page]]) also works, although the syntax is quite cumbersome.
 
 So that the 'l' plugin inserts the location the page there, and markdown does the rest. My plugin currently fails if it can't find the page, as that is sufficient for my needs. Differing colouring for non-existing pages is not doable in a straightforward manner with this approach.
 
-For external links, that is no concern, however. So you could define for each shortcut an alternative directive, that inserts the URL. Perhaps `\[[url shortcutname params]]` or `\[[@shortcutname params]]` (if the preprocessor supported the @), and this could be extended to local links in an obvious manner: `\[[url page]]` or `\[[@page]]`. Now, if you could just get rid off the parantheses for markdown, for the short inline links --[[tuomov]] (who'd really rather not have two separate linking mechanisms: ikiwiki's heavy syntax and markdown's lighter one).
+For external links, that is no concern, however. So you could define for each shortcut an alternative directive, that inserts the URL. Perhaps `\[[!url shortcutname params]]` or `\[[@shortcutname params]]` (if the preprocessor supported the @), and this could be extended to local links in an obvious manner: `\[[!url page]]` or `\[[@page]]`. Now, if you could just get rid off the parantheses for markdown, for the short inline links --[[tuomov]] (who'd really rather not have two separate linking mechanisms: ikiwiki's heavy syntax and markdown's lighter one).
 
 ---
 
-I've added code to make the \[[foo 123]] syntax accept a _desc_
+I've added code to make the \[[!foo 123]] syntax accept a _desc_
 parameter. I've named it like this to signal that it overrides the
 _desc_ provided at description time. `%s` is expanded here as well.
 
diff --git a/doc/todo/shortcut_with_no_url_parameter__44___only_desc.mdwn b/doc/todo/shortcut_with_no_url_parameter__44___only_desc.mdwn
index c8e138820..56a74029e 100644
--- a/doc/todo/shortcut_with_no_url_parameter__44___only_desc.mdwn
+++ b/doc/todo/shortcut_with_no_url_parameter__44___only_desc.mdwn
@@ -16,8 +16,8 @@ It sounds like you're looking for templates, not shortcuts. --[[Joey]]
 > `url` still seems reasonable, and simple.  You could also use such shortcuts
 > without markup at all, as an abbreviation mechanism:
 > 
->     \[[shortcut name=spi desc="Software in the Public Interest, Inc."]]].
->     \[[shortcut name=sosp desc="Symposium on Operating System Principles"]]].
->     \[[shortcut name=cacm desc="Communications of the ACM"]]].
+>     \[[!shortcut name=spi desc="Software in the Public Interest, Inc."]]].
+>     \[[!shortcut name=sosp desc="Symposium on Operating System Principles"]]].
+>     \[[!shortcut name=cacm desc="Communications of the ACM"]]].
 >
 > --[[JoshTriplett]]
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 980435111..0ef8a7847 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -18,8 +18,8 @@ Couldn't isolate the cause, but some sources for this problem may be:
 
 Other special things in my templates and site:
 
-* a sidebar with \[[include pages="notes/\*" template=foo]] while notes.mdwn has 
-  a \[[include pages="notes/*"]] and uses the sidebar; removed it, doesn't change
+* a sidebar with \[[!include pages="notes/\*" template=foo]] while notes.mdwn has 
+  a \[[!include pages="notes/*"]] and uses the sidebar; removed it, doesn't change
 * a template (biblio.tmpl) calling the "img" plugin with a template parameter as the
   image filename; removed it, doesn't change
 * some strange games with tags whose page calls a "map" directive to show other tags
@@ -79,4 +79,4 @@ I can think about reducung the size of my wiki source and making it available on
 > 
 > --[[Joey]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn b/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn
index 7b3dbbd55..3ff8b9ef6 100644
--- a/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn
+++ b/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn
@@ -2,8 +2,8 @@ Either [[plugins/template]] or [[plugins/shortcut]] should support some form
 of very simple text parsing or regex application, to make it possible to write
 shortcuts like these:
 
-    [[mmlist listname@lists.example.org]] -> <listname@example.org> ([mailman page] (http://lists.example.org/mailman/listinfo/listname)
-    [[debcl packagename]] -> [packagename changelog](http://packages.debian.org/changelogs/pool/main/p/packagename/current/changelog)
+    [[!mmlist listname@lists.example.org]] -> <listname@example.org> ([mailman page] (http://lists.example.org/mailman/listinfo/listname)
+    [[!debcl packagename]] -> [packagename changelog](http://packages.debian.org/changelogs/pool/main/p/packagename/current/changelog)
 
 For shortcut definitions, a `match` parameter could supply a regex, and then the `url` and `desc` parameters could make use of the named or numbered groups from the match.
 
diff --git a/doc/todo/skip_option_for_inline_plugin.mdwn b/doc/todo/skip_option_for_inline_plugin.mdwn
index 06f1a8358..f37d75ccb 100644
--- a/doc/todo/skip_option_for_inline_plugin.mdwn
+++ b/doc/todo/skip_option_for_inline_plugin.mdwn
@@ -1,7 +1,7 @@
 How about a skip option for [[plugins/inline]]?  This would allow things like the following:
 
-    \[[inline pages="news/*" show="5"]]
-    \[[inline pages="news/*" skip="5" show="5" archive="yes"]]
+    \[[!inline pages="news/*" show="5"]]
+    \[[!inline pages="news/*" skip="5" show="5" archive="yes"]]
 
 > I just wrote a patch. --Ethan
 
diff --git a/doc/todo/stylesheet_suggestion_for_verbatim_content.mdwn b/doc/todo/stylesheet_suggestion_for_verbatim_content.mdwn
index 51a409963..b73155c98 100644
--- a/doc/todo/stylesheet_suggestion_for_verbatim_content.mdwn
+++ b/doc/todo/stylesheet_suggestion_for_verbatim_content.mdwn
@@ -7,7 +7,7 @@ AFAICS, my web browser already has a built-in monospace font, which I can
 see in action in the preformatted patch below. So I don't see why the
 default style sheet should do this. --[[Joey]]
 
-[[tag patch]]
+[[!tag patch]]
 
 <pre>
 diff --git a/basewiki/style.css b/basewiki/style.css
diff --git a/doc/todo/support_for_SDF_documents.mdwn b/doc/todo/support_for_SDF_documents.mdwn
index a59f9ad5a..18ce4e106 100644
--- a/doc/todo/support_for_SDF_documents.mdwn
+++ b/doc/todo/support_for_SDF_documents.mdwn
@@ -1,8 +1,8 @@
-I think it would be useful for ikiwiki to support [[debpkg sdf]] input,
+I think it would be useful for ikiwiki to support [[!debpkg sdf]] input,
 which can be converted and rendered to many formats.
 I should add, however, that SDF allows executing arbitrary perl code
 from its documents; which means some sanitization would need to occur
 before the document is fed to sdf.
 --[[JeremieKoenig]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/supporting_comments_via_disussion_pages.mdwn b/doc/todo/supporting_comments_via_disussion_pages.mdwn
index 50bc17ba3..14a8b3f71 100644
--- a/doc/todo/supporting_comments_via_disussion_pages.mdwn
+++ b/doc/todo/supporting_comments_via_disussion_pages.mdwn
@@ -62,7 +62,7 @@ So, I have some code, included below.  For some reason that I don't quite get it
 
 What I ended up doing is write something like this to the page:
 
-    [[blogcomment from="""Username""" timestamp="""12345""" subject="""Some text""" text="""the text of the comment"""]]
+    [[!blogcomment from="""Username""" timestamp="""12345""" subject="""Some text""" text="""the text of the comment"""]]
 
 Each comment is processed to something like this:
 
@@ -133,7 +133,7 @@ Each comment is processed to something like this:
             $cgi->param('comments') : '';
         my $comment=$cgi->param('blogcomment');
 
-        $content.=qq{[[blogcomment from="""$name""" timestamp="""$timestamp""" subject="""$subject""" text="""$comment"""]]\n\n};
+        $content.=qq{[[!blogcomment from="""$name""" timestamp="""$timestamp""" subject="""$subject""" text="""$comment"""]]\n\n};
         $content=~s/\n/\r\n/g;
         $form->field(name => "editcontent", value => $content, force => 1);
     } # }}}
diff --git a/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn b/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
index 6820be5cc..aaa040ec7 100644
--- a/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
+++ b/doc/todo/tidy_git__39__s_ctime_debug_output.mdwn
@@ -12,4 +12,4 @@
  	 	return $ctime;
  	 } #}}}
 
-[[tag patch done]]
+[[!tag patch done]]
diff --git a/doc/todo/tla.mdwn b/doc/todo/tla.mdwn
index f78d08b44..6ef8453f1 100644
--- a/doc/todo/tla.mdwn
+++ b/doc/todo/tla.mdwn
@@ -1,4 +1,4 @@
 * Need to get post commit hook code working.
 * Need some example urls for web based diffs.
 
-[[tag rcs/tla]]
+[[!tag rcs/tla]]
diff --git a/doc/todo/tmplvars_plugin.mdwn b/doc/todo/tmplvars_plugin.mdwn
index 33d161ee1..fe163fb5f 100644
--- a/doc/todo/tmplvars_plugin.mdwn
+++ b/doc/todo/tmplvars_plugin.mdwn
@@ -1,6 +1,6 @@
 A simple plugin to allow per-page customization of a template by passing paramaters to HTML::Template. For those times when a whole pagetemplate is too much work. --Ethan
 
-[[tags patch]]
+[[!tags patch]]
 
     #!/usr/bin/perl
     package IkiWiki::Plugin::tmplvars;
diff --git a/doc/todo/toc_plugin_to_skip_one_level.mdwn b/doc/todo/toc_plugin_to_skip_one_level.mdwn
index 35290fc38..4891a1197 100644
--- a/doc/todo/toc_plugin_to_skip_one_level.mdwn
+++ b/doc/todo/toc_plugin_to_skip_one_level.mdwn
@@ -1,6 +1,6 @@
 It would be great if I could to this:
 
-     \[[toc levels=3 skip=1]]
+     \[[!toc levels=3 skip=1]]
 
 I use h1 for big title on each page, and don't want it in my toc on that page.
 
@@ -10,7 +10,7 @@ That way I could have toc for h2 and h3 and h1 is skipped bacause it is big titl
 > another option is added, I wonder why you're using a h1 for a title on
 > each page when the page name already appears at the top of each page. And
 > if the page name isn't right for the title, you can use 
-> \[[meta title="foo"]] to override it. And this purposefully doesn't show
+> \[[!meta title="foo"]] to override it. And this purposefully doesn't show
 > up in the toc. --[[Joey]]
 
 >> aaaahhh, I made a mistake. U used some other page.tmpl and title was hidden,
diff --git a/doc/todo/toggle_initial_state.mdwn b/doc/todo/toggle_initial_state.mdwn
index cbbf7e6fd..f7b684b51 100644
--- a/doc/todo/toggle_initial_state.mdwn
+++ b/doc/todo/toggle_initial_state.mdwn
@@ -1,6 +1,6 @@
 It would be nice if one could set the initial state of the toggleable area.
 --[[[rdennis]]
 
-[[tag plugins/toggle]]
+[[!tag plugins/toggle]]
 
 [[done]]
diff --git a/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn b/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
index 8b6941310..4c703b940 100644
--- a/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
+++ b/doc/todo/turn_edittemplate_verbosity_off_by_default.mdwn
@@ -27,4 +27,4 @@ I think this (untested) patch might just do the trick:
 
 --[[madduck]]
 
-[[tags wishlist patch]]
+[[!tags wishlist patch]]
diff --git a/doc/todo/typography_plugin_configuration.mdwn b/doc/todo/typography_plugin_configuration.mdwn
index 91ac4ba85..dd162a084 100644
--- a/doc/todo/typography_plugin_configuration.mdwn
+++ b/doc/todo/typography_plugin_configuration.mdwn
@@ -1,5 +1,5 @@
 The [[typography_plugin|plugins/typography]] could support configuration of
-which translations to make.  [[cpan Text::Typography]] supports fine-grained
+which translations to make.  [[!cpan Text::Typography]] supports fine-grained
 control of which translations to make, so [[plugins/typography]] just needs to
 expose this somehow. --[[JoshTriplett]]
 
diff --git a/doc/todo/unaccent_url_instead_of_encoding.mdwn b/doc/todo/unaccent_url_instead_of_encoding.mdwn
index fbba893c5..1be150a82 100644
--- a/doc/todo/unaccent_url_instead_of_encoding.mdwn
+++ b/doc/todo/unaccent_url_instead_of_encoding.mdwn
@@ -6,4 +6,4 @@ This is a one liner change, but requires a bit of reordering in the code.
 
 [[cstamas]]
 
-[[tag wishlist patch]]
+[[!tag wishlist patch]]
diff --git a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
index c5fe28f4b..492a32b36 100644
--- a/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
+++ b/doc/todo/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
@@ -15,7 +15,7 @@ ManojSrivastava
 
 > I think you could now implement "toplvl" using [[conditionals|/plugins/conditional]]:
 >
->     \[[if test="destpage(/index)" then="""...""" else="""..."""]]
+>     \[[!if test="destpage(/index)" then="""...""" else="""..."""]]
 >
 > --[[JoshTriplett]]
 
@@ -263,4 +263,4 @@ ManojSrivastava
 +
 </pre>
 
-[[tag patch]]
+[[!tag patch]]
diff --git a/doc/todo/web_gui_for_managing_tags.mdwn b/doc/todo/web_gui_for_managing_tags.mdwn
index 3dd59f162..c865bf738 100644
--- a/doc/todo/web_gui_for_managing_tags.mdwn
+++ b/doc/todo/web_gui_for_managing_tags.mdwn
@@ -9,4 +9,4 @@ MoinMoin has a simple implementation of this, [click here to see an example](htt
 
 --[[AdamShand]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
diff --git a/doc/todo/wikiwyg.mdwn b/doc/todo/wikiwyg.mdwn
index f2af47e27..e3d1b3927 100644
--- a/doc/todo/wikiwyg.mdwn
+++ b/doc/todo/wikiwyg.mdwn
@@ -22,11 +22,11 @@ other way to feed it the actual source for a page, this seems like a
 problem. According to the developers, it is possible to do that, and start
 off in WikiText mode.
 
-[[tag soc]]
+[[!tag soc]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
 
-[[tag patch]]
+[[!tag patch]]
 
 Project IkiWiki::WIKIWYG v1.6 - <http://ikiwiki.xbaud.com/>
 ===========================================================
diff --git a/doc/users.mdwn b/doc/users.mdwn
index 5121dd90c..cc3cf5268 100644
--- a/doc/users.mdwn
+++ b/doc/users.mdwn
@@ -6,6 +6,6 @@ comments.
 
 List of users
 =============
-[[inline pages="users/* and !users/*/* and !*/Discussion" 
+[[!inline pages="users/* and !users/*/* and !*/Discussion" 
 feeds=no archive=yes sort=title template=titlepage
 rootpage="users" postformtext="Add yourself as an ikiwiki user:"]]
diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 9b5435628..69ca043c2 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,4 @@
 My watchlist:
 
-[[inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]]
+[[!inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]]
 
diff --git a/doc/users/KarlMW.mdwn b/doc/users/KarlMW.mdwn
index 3b741d526..c058b13b0 100644
--- a/doc/users/KarlMW.mdwn
+++ b/doc/users/KarlMW.mdwn
@@ -1,3 +1,3 @@
-[[meta title="Karl Mowatt-Wilson"]]
+[[!meta title="Karl Mowatt-Wilson"]]
 
 Working on an [asciidoc](http://www.methods.co.nz/asciidoc/) plugin for ikiwiki so I can use it for my [website](http://mowson.org/karl), where I'm documenting how to run linux on the HP/Compaq Evo T20 'thin client'.
 \ No newline at end of file
diff --git a/doc/users/TaylorKillian.mdwn b/doc/users/TaylorKillian.mdwn
index a01bcba99..71e257db4 100644
--- a/doc/users/TaylorKillian.mdwn
+++ b/doc/users/TaylorKillian.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Taylor Killian"]]
+[[!meta title="Taylor Killian"]]
 
 Hi,
 
diff --git a/doc/users/adamshand.mdwn b/doc/users/adamshand.mdwn
index 267edbdde..6127a8d70 100644
--- a/doc/users/adamshand.mdwn
+++ b/doc/users/adamshand.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Adam Shand"]]
+[[!meta title="Adam Shand"]]
 
 New IkiWiki user, long time wiki user. :-)
 
diff --git a/doc/users/arpitjain.mdwn b/doc/users/arpitjain.mdwn
index 0c49df4b6..5632806b4 100644
--- a/doc/users/arpitjain.mdwn
+++ b/doc/users/arpitjain.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Arpit Jain"]]
+[[!meta title="Arpit Jain"]]
 Hi, 
 
 I am Arpit Jain. I am final year B.Tech/M.Tech(Dual Degree) student at Department of Computer Science and Engineering, Indian Institute of Technology, Kharagpur. 
diff --git a/doc/users/bbb.mdwn b/doc/users/bbb.mdwn
index 4bda44b58..933ba78e1 100644
--- a/doc/users/bbb.mdwn
+++ b/doc/users/bbb.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Bruno Beaufils"]]
+[[!meta title="Bruno Beaufils"]]
 
 Bruno Beaufils is **<bruno@boulgour.com>**.
 
diff --git a/doc/users/chris.mdwn b/doc/users/chris.mdwn
index 37e97314b..ec0e1451e 100644
--- a/doc/users/chris.mdwn
+++ b/doc/users/chris.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Chris Green"]]
+[[!meta title="Chris Green"]]
 
 Chris is Chris Green, an ancient C/C++/Java programmer, I started around 1982 or 1983.
 
diff --git a/doc/users/dato.mdwn b/doc/users/dato.mdwn
index 935a529cf..87b49ebf9 100644
--- a/doc/users/dato.mdwn
+++ b/doc/users/dato.mdwn
@@ -1,3 +1,3 @@
-[[meta title="Adeodato Simó"]]
+[[!meta title="Adeodato Simó"]]
 
 <http://chistera.yi.org/~adeodato>
diff --git a/doc/users/harningt.mdwn b/doc/users/harningt.mdwn
index cbb588cd8..d4ef07658 100644
--- a/doc/users/harningt.mdwn
+++ b/doc/users/harningt.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Thomas Harning Jr"]]
+[[!meta title="Thomas Harning Jr"]]
 
 I began using ikiwiki since it ties into git... and so far it's working great!
 
diff --git a/doc/users/hb.mdwn b/doc/users/hb.mdwn
index 7811ab7d8..c3e52da6d 100644
--- a/doc/users/hb.mdwn
+++ b/doc/users/hb.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Hugues Bernard"]]
+[[!meta title="Hugues Bernard"]]
 
 For now I'm using ikiwiki just for my personal needs :
 
diff --git a/doc/users/jeremyreed.mdwn b/doc/users/jeremyreed.mdwn
index b3871a5ce..8cfa5fc59 100644
--- a/doc/users/jeremyreed.mdwn
+++ b/doc/users/jeremyreed.mdwn
@@ -1,3 +1,3 @@
-[[meta title="Jeremy Reed"]]
+[[!meta title="Jeremy Reed"]]
 
 I am testing ikiwiki. I made a RCS plugin.
 \ No newline at end of file
diff --git a/doc/users/joey.mdwn b/doc/users/joey.mdwn
index 48227551a..134aa21d1 100644
--- a/doc/users/joey.mdwn
+++ b/doc/users/joey.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Joey Hess"]]
+[[!meta title="Joey Hess"]]
 
 Joey Hess is <a href="mailto:joey@kitenet.net">joey@kitenet.net</a>. 
 His web page is [here](http://kitenet.net/~joey/).
diff --git a/doc/users/jonassmedegaard.mdwn b/doc/users/jonassmedegaard.mdwn
index e23804027..6119e7d49 100644
--- a/doc/users/jonassmedegaard.mdwn
+++ b/doc/users/jonassmedegaard.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Jonas Smedegaard"]]
+[[!meta title="Jonas Smedegaard"]]
 
 Jonas Smedegaard is a Debian developer, like joey. A big fan of this novel approach to wiki: serving as pages static!
 
diff --git a/doc/users/joshtriplett.mdwn b/doc/users/joshtriplett.mdwn
index 9afadc588..f32d23bb7 100644
--- a/doc/users/joshtriplett.mdwn
+++ b/doc/users/joshtriplett.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Josh Triplett"]]
+[[!meta title="Josh Triplett"]]
 
 Josh Triplett; `josh@{freedesktop.org,kernel.org,psas.pdx.edu}`.
 
diff --git a/doc/users/kyle.mdwn b/doc/users/kyle.mdwn
index d818d8b9c..7960b3b21 100644
--- a/doc/users/kyle.mdwn
+++ b/doc/users/kyle.mdwn
@@ -1,2 +1,2 @@
-[[meta title="Kyle MacLea"]]
+[[!meta title="Kyle MacLea"]]
 [Kyle MacLea](http://kitenet.net/~kyle) was an early adopter of **ikiwiki**.  He really likes it, especially for his [FamilyWiki](http://kitenet.net/~kyle/family/wiki) and [Emigration Registry](http://kitenet.net/~kyle/family/registry).
 \ No newline at end of file
diff --git a/doc/users/madduck.mdwn b/doc/users/madduck.mdwn
index 22e6b8b3e..c423703af 100644
--- a/doc/users/madduck.mdwn
+++ b/doc/users/madduck.mdwn
@@ -5,5 +5,5 @@ My sites:
 
 I track this site with the following feed:
 
-[[inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
+[[!inline pages="internal(recentchanges/change_*) and !author(http://madduck.net/)" 
 feedonly=yes atom=no]]
diff --git a/doc/users/marcelomagallon.mdwn b/doc/users/marcelomagallon.mdwn
index 3cc75b9ee..f59e9a1ae 100644
--- a/doc/users/marcelomagallon.mdwn
+++ b/doc/users/marcelomagallon.mdwn
@@ -1,3 +1,3 @@
-[[meta title="Marcelo E. Magallon"]]
+[[!meta title="Marcelo E. Magallon"]]
 
 Marcelo E. Magallon &lt;marcelo dot magallon in Google Mail&gt;
 \ No newline at end of file
diff --git a/doc/users/perolofsson.mdwn b/doc/users/perolofsson.mdwn
index e03cadbb5..627a9fdc3 100644
--- a/doc/users/perolofsson.mdwn
+++ b/doc/users/perolofsson.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Per Olofsson"]]
+[[!meta title="Per Olofsson"]]
 
 Per Olofsson
 
diff --git a/doc/users/ptecza.mdwn b/doc/users/ptecza.mdwn
index bbb2bf1ec..97d63ab94 100644
--- a/doc/users/ptecza.mdwn
+++ b/doc/users/ptecza.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Paweł Tęcza"]]
+[[!meta title="Paweł Tęcza"]]
 
 My name is Paweł Tęcza. Currently I work as mail system administrator,
 C/Perl programmer and computer projects designer at Warsaw University, Poland.
diff --git a/doc/users/sabr.mdwn b/doc/users/sabr.mdwn
index 8741c6f36..c5a1a2066 100644
--- a/doc/users/sabr.mdwn
+++ b/doc/users/sabr.mdwn
@@ -1,4 +1,4 @@
-[[toc ]]
+[[!toc ]]
 
 ### My name
 
@@ -16,7 +16,7 @@ a wiki that doesn't suck.
 
 Thanks to [[madduck]], I track this site with the following feed:
 
-[[inline pages="internal(recentchanges/change_*) and !author(http://sabr.myopenid.com/)" 
+[[!inline pages="internal(recentchanges/change_*) and !author(http://sabr.myopenid.com/)" 
 feedonly=yes rss=no atom=yes]]
 
 ### Tests
diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index e9478ade2..4d2204f8a 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Thomas Schwinge"]]
+[[!meta title="Thomas Schwinge"]]
 # Thomas Schwinge
 
 <tschwinge@gnu.org>  
diff --git a/doc/users/victormoral.mdwn b/doc/users/victormoral.mdwn
index 43404bf40..fe5d860b1 100644
--- a/doc/users/victormoral.mdwn
+++ b/doc/users/victormoral.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Victor Moral"]]
+[[!meta title="Victor Moral"]]
 
 I'm a spanish perl programmer and linux system administrator. 
 
diff --git a/doc/wishlist.mdwn b/doc/wishlist.mdwn
index fb25acb0b..627503760 100644
--- a/doc/wishlist.mdwn
+++ b/doc/wishlist.mdwn
@@ -2,5 +2,5 @@ These [[todo]] tagged 'wishlist' encompass all kinds of features and
 improvements people would like to see in ikiwiki. Good patches for any of
 these will likely be accepted.
 
-[[inline pages="todo/* and !todo/done and !link(todo/done) and
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
 link(wishlist) and !link(patch) and !todo/*/*" archive=yes show=0]]
author	Joey Hess <joey@kodama.kitenet.net>	2008-07-21 11:33:43 -0400
committer	Joey Hess <joey@kodama.kitenet.net>	2008-07-21 11:34:49 -0400
commit	d5e65e582a34ae2494fee493ddcb2b959e4a4bce (patch)
tree	14bf1f7a604406ecb98523eda42c2e864321e1d0
parent	d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff)
parent	e3a84952715cdd625258e1695cb74898006c31f3 (diff)
download	ikiwiki-d5e65e582a34ae2494fee493ddcb2b959e4a4bce.tar ikiwiki-d5e65e582a34ae2494fee493ddcb2b959e4a4bce.tar.gz