* Support inlining pages raw, rather than creating a blog.

[ikiwiki.git] / doc / plugins / wikitext.mdwn

diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn
index 5c5383fc5db76f8c2b9d18c44b88aa5028b73c56..603dda4ca507b66769622936e7135e09b6abb6b7 100644 (file)
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@@ -4,12 +4,13 @@ installed, enable the plugin, then files with the extention `.wiki` will be
 processed as wiki text.
 
 Wiki formatting is very simple. An item wrapped in three single quotes is
 processed as wiki text.
 
 Wiki formatting is very simple. An item wrapped in three single quotes is

-strong. An item wrapped in two single quotes is emphasized. Any word with
-multiple CapitalLetters (e. g., StudlyCaps) will become a link (standard
-[[WikiLinks|WikiLink]] work too). Four or more
-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.
+strong. An item wrapped in two single quotes is emphasized. Four or more
+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
+[[CamelCase]] links.

 
 Lists are indented text, by one tab or four spaces. In unordered lists,
 where each item has its own bullet point, each item needs a leading
 
 Lists are indented text, by one tab or four spaces. In unordered lists,
 where each item has its own bullet point, each item needs a leading


@@ -19,3 +20,5 @@ space. Any indented text without either marking is code, handled literally.
 You can nest lists.
 
 This plugin is included in ikiwiki, but is not enabled by default.
 You can nest lists.
 
 This plugin is included in ikiwiki, but is not enabled by default.

+
+[[tag type/format]]