Merge remote branch 'smcv/unescaped-meta'

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

diff --git a/doc/ikiwiki/directive/map.mdwn b/doc/ikiwiki/directive/map.mdwn
index 543470864646c4b0af54e1911c1a788aa6715317..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:
 
 
 This directive generates a hierarchical page map for the wiki. Example usage:
 


@@ -9,10 +9,12 @@ the wiki are mapped.
 
 By default, the names of pages are shown in the map. The `show` parameter
 can be used to show the titles or descriptions of pages instead (as set by
 
 By default, the names of pages are shown in the map. The `show` parameter
 can be used to show the titles or descriptions of pages instead (as set by

-the [[meta]] plugin). For example:
+the [[meta]] directive). For example:

 
        \[[!map pages="* and !blog/* and !*/Discussion" show=title]]
 
 
        \[[!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 !*/*/*"`
 
 Hint: To limit the map to displaying pages less than a certain level deep,
 use a [[ikiwiki/PageSpec]] like this: `pages="* and !*/*/*"`