summaryrefslogtreecommitdiff
path: root/ikiwiki/wikilink.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-30 06:17:15 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-30 06:17:15 +0200
commit0f935cae8775f5d94dfdc6c50c753eded796abfc (patch)
treed7769dcc2bac98eafca69063d6f1c0a1c5329252 /ikiwiki/wikilink.mdwn
parent7a34ab14c1c817bc9ac43197c002c7b95e6ad1cc (diff)
parent70090d29241b365d5532360afed8782d3c7dfd2e (diff)
Merge branch 'master' into clean + drop ikiwiki/preprocessordirective.mdwn
Diffstat (limited to 'ikiwiki/wikilink.mdwn')
-rw-r--r--ikiwiki/wikilink.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki/wikilink.mdwn b/ikiwiki/wikilink.mdwn
index bd5e3d1..371c252 100644
--- a/ikiwiki/wikilink.mdwn
+++ b/ikiwiki/wikilink.mdwn
@@ -23,11 +23,11 @@ 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]]`
-## Preprocessor directives and wikilinks
+## Directives and WikiLinks
ikiwiki has two syntaxes for
-[[preprocessor_directives|PreprocessorDirective]]. The older syntax
-used spaces to distinguish between preprocessor directives and
+[[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