Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/plugins/contrib/sourcehighlight.mdwn b/doc/plugins/contrib/sourcehighlight.mdwn
index f89677d9ed563e8bcfd3a714abc2e935f75379c7..0066c9b9fa5cbca92c17cf255eb5a8e5eae3ccb7 100644 (file)
--- a/doc/plugins/contrib/sourcehighlight.mdwn
+++ b/doc/plugins/contrib/sourcehighlight.mdwn
@@ -4,7 +4,7 @@ I noticed several places in the wiki talking about similar ideas, so I decided t
 
 I have implemented a simple wrapper around
  [source-highlight](http://www.gnu.org/software/src-highlite/).  You can find the latest version in 
-[git](http://http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/sourcehighlight.pm;hb=HEAD).
+[git](http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/sourcehighlight.pm;hb=HEAD).
 You must specify `highlight_lang=>"foo,bar"` in your setup file.
 where foo and bar are the (source-supported) languages you want to
 highlight

diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index ac8e0a71f29171a81cc24d1ea6ba40021d7cfd5e..8140b4f4195fc6d118b89b1c33c6280a29e1eaac 100644 (file)
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -3,7 +3,7 @@
 
 This plugin allows registering template pages, that provide default
 content for new pages created using the web frontend. To register a
-template, insert a [[PreprocessorDirective]] on some other page.
+template, insert a [[Preprocessor_Directive|/ikiwiki/preprocessordirective]] on some other page.
 
        \[[!edittemplate template="bugtemplate" match="bugs/*"]]
 

diff --git a/doc/todo/quieten-bzr.mdwn b/doc/todo/quieten-bzr.mdwn
new file mode 100644 (file)
index 0000000..f5f00b0
--- /dev/null
+++ b/doc/todo/quieten-bzr.mdwn
@@ -0,0 +1,23 @@
+The _bzr_ plug echoes "added: somefile.mdwn" when it adds somefile.mdwn to the repository. As a result, the redirect performed after a new article is created fails because the _bzr_ output comes before the HTTP headers.
+
+The fix is simply to call `bzr` with the _--quiet_ switch. Something like this applied to _bzr.pm_ works for me:
+
+    46c46
+    <  my @cmdline = ("bzr", $config{srcdir}, "update");
+    ---
+    >  my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});
+    74c74
+    <  my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user,
+    ---
+    >  my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user, 
+    86c86
+    <  my @cmdline = ("bzr", "add", "$config{srcdir}/$file");
+    ---
+    >  my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
+    94a95,97
+    >  eval q{use CGI 'escapeHTML'};
+    >  error($@) if $@;
+    > 
+
+
+[[tag patch]]