Merge commit 'upstream/master' into prv/po

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

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index debbe7305a8b109e37f6c3a57c7f024b7657b765..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]]`.
@@ -22,14 +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]]`
 
-## 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
 setup file, prefixes directives with `!`, and thus does not prevent
 links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
\ No newline at end of file
+on by default.