X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a223f4540fee2d0c49523343a422315377bc0025..3bf104e528cde7e7e4cffcd30f264b8dc5a7a91c:/doc/wikilink.mdwn?ds=sidebyside

diff --git a/doc/wikilink.mdwn b/doc/wikilink.mdwn
index 1da5fb64d..d7e2ec6e0 100644
--- a/doc/wikilink.mdwn
+++ b/doc/wikilink.mdwn
@@ -2,24 +2,23 @@ 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]]".
 
+The file name associated with a wiki link is create as follows: capital
+letters are converted to lower case and spaces to underscores.  Finally,
+the file extention is added.
+
 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.
+There are some special [[SubPage/LinkingRules]] that come into play when
+linking between [[SubPage]]s.
 
-While a WikiLink is limited to alphanumerics and only a few special
-charaters, it is possible to create page names containing other characters:
+Also, if the file linked to by a WikiLink looks like an image, it will
+be displayed inline on the page.
 
-* To display a page name with a space in it, use "_" in the WikiLink, for
-  example, [[Multi_Word_Page_Name]]. 
-* For any other special character, you can use "__nnnn__" where `nnnn` is the
-  unicode character number. For example,
-  [[This_page_name_is__44___uselessly__44___a_complete_sentence__46__]]
-  Limiting use of this to when you really need it is a good idea.
+WikiLinks are matched with page names in a case-insensative manner, so you
+don't need to worry about getting the case the same, and can capitalise
+links at the start of a sentence, and so on.
 
-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_bar|SandBox]]" links to the
+SandBox page, but the link will appear like this: [[foo_bar|SandBox]]