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 1aac47fa4c95be6a8b661516f93df0759a5983e3..4c553925a9fafbcc9df4a4c66936210e5439db7e 100644 (file)
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -100,3 +100,6 @@ I am a little lost. I want to match the start page `/index.mdwn`. So I use
     \[[!inline pages="/index"]]
 
 which does not work though. I also tried it in this Wiki. Just take a look at the end of the [[SandBox|sandbox]]. --[[PaulePanter]]
+
+> Unlike wikilinks, pagespecs match relative to the top of the wiki by
+> default. So lose the "/" and it will work. --[[Joey]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c49a47cb6cea544e48355704046cf11ea374ccc4..7c32d0cfed2fa4f0418c03916475c3cd508b8183 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -54,7 +54,6 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [TVS](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----