From: Joey Hess Date: Tue, 29 Apr 2008 21:16:59 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 2.45~21 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9acb8151ccb8fa1ef7a769a2bb941066053cc736?hp=788f83c97da3ae748e28574954a5c809da8910c5 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 6dd7ae90c..64d57cf21 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -127,9 +127,31 @@ I also installed all optional Perl modules, except TimeDate. > TimeDate is also, confusingly, known as Date::Parse. Perhaps CPAN would > do better with that name. --[[Joey]] -good. Date::Parse was already there. --[[vibrog]] +good. Date::Parse was already installed. --[[vibrog]] `make` exits with `make: *** [extra_build] Aborted`, `make test` complains `cannot stat 'ikiwiki.man'` --[[vibrog]] > If you show me the actual error message, and not just the last line make > outputs, I might be able to help. --[[Joey]] + + .. + rendering todo/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn + make: *** [extra_build] Segmentation fault + +Repeating `make` ends with this: + + .. + scanning logo.mdwn + docwiki.setup: html/logo.html independently created, not overwriting with version from logo + BEGIN failed--compilation aborted at (eval 6) line 21. + make: *** [extra_build] Error 255 + +`make test` says + + t/basewiki_brokenlinks.....ok 1/0install: cannot stat `ikiwiki.man': No such file or directory + make[1]: *** [extra_install] Error 1 + # Failed test at t/basewiki_brokenlinks.t line 8. + t/basewiki_brokenlinks.....ok 4/0# Looks like you failed 1 test of 7. + t/basewiki_brokenlinks.....dubious + .. + Failed 1/22 test scripts, 95.45% okay. 1/483 subtests failed, 99.79% okay. diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 155a5ba4c..ad6084164 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -74,6 +74,7 @@ The haiku will change after every save, mind you. * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info) * plain old html link * [[foo]] +* WikiLink -----