Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / ikiwiki / directive / map.mdwn

diff --git a/doc/ikiwiki/directive/map.mdwn b/doc/ikiwiki/directive/map.mdwn
index eb8d11f39a9aa7a0a3318bf9f8180db60fa3d21b..4b6499547f71fcd95f1e4380d1ed9016ad5d729b 100644 (file)
--- a/doc/ikiwiki/directive/map.mdwn
+++ b/doc/ikiwiki/directive/map.mdwn
@@ -1,4 +1,4 @@
-The `map` directive is supplied by the [[!iki plugins/map]] plugin.
+The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin.
 
 This directive generates a hierarchical page map for the wiki. Example usage:
 
@@ -13,6 +13,8 @@ the [[meta]] directive). For example:
 
        \[[!map pages="* and !blog/* and !*/Discussion" show=title]]
 
+       \[[!map pages="* and !blog/* and !*/Discussion" show=description]]
+
 Hint: To limit the map to displaying pages less than a certain level deep,
 use a [[ikiwiki/PageSpec]] like this: `pages="* and !*/*/*"`