X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a1997e1994d65add41eea3063ba458e219e54579..157357f1bbc6c9e988c28944e136e043a074eddd:/doc/wikilink.mdwn?ds=inline

diff --git a/doc/wikilink.mdwn b/doc/wikilink.mdwn
index 7891add7c..6051fe120 100644
--- a/doc/wikilink.mdwn
+++ b/doc/wikilink.mdwn
@@ -1,9 +1,19 @@
 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
-examples "[[ WikiLink ]]" (without the added whitespace). 
+[[WikiLink]], just put the name of the page to link to in double brackets.
+For example "\[[WikiLink]]".
+
+If you ever need to write something like "\[[WikiLink]] without creating a
+wikilink, just prefix it with a "\", like "\\\\[[WikiLink]]".
 
 Note that there are some special [[SubPage/LinkingRules]] that come into
 play when linking between [[SubPage]]s.
 
 WikiLinks can be entered in any case you like, the page they link to is
 always lowercased.
+
+Note that if the file linked to by a WikiLink looks like an image, it will
+be displayed inline on the page.
+
+It's also possible to write a WikiLink that uses something other than the
+page name as the link text. For example "\[[foo|SandBox]]" links to the
+SandBox page, but the link will appear like this: [[foo|SandBox]]