summaryrefslogtreecommitdiff
path: root/ikiwiki/formatting.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 13:09:05 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 13:09:05 +0200
commit44a386114af64e0fa1617c088d02624c35ead589 (patch)
treeae07a013f05102dd6f5ea668bc57e14738e92d4b /ikiwiki/formatting.mdwn
parent90f745e87e154a04c0167efdd20884ba7b8d4466 (diff)
parent1af4bdc6272745e503fdd8cb5baabfadc8d200cb (diff)
Merge branch 'clean' into allinone
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/*"]]
"""]]