Merge commit 'smcv/prefix'

[ikiwiki.git] / doc / ikiwiki / preprocessordirective.mdwn

diff --git a/doc/ikiwiki/preprocessordirective.mdwn b/doc/ikiwiki/preprocessordirective.mdwn
index e8bf783a9cba1e179fd922e80eb0d85b064cdb69..743c0d9f5e73050d3b52a6fdb72ca6b188ea5b6c 100644 (file)
--- a/doc/ikiwiki/preprocessordirective.mdwn
+++ b/doc/ikiwiki/preprocessordirective.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 Preprocessor directives are similar to a [[WikiLink]] in form, except they
 begin with `!` and may contain parameters. The general form is:
 
@@ -30,10 +31,9 @@ of text with triple-quotes:
 ikiwiki also has an older syntax for preprocessor 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
+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 their setup files disable the `prefix_directives`
-option.  For backward compatibility with existing wikis, this option currently
-defaults to off, so ikiwiki uses the old directive syntax; however, future
-versions of ikiwiki will turn this on by default.
+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.