diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:21:24 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:21:24 +0200 |
commit | 8a6868efccbba0c8f6fbb35e2f19c79d794221e5 (patch) | |
tree | be35890e81c2ab9a5f333607f957204099d10fbf /ikiwiki/directive.mdwn | |
parent | 262712e706420c9f421c7a4fc7a33ebe9bf1b1bf (diff) | |
parent | 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 (diff) |
Merge branch 'master' into scsscs
Diffstat (limited to 'ikiwiki/directive.mdwn')
-rw-r--r-- | ikiwiki/directive.mdwn | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn index c4342de..fb88aa7 100644 --- a/ikiwiki/directive.mdwn +++ b/ikiwiki/directive.mdwn @@ -28,15 +28,13 @@ 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: |