From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 17:05:02 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100623~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0d1f736c659fcabb484abe77c714c4bf04b34a4f?hp=7d55ee1961d52cc79ab533e0cde7f53af21a075d

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 1aac47fa4..4c553925a 100644
--- 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 c49a47cb6..7c32d0cfe 100644
--- 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/)
 
 -----