Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / Silence_monotone_warning.mdwn

diff --git a/doc/todo/Silence_monotone_warning.mdwn b/doc/todo/Silence_monotone_warning.mdwn
index db8765748e6f7e57f8c908d3915f5406dc6168f3..d875900c5b52c3f37070922f6f30b6aff71421e6 100644 (file)
--- a/doc/todo/Silence_monotone_warning.mdwn
+++ b/doc/todo/Silence_monotone_warning.mdwn
@@ -4,7 +4,7 @@ A quick [[patch]] to silence a [[rcs/monotone]] warning I started seeing:
     index 4b9be31..9d4e280 100644
     --- a/IkiWiki/Plugin/monotone.pm
     +++ b/IkiWiki/Plugin/monotone.pm
-    @@ -55,7 +55,7 @@ sub checkconfig () { #{{{
+    @@ -55,7 +55,7 @@ sub checkconfig () {
                error("Monotone version too old, is $version but required 0.38");
        }
      
@@ -13,3 +13,5 @@ A quick [[patch]] to silence a [[rcs/monotone]] warning I started seeing:
                push @{$config{wrappers}}, {
                        wrapper => $config{mtn_wrapper},
                        wrappermode => (defined $config{mtn_wrappermode} ? $config{mtn_wrappermode} : "06755"),
+
+> Thanks, [[done]]