summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/ikiwikiusers.mdwn1
-rw-r--r--doc/wikilink.mdwn24
2 files changed, 1 insertions, 24 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 45f88f1da..2382a3f21 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -19,6 +19,7 @@ Sites that are using ikiwiki include:
* Roland Mas's [blog](http://roland.entierement.nu/categories/geek-en.html)
* Sergio Talens-Oliag [personal wiki](http://mixinet.net/~sto/) and [blog](http://mixinet.net/~sto/blog.html)
* Christian Aichinger's [homepage](http://greek0.net/)
+* <a href="http://modeemi.fi/~tuomov/ion/">ion</a> window manager homepage
Please feel free to add your own ikiwiki site!
diff --git a/doc/wikilink.mdwn b/doc/wikilink.mdwn
deleted file mode 100644
index d7e2ec6e0..000000000
--- a/doc/wikilink.mdwn
+++ /dev/null
@@ -1,24 +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]]".
-
-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]]".
-
-There are some special [[SubPage/LinkingRules]] that come into play when
-linking between [[SubPage]]s.
-
-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
-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]]