Merge commit 'smcv/prefix'

Conflicts:

	doc/news/version_2.49.mdwn

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

1 files changed, 4 insertions, 4 deletions

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