Merge branch 'master' into autoconfig

IkiWiki.pm

@@ -1068,13 +1068,10 @@ sub preprocess ($$$;$$) { #{{{
 			if ($preprocessing{$page}++ > 3) {
 				# Avoid loops of preprocessed pages preprocessing
 				# other pages that preprocess them, etc.
-				#translators: The first parameter is a
-				#translators: preprocessor directive name,
-				#translators: the second a page name, the
-				#translators: third a number.
-				return "[[".sprintf(gettext("%s preprocessing loop detected on %s at depth %i"),
-					$command, $page, $preprocessing{$page}).
-				"]]";
+				return "[[!$command <span class=\"error\">".
+					sprintf(gettext("preprocessing loop detected on %s at depth %i"),
+						$page, $preprocessing{$page}).
+					"</span>]]";
 			}
 			my $ret;
 			if (! $scan) {

doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn

@@ -15,3 +15,5 @@ see the following error message. --[[Paweł|ptecza]]
 >> when I sent my report. It seems that <http://git.ikiwiki.info/?p=ikiwiki>
 >> URL works now. So, we should be happy that it was self-fixed bug ;)
 >> --[[Paweł|ptecza]]
+
+>>> If it happens again, maybe take a full dump of the page? [[done]]