Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / ikiwiki / wikilink.mdwn

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index 38df00f86ea42b3c57da07c414e02f8387e330b9..371c2528f2a170de4ae8cbef61d80f93c9cb1272 100644 (file)
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]

 WikiLinks provide easy linking between pages of the wiki. To create a
 [[WikiLink]], just put the name of the page to link to in double brackets.
 For example `\[[WikiLink]]`.
 WikiLinks provide easy linking between pages of the wiki. To create a
 [[WikiLink]], just put the name of the page to link to in double brackets.
 For example `\[[WikiLink]]`.


@@ -22,6 +23,14 @@ 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]]`
 
 To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]`
 

-**Note that you cannot use spaces in WikiLinks**. Replace spaces with
-underscores. The presence of spaces is used to distinguish between a
-[[PreprocessorDirective]] and a WikiLink.
+## 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.