Merge commit 'upstream/master' into prv/po

[ikiwiki.git] / doc / ikiwiki / formatting.mdwn

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index a5e8b7ce9e48262267f749a908d8795869df8dda..2ed5cc26f32a8822bfc7de5f24c67fb58852c136 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -7,12 +7,6 @@ called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
-<h1>test h1</h1>
-<p>paragraph1. yay and so on.</p>
-<p>paragraph 2.  etc. etc.</p>
-<hr>
-<p>did you see hr?</p>
-
 You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
 in single or double asterisks.
 
@@ -76,26 +70,37 @@ you use the following additional features:
        \[[!wikipedia War\_of\_1812]]
 """]]
 
+[[!if test="enabled(template) and templates" then="""
+* Create and fill out [[templates]] for repeated chunks of
+  parameterized wiki text.
+"""]]
+
+* Insert various [[directives|directive]] onto a page to perform useful
+  actions.
+[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
+  For example, you can:
+"""]]
+
 [[!if test="enabled(toc)" then="""
-* Add a table of contents to a page:
+  * Add a table of contents to a page:
 
-       \[[!toc ]]
+       \[[!toc]]
 """]]
 
 
 [[!if test="enabled(meta)" then="""
-* Change the title of a page:
+  * 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:
+[[!if test="enabled(inline)" then="""
+  * Create a blog by inlining a set of pages:
 
        \[[!inline pages="blog/*"]]
 """]]
 
-[[!if test="enabled(template) and templates" then="""
-* Create and fill out [[templates]] for repeated chunks of
-  parameterized wiki text.
+[[!if test="enabled(listdirectives)" then="""
+  Full list of [[directives|directive]] enabled for this wiki:
+  [[!listdirectives ]]
 """]]