summaryrefslogtreecommitdiff
path: root/doc/ikiwiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-14 17:01:05 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-14 17:01:05 -0400
commitf555778069f9ef8144c587a5f1c2111f4da93aa7 (patch)
tree9f9f572e8b40b90e12e47eacce9b1c6cda1dddea /doc/ikiwiki
parent974a8d0dffa77e71e55f2b5c91ad6e2f208e987a (diff)
fix links
Diffstat (limited to 'doc/ikiwiki')
-rw-r--r--doc/ikiwiki/directive.mdwn14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/ikiwiki/directive.mdwn b/doc/ikiwiki/directive.mdwn
index dafbd7271..c4342dee8 100644
--- a/doc/ikiwiki/directive.mdwn
+++ b/doc/ikiwiki/directive.mdwn
@@ -1,5 +1,5 @@
[[!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"]]
@@ -29,12 +29,12 @@ of text with triple-quotes:
"""]]
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.