Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 5788d4aed8f5a1e0eaa87c011bf7696811bbae74..4eed3722ccc744595fc8380e68e69dc9e1ad6450 100644 (file)
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -83,3 +83,12 @@ locks out all users.
 >> machines.  Both are running the most recent release of ikiwiki in 
 >> pkgsrc - 2.66.  Perhaps an update to a newer version would solve the issue.
 
+----
+
+Is there a way to refer to all subpages of the current page, if  the name of the 
+current page is not known (i.e. the pagespec is used in a template)? The ./ syntax
+does not seem suitable for this, as
+
+> \[[!map pages="./*"]]
+
+also lists the current page and all its siblings.

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 3fff2f0c558e36ad0554bed235aebbf6390c8b61..a39264e18018b380d5bee9f70e2a3f1b04deaecc 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,7 +1,7 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 ----
-
+test
 [[中文显示]]
 
 Here's a paragraph.