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 79b8390fa4d7a671865b1b71759e8233237f5369..629d05940e438c1d4ced78fc3b6cc39d7a35caa2 100644 (file)
--- 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:
 > 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
 >> 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
 >> 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:
 >>>> 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
 >>>> 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
 >>>> 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
 
 <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
   &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 
 </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