Merge branch 'master' into po

Conflicts:
	debian/changelog

1 files changed, 13 insertions, 11 deletions

diff --git a/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn b/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
index f2c60309b..059415819 100644
--- a/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
+++ b/doc/bugs/Titles_are_lower-cased_when_creating_a_page.mdwn
@@ -4,17 +4,19 @@ If I click on "Czars in Russia", I'd like Ikiwiki to create "Czars\_in\_Russia.m
 
 > There's a simple patch that can do this:
 
-> --- a/IkiWiki.pm
-> +++ b/IkiWiki.pm
-> @@ -584,7 +584,7 @@ sub htmllink ($$$;@) {
->  			return "<span class=\"createlink\"><a href=\"".
->  				cgiurl(
->  					do => "create",
-> -					page => pagetitle(lc($link), 1),
-> +					page => pagetitle($link, 1),
->  					from => $lpage
->  				).
->  				"\">?</a>$linktext</span>"
+<pre>
+-- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -584,7 +584,7 @@ sub htmllink ($$$;@) {
+ 			return "&lt;span class=\"createlink\">&lt;a href=\"".
+ 				cgiurl(
+ 					do => "create",
+-					page => pagetitle(lc($link), 1),
++					page => pagetitle($link, 1),
+ 					from => $lpage
+ 				).
+ 				"\">?&lt;/a>$linktext&lt;/span>"
+</pre>
 
 > This is fine if you don't mind mixed or randomly cased filenames getting
 > created. Otoh, if the link happened to start a sentence and so had its