X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/063d4cc90eb326d137546850f963258c26ba7271..b610ca5cbf7dd17fcc9c9b67405616cf63f199d9:/doc/helponformatting.mdwn

diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
index 6c0cc9df8..4e8760c6b 100644
--- a/doc/helponformatting.mdwn
+++ b/doc/helponformatting.mdwn
@@ -1,4 +1,4 @@
-# Help on formatting text
+[[meta title="Help on formatting wiki pages"]]
 
 Text on this wiki is, by default, written in a form very close to how you
 might write text for an email message. This style of text formatting is
@@ -47,33 +47,48 @@ To write a code block, indent each line with a tab or 4 spaces:
 	10 PRINT "Hello, world!"
 	20 GOTO 10
 
-To link to another page on the wiki, place the page's name inside double
-square brackets, so you would use `\[[WikiLink]]` to link to [[WikiLink]].
-
-To link to any other web page, or to an email address, you can just put the
+To link to an url or email address, you can just put the
 url in angle brackets: <<http://ikiwiki.info>>, or you can use the
 form \[link text\]\(url\)
 
 ----
 
-You can also use [[PreProcessorDirective]]s to do additional cool stuff.
+In addition to basic html formatting using [[MarkDown]], this wiki lets
+you use the following additional features:
+
+* To link to another page on the wiki, place the page's name inside double
+  square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
+
+[[if test="enabled(smiley) and smileys" then="""
+* Insert [[smileys]] and some other useful symbols. :-)
+"""]]
+
+[[if test="enabled(shortcut) and shortcuts" then="""
+* Use [[shortcuts]] to link to common resources.
 
-[[if test="enabled(inline)" then="""
-This wiki has the inline plugin enabled, so you can create a [[blog]] on any
-page.
+	\[[wikipedia War\_of\_1812]]
 """]]
 
-[[if test="enabled(smiley)" then="""
-This wiki has the smiley plugin enabled, so you can insert [[smileys]] and some
-other useful symbols.
+[[if test="enabled(toc)" then="""
+* Add a table of contents to a page:
+
+	\[[toc ]]
 """]]
 
-[[if test="enabled(shortcut)" then="""
-This wiki has the shortcut plugin enabled, so you can use [[shortcuts]] to link
-to common resources.
+
+[[if test="enabled(meta)" then="""
+* Change the title of a page:
+
+	\[[meta title="full page title"]]
+"""]]
+
+[[if test="enabled(inline) and blog" then="""
+* Create a [[blog]] by inlining a set of pages:
+
+	\[[inline pages="blog/*"]]
 """]]
 
-[[if test="enabled(template)" then="""
-This wiki has the template plugin enabled, so you can create and use
-[[templates]] for repeated chunks of parameterized wiki text.
+[[if test="enabled(template) and templates" then="""
+* Create and fill out [[templates]] for repeated chunks of
+  parameterized wiki text.
 """]]