cherry-pick uri security fix

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

diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn
index f3398af573d58d27d79f8fbc38e8bc636aabd2b1..7a230fbae3e7a0aa187977814567a027cfc2260c 100644 (file)
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=conditional core=1 included=1 author="[[Joey]]"]]
+[[template id=plugin name=conditional core=1 author="[[Joey]]"]]

 [[tag type/format]]
 
 With this plugin, you can make text be conditionally displayed on a page.
 For example:
 
        \[[if test="enabled(smiley)"
 [[tag type/format]]
 
 With this plugin, you can make text be conditionally displayed on a page.
 For example:
 
        \[[if test="enabled(smiley)"

-       then="The smiley plugin is enabled :-)"
-       else="No smiley plugin here.."]]
+             then="The smiley plugin is enabled :-)"
+             else="No smiley plugin here.."]]

 
 If the specified `test` succeeds, the `then` text will be displayed,
 otherwise the `else` text will be displayed. The `else` part is optional.
 
 If the specified `test` succeeds, the `then` text will be displayed,
 otherwise the `else` text will be displayed. The `else` part is optional.


@@ -15,10 +15,16 @@ The `then` and `else` values can include any markup that would be allowed
 in the wiki page outside the template. Triple-quoting the values even allows
 quotes to be included.
 
 in the wiki page outside the template. Triple-quoting the values even allows
 quotes to be included.
 

-The `test` is a [[PageSpec]]; if it matches any page in the wiki then it
-succeeds. So you can do things like testing for the existence of a page or
-pages, testing to see if any pages were created in a given month, and so
-on. The regular [[PageSpec]] syntax is expanded with the following
+The `test` is a [[ikiwiki/PageSpec]]; if it matches any page in the wiki
+then it succeeds. So you can do things like testing for the existence of a
+page or pages, testing to see if any pages were created in a given month,
+and so on.
+
+If you want the [[ikiwiki/PageSpec]] to only match against the page that
+contains the conditional, rather than matching against all pages in the
+wiki, set the "all" parameter to "no".
+
+The regular [[ikiwiki/PageSpec]] syntax is expanded with the following

 additional tests:
 
 * enabled(plugin)
 additional tests:
 
 * enabled(plugin)