summaryrefslogtreecommitdiff
path: root/doc/ikiwiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-24 00:46:17 -0400
committerJoey Hess <joey@kitenet.net>2010-04-24 00:46:17 -0400
commit8a56df576a9d7d184a5233bcde8ea07eee86dd60 (patch)
treec8b9b62e64e663650b847e9a6a1bf81c356bc975 /doc/ikiwiki
parenta46e17893204142c4cb3400057e814aa7856d350 (diff)
parentbe3d754320088ecbb0d60a1675d71078611ef62c (diff)
Merge branch 'master' into templatemove
Diffstat (limited to 'doc/ikiwiki')
-rw-r--r--doc/ikiwiki/wikilink.mdwn12
1 files changed, 0 insertions, 12 deletions
diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index f561d5850..0c30aafa2 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -22,15 +22,3 @@ page, but the link will appear like this: [[foo_bar|SandBox]].
To link to an anchor inside a page, you can use something like
`\[[WikiLink#foo]]` .
-
-## Directives and WikiLinks
-
-ikiwiki has two syntaxes for
-[[directives|directive]]. The older syntax
-used spaces to distinguish between directives and
-wikilinks; as a result, with that syntax in use, you cannot use spaces
-in WikiLinks, and must replace spaces with underscores. The newer
-syntax, enabled with the `prefix_directives` option in an ikiwiki
-setup file, prefixes directives with `!`, and thus does not prevent
-links with spaces. Future versions of ikiwiki will turn this option
-on by default.