summaryrefslogtreecommitdiff
path: root/ikiwiki/formatting.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-22 20:31:53 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-22 20:31:53 +0200
commitb1fadc6eacaacb4d892b495e15ff82e9ba36c638 (patch)
treed490ffe027bac0f1b1e8246730aaf37771dc7f1b /ikiwiki/formatting.mdwn
parentb20d08a4029882a5a11152b52a8cc6aa38b2f0fa (diff)
Sync with ikiwiki 2.67.HEADmaster
Diffstat (limited to 'ikiwiki/formatting.mdwn')
-rw-r--r--ikiwiki/formatting.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index 0145f9d..2ed5cc2 100644
--- a/ikiwiki/formatting.mdwn
+++ b/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,8 +94,8 @@ 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/*"]]
"""]]