Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / conditional / discussion.mdwn

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index ff37623c3e7970150a464bc08215899050ea5b4c..629d05940e438c1d4ced78fc3b6cc39d7a35caa2 100644 (file)
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -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