Merge commit 'smcv/prefix'

Conflicts:

	doc/news/version_2.49.mdwn

Also fixed the newest news file (and my wikiannounce script).

13 files changed, 16 insertions, 16 deletions

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>"""]]