fix up some links

10 files changed, 24 insertions, 22 deletions

diff --git a/doc/plugins/camelcase.mdwn b/doc/plugins/camelcase.mdwn
index 2a3e2639d..81270f41a 100644
--- a/doc/plugins/camelcase.mdwn
+++ b/doc/plugins/camelcase.mdwn
@@ -1,8 +1,9 @@
 [[template id=plugin name=camelcase author="[[Joey]]"]]
 
-This plugin makes words in CamelCase be treated as a [[WikiLink]]. That is
-to say, any two or more words capitalised and mashed together are assumed
-to be the name of some other page on the wiki, and so become a link.
+This plugin makes words in CamelCase be treated as a [[ikiwiki/WikiLink]].
+That is to say, any two or more words capitalised and mashed together are
+assumed to be the name of some other page on the wiki, and so become a
+link.
 
 If this plugin is enabled, this will be a link: SandBox
 
diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn
index 01fdd4852..8efefcbcb 100644
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@@ -5,7 +5,7 @@ This plugin lets html pages be used as source pages for the wiki. The
 html pages will still be wrapped in the same html template as any other
 page, so for best results you should include only the page body in the html
 file. Also, if the [[htmlscrubber]] plugin is enabled, the html pages will be
-sanitised like any other page. You can also use standard [[WikiLink]]s etc
-in the html pages.
+sanitised like any other page. You can also use standard 
+[[WikiLinks|ikiwiki/WikiLink]] etc in the html pages.
 
 This plugin is included in ikiwiki, but is not enabled by default.
diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn
index 5d93e90c5..7858fd513 100644
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@@ -2,9 +2,9 @@
 [[tag type/chrome]]
 
 This is an image handling plugin. While ikiwiki supports inlining full-size
-images by making a [[WikiLink]] that points to the image, using this plugin
-you can easily scale down an image for inclusion onto a page, providing a
-link to a full-size version.
+images by making a [[ikiwiki/WikiLink]] that points to the image, using
+this plugin you can easily scale down an image for inclusion onto a page,
+providing a link to a full-size version.
 
 This plugin uses the [ImageMagick](http://www.imagemagick.org/) tools via
 [PerlMagick](http://www.imagemagick.org/www/perl-magick.html).
@@ -17,7 +17,7 @@ Note that this is a stripped down version of Christian Mock's
 	\[[img image1.jpg size="200x200" alt="clouds"]]
 
 The image file will be searched for using the same rules as used to find
-the file pointed to by a [[WikiLink]].
+the file pointed to by a [[ikiwiki/WikiLink]].
 
 The `size` parameter is optional, defaulting to full size. Note that the
 original image's aspect ratio is always preserved, even if this means
diff --git a/doc/plugins/img/discussion.mdwn b/doc/plugins/img/discussion.mdwn
index c8a536327..02d46e380 100644
--- a/doc/plugins/img/discussion.mdwn
+++ b/doc/plugins/img/discussion.mdwn
@@ -1,5 +1,5 @@
 It would be useful (at least for me) if one could specify
-(using a [[WikiLink]]) where the image links to.  For example,
+(using a [[ikiwiki/WikiLink]]) where the image links to.  For example,
 on <http://www.bddebian.com/~wiki/sidebar/> I'd like to have the
 logo link to \[[hurd/logo]] / <http://www.bddebian.com/~wiki/hurd/logo/>
 instead of linking to the PNG image file.  --[[tschwinge]]
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index 073482a4c..f97e267ef 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -19,7 +19,7 @@ You can use any field names you like, but here are some predefined ones:
 
   Specifies a link to another page. This can be used as a way to make the
   wiki treat one page as linking to another without displaying a user-visible
-  [[WikiLink]]:
+  [[ikiwiki/WikiLink]]:
 
 	\[[meta link=otherpage]]
 
diff --git a/doc/plugins/meta/discussion.mdwn b/doc/plugins/meta/discussion.mdwn
index 73114a951..8388a1172 100644
--- a/doc/plugins/meta/discussion.mdwn
+++ b/doc/plugins/meta/discussion.mdwn
@@ -11,8 +11,8 @@ Now I've work-arounded it using apostrophes in another way
 
 --[[Paweł|ptecza]]
 
-> As with any other parameter in a [[preprocessordirective]], you can
+> As with any other parameter in a [[ikiwiki/preprocessordirective]], you can
 > triple-quote, and then include quotation marks inside. --[[Joey]]
 
 >> Thanks for the hint! Toggle plugin is probably my favourite ikiwiki
->> plugin, but I forget about that :D --[[Paweł|ptecza]]
\ No newline at end of file
+>> plugin, but I forget about that :D --[[Paweł|ptecza]]
diff --git a/doc/plugins/rst.mdwn b/doc/plugins/rst.mdwn
index 6a6606f20..49dd81e70 100644
--- a/doc/plugins/rst.mdwn
+++ b/doc/plugins/rst.mdwn
@@ -10,7 +10,7 @@ Note that this plugin does not interoperate very well with the rest of
 ikiwiki. Limitations include:
 
 * There are issues with inserting raw html into documents, as ikiwiki 
-  does with [[WikiLinks|WikiLink]] and many 
+  does with [[WikiLinks|ikiwiki/WikiLink]] and many 
   [[PreprocessorDirectives|ikiwiki/PreprocessorDirective]].
 
 So while you may find this useful for importing old files into your wiki,
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 98990973b..edae03887 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -5,13 +5,14 @@ This plugin allows tagging pages. List tags as follows:
 
 	\[[tag tech life linux]]
 
-The tags work the same as if you had put a (hidden) [[WikiLink]] on the page
-for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages that are
-tagged with a given tag, for example. The tags will also show up on blog
-entries and at the bottom of the tagged pages, as well as in RSS and Atom
-feeds.
+The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on
+the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all
+pages that are tagged with a given tag, for example. The tags will also
+show up on blog entries and at the bottom of the tagged pages, as well as
+in RSS and Atom feeds.
 
-If you want a visible [[WikiLink]] along with the tag, use taglink instead:
+If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink
+instead:
 
 	\[[taglink foo]]
 	\[[taglink tagged_as_foo|foo]]
diff --git a/doc/plugins/type/link.mdwn b/doc/plugins/type/link.mdwn
index 920cd31f5..c10863fac 100644
--- a/doc/plugins/type/link.mdwn
+++ b/doc/plugins/type/link.mdwn
@@ -1 +1 @@
-These plugins deal with [[WikiLinks|WikiLink]].
+These plugins deal with [[WikiLinks|ikiwiki/WikiLink]].
diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn
index 34467cf8e..a87ab06fd 100644
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@@ -12,7 +12,7 @@ hyphen characters at the start of a line create a horizontal line. Newlines
 turn into the appropriate tags. Headers are matching equals signs around
 the header text -- the more signs, the lesser the header.
 
-Links are standard [[WikiLinks|WikiLink]], although you can also enable
+Links are standard [[WikiLinks|ikiwiki/WikiLink]], although you can also enable
 [[CamelCase]] links.
 
 Lists are indented text, by one tab or four spaces. In unordered lists,