Merge remote-tracking branch 'spalax/calendar-autocreate'

[git.ikiwiki.info.git] / doc / ikiwiki / directive / if.mdwn

diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
index d6419b18b638a8bc5f15c0e87e845e32b310bba2..492adf4993239ea775ba2756eaa0a08c3a8fe12a 100644 (file)
--- a/doc/ikiwiki/directive/if.mdwn
+++ b/doc/ikiwiki/directive/if.mdwn
@@ -1,4 +1,4 @@
-The `if` directive is supplied by the [[!iki plugins/conditional]] plugin.
+The `if` directive is supplied by the [[!iki plugins/conditional desc=conditional]] plugin.

 
 With this directive, you can make text be conditionally displayed on a page.
 For example:
 
 With this directive, you can make text be conditionally displayed on a page.
 For example:


@@ -23,8 +23,8 @@ 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".
 
 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:
+In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded
+with the following additional tests:

 
 * enabled(plugin)
 
 
 * enabled(plugin)
 


@@ -43,6 +43,8 @@ additional tests:
 
 * included()
 
 
 * included()
 

-  Tests whether the page is being included onto another page.
+  Tests whether the page is being included onto another page, for example
+  via [[inline]] or [[map]].  Note that pages inserted into other pages
+  via [[template]] are not matched here.

 
 [[!meta robots="noindex, follow"]]
 
 [[!meta robots="noindex, follow"]]