Merge branch 'master' into autotag

Conflicts:
	IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index a7f37a5122b30da2a8716200093a98ef3aa6f189..cd7ecc212fd7c928560ade98d34366ae9da45999 100644 (file)
--- 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 64736f8cddfd0ec31ad05231a19f01e7df28dfc6..807a96f25b96ce5cff248d4001b8255f12d13559 100644 (file)
--- 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"]]