From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:18:44 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/20052f888277f270ab846bf8b1eb44714c1009d6?hp=752ccf8b48bab173839b5c7892e9868ee71846f0

Merge branch 'master' into autotag

Conflicts:
	IkiWiki/Plugin/tag.pm
---

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index a7f37a512..cd7ecc212 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -46,7 +46,7 @@ sub getsetup () {
 sub taglink ($) {
 	my $tag=shift;
 	
-	if ($tag !~ m{^\.?/} &&
+	if ($tag !~ m{^/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
 		$tag=~y#/#/#s; # squash dups
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 64736f8cd..807a96f25 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -28,7 +28,7 @@ into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
 If you want to override the tagbase for a particular tag, you can use
 something like this:
 
-	\[[!tag ./foo]]
+	\[[!tag /foo]]
 	\[[!taglink /foo]]
 
 [[!meta robots="noindex, follow"]]