* Allow trailing slashes after page names in wikilinks.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad4d26741af22a5a0f087917ebc8334e819f7398..eb003a1fb9992e940dec64d2a315cca4260307c2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -541,6 +541,7 @@ sub htmllink ($$$;@) { #{{{
        my $page=shift; # the page that will contain the link (different for inline)
        my $link=shift;
        my %opts=@_;
+       $link=~s/\/$//;
 
        my $bestlink;
        if (! $opts{forcesubpage}) {

diff --git a/debian/changelog b/debian/changelog
index c8a9fbdbcb3172a6f179f38ea34b5a93094ae7f4..365b9148e2189530d93794d8358f7a19c3b2afd5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ ikiwiki (2.13) UNRELEASED; urgency=low
     Closes: #451666
   * Fix mercurial historyurl in example setup file.
   * More compact output for the brokenlinks plugin.
+  * Allow trailing slashes after page names in wikilinks.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 15:59:54 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 16:26:14 -0500
 
 ikiwiki (2.12) unstable; urgency=low
 

diff --git a/doc/bugs/Trailing_slash_breaks_links.mdwn b/doc/bugs/Trailing_slash_breaks_links.mdwn
index a9bb6fc5dd5c62235140df5a6cd52bd27affab09..aa03e2e9151af7f8c127cfa97550bf6603d48793 100644 (file)
--- a/doc/bugs/Trailing_slash_breaks_links.mdwn
+++ b/doc/bugs/Trailing_slash_breaks_links.mdwn
@@ -4,4 +4,6 @@ A trailing slash on a [[wikilink]] breaks the link:
 
 `\[[todo/Gallery]]` appears as [[todo/Gallery]].
 
---[[JoshTriplett]]
\ No newline at end of file
+--[[JoshTriplett]]
+
+[[done]]