From: joey Date: Thu, 28 Dec 2006 20:10:41 +0000 (+0000) Subject: merge change to basewiki X-Git-Tag: 1.37~68 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8b959eb0da3881821e363e1c51c757b1695ffa2;p=ikiwiki.git merge change to basewiki --- diff --git a/basewiki/wikilink.mdwn b/basewiki/wikilink.mdwn index c37d1cd00..8eb5225fe 100644 --- a/basewiki/wikilink.mdwn +++ b/basewiki/wikilink.mdwn @@ -11,7 +11,7 @@ linking between [[SubPages|SubPage]]. Also, if the file linked to by a WikiLink looks like an image, it will be displayed inline on the page. -WikiLinks are matched with page names in a case-insensative manner, so you +WikiLinks are matched with page names in a case-insensitive 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. diff --git a/doc/wikilink.mdwn b/doc/wikilink.mdwn deleted file mode 100644 index da5ed03f6..000000000 --- a/doc/wikilink.mdwn +++ /dev/null @@ -1,20 +0,0 @@ -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]]". - -If you ever need to write something like "\[[WikiLink]] without creating a -wikilink, just prefix it with a "\", like "\\\\[[WikiLink]]". - -There are some special [[SubPage/LinkingRules]] that come into play when -linking between [[SubPages|SubPage]]. - -Also, if the file linked to by a WikiLink looks like an image, it will -be displayed inline on the page. - -WikiLinks are matched with page names in a case-insensitive 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. - -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]]