Merge branch 'master' into cvs

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

diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
index 2338956d2eb24efe98e64a3d5bce75e77e0fee2c..492adf4993239ea775ba2756eaa0a08c3a8fe12a 100644 (file)
--- a/doc/ikiwiki/directive/if.mdwn
+++ b/doc/ikiwiki/directive/if.mdwn
@@ -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"]]