urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2008-04-10 16:35:50 -04:00
parent 72b5ef2c5f c69c811d64
commit 243739e1c3
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/plugins/contrib/sourcehighlight.mdwn
View File

@ -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 I have implemented a simple wrapper around
[source-highlight](http://www.gnu.org/software/src-highlite/). You can find the latest version in [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. You must specify `highlight_lang=>"foo,bar"` in your setup file.
where foo and bar are the (source-supported) languages you want to where foo and bar are the (source-supported) languages you want to
highlight highlight

2
doc/plugins/edittemplate.mdwn
View File

@ -3,7 +3,7 @@
This plugin allows registering template pages, that provide default This plugin allows registering template pages, that provide default
content for new pages created using the web frontend. To register a 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/*"]] \[[!edittemplate template="bugtemplate" match="bugs/*"]]

23
doc/todo/quieten-bzr.mdwn 100644
View File

@ -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]]