update

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d988e09563f3eac4598f5fbeee81fff78708a88f..5351ee7adedc9e09caff4d6df270ee15b9d8b989 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -104,12 +104,14 @@ sub preprocess ($$$;$) { #{{{
                        # Note: preserve order of params, some plugins may
                        # consider it significant.
                        my @params;
-                       while ($params =~ /(?:(\w+)=)?(?:"""(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) {
+                       while ($params =~ /(?:(\w+)=)?(?:"""\n?(.+)"""|"([^"]+)"|(\S+))(?:\s+|$)/sg) {
+                               my $val=(defined $2 ? $2 : (defined $3 ? $3 : $4));
+                               chomp $val;
                                if (defined $1) {
-                                       push @params, $1, (defined $2 ? $2 : (defined $3 ? $3 : $4));
+                                       push @params, $1, $val;
                                }
                                else {
-                                       push @params, (defined $2 ? $2 : (defined $3 ? $3 : $4)), '';
+                                       push @params, $val, '';
                                }
                        }
                        return $hooks{preprocess}{$command}{call}->(

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 2f78f11aa043ae02e4f208c2d738841e61b73fcd..8f3911bd91cee08284b6fdc1dc528ff041cc3414 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -12,7 +12,8 @@ Instead it can use [[Subversion]] (or [[Git]]).
   and thoughts about ikiwiki to [[Discussion]].
 
 [[template id=note text="""
-If you use ikiwiki, please list your wiki in [[IkiWikiUsers]]. Thanks!
+If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
+Thanks! --[[Joey]]
 """]]
 
 * [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents