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

diff --git a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_3_afa5539a5f8aa52cb81c15bfa8d4ecda._comment b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_3_afa5539a5f8aa52cb81c15bfa8d4ecda._comment
deleted file mode 100644 (file)
index 403a6da..0000000
--- a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_3_afa5539a5f8aa52cb81c15bfa8d4ecda._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="Franek"
- ip="88.65.126.36"
- subject="comment 3"
- date="2012-12-17T01:31:50Z"
- content="""
-I just noticed that my localfavicon plugin does not work anymore (for me, at least). Don't know why yet.
-"""]]

diff --git a/doc/plugins/contrib/localfavicon.mdwn b/doc/plugins/contrib/localfavicon.mdwn
index 49347ce098f30e4fcedcd38a095d52880c476d12..66c9fdf5c0102b835cb9858410f94f6c70f9cd4b 100644 (file)
--- a/doc/plugins/contrib/localfavicon.mdwn
+++ b/doc/plugins/contrib/localfavicon.mdwn
@@ -1,6 +1,3 @@
-**Note: This plugin does not seem to be working presently.**
-
-
 [[!template id=plugin name=localfavicon author="Franek"]]
 
 This is a trivial modification of the [[plugins/favicon]] plugin to allow different favicons for different parts of the site. For this, the option "localfavicon" has to be set to 1 in the setup file, otherwise the plugin behaves just like the favicon plugin.