From: Joey Hess <joey@kitenet.net>
Date: Mon, 29 Nov 2010 18:59:48 +0000 (-0400)
Subject: second parameter of urlto is optional
X-Git-Tag: 3.20101231~104
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/53d466a07f542dca86732764ab4f13608d701a1c?ds=inline

second parameter of urlto is optional
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a893edb3b..97946bfcf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1134,7 +1134,7 @@ sub beautify_urlpath ($) {
 	return $url;
 }
 
-sub urlto ($$;$) {
+sub urlto ($;$$) {
 	my $to=shift;
 	my $from=shift;
 	my $absolute=shift;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 726ace8d3..ccdf9f393 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,7 +982,7 @@ This is the standard gettext function, although slightly optimised.
 
 This is the standard ngettext function, although slightly optimised.
 
-### `urlto($$;$)`
+### `urlto($;$$)`
 
 Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other