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

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index 76d4d7b1d79ce3e95ce07503ae80448c788d2215..f8f005c319dadbb8bda326143a10632413bc6c6a 100644 (file)
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -6,9 +6,9 @@ This plugin makes it easier to put flattr buttons in ikiwiki. It supports both t
 
 The dynamic button does not require creation of the page on flattr before being added to a page, the static one does.
 
-I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugins/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
+I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugin/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
 
-This plugin is licensed under CC0.
+This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain).
 
 # Usage #