X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fikiwiki%2Fdirective.mdwn;h=fb88aa72d494df0408baa77051abf729d7b83b12;hb=937b24e0cf98d75dd353d80267efddcecab9e908;hp=8789849ad693f6604cf33898d0fac05b8f8bb92e;hpb=b4216c5a09e54fc827774b8451d7647bb4901de6;p=ikiwiki.git

diff --git a/doc/ikiwiki/directive.mdwn b/doc/ikiwiki/directive.mdwn
index 8789849ad..fb88aa72d 100644
--- a/doc/ikiwiki/directive.mdwn
+++ b/doc/ikiwiki/directive.mdwn
@@ -28,25 +28,16 @@ of text with triple-quotes:
 	3. "baz"
 	"""]]
 
-ikiwiki also has an older syntax for directives, which requires a
-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.
+ikiwiki also has an older syntax for directives, which requires a 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 default.  However, ikiwiki still supports wikis using
+the older syntax, if the `prefix_directives` option is disabled.
 
 [[!if test="enabled(listdirectives)" then="""
 Here is a list of currently available directives in this wiki:
 
 [[!listdirectives ]]
 """]]
-
-[[!if test="!enabled(listdirectives)" then="""
-Here is a list of all directives documented in this wiki.  Not all of them may be enabled:
-
-[[!inline pages="ikiwiki/directive/* and !*/Discussion" archive="yes" sort=title
-rootpage="ikiwiki/directive/contrib" postformtext="Add a new directive named:" show=0]]
-"""]]