updated, compatible with the merged trail

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

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index 8b74cd73d7cf9323e40cdf1a7ca2ede961d85b9b..befbce9aa421b3255bf8bb4012c898e38030e1b9 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
+You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 
 To create a list, start each line with an asterisk:
@@ -77,7 +77,7 @@ you use the following additional features:
 
 * Insert various [[directives|directive]] onto a page to perform useful
   actions.
-[[!if test="enabled(toc) or enabled(meta) or (enabled(inline) and blog)" then="""
+[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
   For example, you can:
 """]]
 
@@ -94,7 +94,7 @@ you use the following additional features:
        \[[!meta title="full page title"]]
 """]]
 
-[[!if test="enabled(inline) and blog" then="""
+[[!if test="enabled(inline)" then="""
   * Create a blog by inlining a set of pages:
 
        \[[!inline pages="blog/*"]]