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 357c89a57e255392c1d3344758b1e2e4559f0951..2ed5cc26f32a8822bfc7de5f24c67fb58852c136 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -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,13 +94,13 @@ you use the following additional features:
        \[[!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(listdirectives)" then="""
   Full list of [[directives|directive]] enabled for this wiki:
-  [[!listdirectives]]
+  [[!listdirectives ]]
 """]]