diff options
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 /doc/sandbox.mdwn | |
parent | d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff) | |
parent | e3a84952715cdd625258e1695cb74898006c31f3 (diff) |
Merge commit 'smcv/prefix'
Conflicts:
doc/news/version_2.49.mdwn
Also fixed the newest news file (and my wikiannounce script).
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r-- | doc/sandbox.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
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"]] |