Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/ikiwiki/directive.mdwn b/doc/ikiwiki/directive.mdwn
index 9a01aaa825e22e3f41177b36adf75ae3b7be92ee..c4342dee8a644ff1778672a3b1ff89ca1d4c2668 100644 (file)
--- a/doc/ikiwiki/directive.mdwn
+++ b/doc/ikiwiki/directive.mdwn
@@ -1,5 +1,5 @@
 [[!meta robots="noindex, follow"]]
 [[!meta robots="noindex, follow"]]

-Directives are similar to a [[WikiLink]] in form, except they
+Directives are similar to a [[ikiwiki/WikiLink]] in form, except they

 begin with `!` and may contain parameters. The general form is:
 
        \[[!directive param="value" param="value"]]
 begin with `!` and may contain parameters. The general form is:
 
        \[[!directive param="value" param="value"]]


@@ -16,7 +16,7 @@ A directive does not need to all be on one line, it can be
 wrapped to multiple lines if you like:
        
        \[[!directive foo="baldersnatch"
 wrapped to multiple lines if you like:
        
        \[[!directive foo="baldersnatch"

-       bar="supercalifragalisticexpealadocious" baz=11]]
+       bar="supercalifragilisticexpialidocious" baz=11]]

 
 Also, multiple lines of *quoted* text can be used for a value.
 To allow quote marks inside the quoted text, delimit the block
 
 Also, multiple lines of *quoted* text can be used for a value.
 To allow quote marks inside the quoted text, delimit the block


@@ -29,11 +29,17 @@ of text with triple-quotes:
        """]]
 
 ikiwiki also has an older syntax for directives, which requires a
        """]]
 
 ikiwiki also has an older syntax for directives, which requires a

-space in directives to distinguish them from [[wikilinks|wikilink]].  This
-syntax has several disadvantages: it requires a space after directives with no
-parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
-[[wikilinks|wikilink]].  ikiwiki now provides the `!`-prefixed syntax shown
-above as the preferred alternative.  However, ikiwiki still supports wikis
-using the older syntax, if the `prefix_directives` option is not enabled.
+space in directives to distinguish them from [[wikilinks|ikiwiki/wikilink]].
+This syntax has several disadvantages: it requires a space after directives
+with no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
+[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed syntax
+shown above as the preferred alternative.  However, ikiwiki still supports
+wikis using the older syntax, if the `prefix_directives` option is not enabled.

 For backward compatibility with existing wikis, this option currently
 defaults to off, so ikiwiki supports the old syntax.
 For backward compatibility with existing wikis, this option currently
 defaults to off, so ikiwiki supports the old syntax.

+
+[[!if test="enabled(listdirectives)" then="""
+Here is a list of currently available directives in this wiki:
+
+[[!listdirectives ]]
+"""]]