Merge branch 'bugs'

diff --git a/doc/bugs/package_build_fails_in_non-English_environment.mdwn b/doc/bugs/package_build_fails_in_non-English_environment.mdwn
index 565672a674c0b47e5e0ef5c1a1201e76b872f004..521ba62f827e6a1a6d08831a35c979d0184e0414 100644 (file)
--- a/doc/bugs/package_build_fails_in_non-English_environment.mdwn
+++ b/doc/bugs/package_build_fails_in_non-English_environment.mdwn
@@ -7,3 +7,5 @@ I've never had to understand the Unix locales, so I randomly tried to replace `L
 - `LANG=C` : fails
 - `LANGUAGE=` : fails
 - `LANGUAGE=C` : works!
+
+> For maximum precedence it should have been LC_ALL=C. [[done]], I think... --[[smcv]]

diff --git a/doc/users/smcv.mdwn b/doc/users/smcv.mdwn
index 91f704208356fd46200a2ee7c6ad49b6257501bd..33ae450b24de704c8cc6b6ec80856138bc9155c8 100644 (file)
--- a/doc/users/smcv.mdwn
+++ b/doc/users/smcv.mdwn
@@ -1 +1 @@
-[smcv.pseudorandom.co.uk](http://smcv.pseudorandom.co.uk/)
+I'm trying to add enough features/fix enough bugs to convert [smcv.pseudorandom.co.uk](http://smcv.pseudorandom.co.uk/) from Django + Python + misc hacks to ikiwiki.

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index baee285e24409fc699edec0609e3243e825d8092..994e3e3779d94e118f63a916d3e70dca23c379ae 100755 (executable)
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -6,7 +6,7 @@ use Test::More 'no_plan';
 ok(! system("mkdir t/tmp"));
 ok(! system("make -q ikiwiki.out"));
 ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
-ok(! system("LANG= perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
+ok(! system("LC_ALL=C perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
 ok(`grep 'no broken links' t/tmp/out/index.html`);
 ok(-e "t/tmp/out/style.css");
 ok(! system("rm -rf t/tmp t/basewiki_brokenlinks/.ikiwiki"));