Merge branch 'master' into autoconfig

2 files changed, 30 insertions, 4 deletions

diff --git a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
index 4ab203dee..0ab9f0bd6 100644
--- a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
+++ b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn
@@ -10,3 +10,8 @@ see the following error message. --[[Paweł|ptecza]]
 
 > I don't see or understand the problem. I've tried History links as well
 > as the diff links in RecentChanges, both seem to be working. --[[Joey]]
+
+>> Hm. It's strange. I really could see the error message like above
+>> when I sent my report. It seems that <http://git.ikiwiki.info/?p=ikiwiki>
+>> URL works now. So, we should be happy that it was self-fixed bug ;)
+>> --[[Paweł|ptecza]]
diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index fa460a386..b82e0b704 100644
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -46,19 +46,37 @@ This is a RC1 of my `color` plugin. It works for me well, but all your
 comments are very welcome. --[[Paweł|ptecza]]
 
 > Sure, I have a couple.
-> 
+
+>> Great! Thank you very much! --[[Paweł|ptecza]]
+
 > The preprocess function is passed named parameters. The hack you have of
 > hardcoding use of `$_[0]` and `$_[2]` can fail at any time.
-> 
+
+>> But the problem is that arguments of my plugin don't have a name.
+>> How can I identify them in `params` hash?
+
+>> Similar hardcoded method I've found in `img` plugin :) But only one
+>> argument is not named there (image path).
+
+>> Maybe I shouldn't use so simple plugin syntax? For following syntax
+>> I wouldn't have that problem:
+
+>>     \[[!color fg=white bg=red text="White text on red background"]]
+
 > `replace_preserved_style` is passed a single parameter, so its prototype
 > should be `($)`, not `(@)`.  Ditt `preserve_style`, it should have
 > `($$)`.
-> 
+
+>> OK, it will be fixed.
+
 > The sanitize hook is always passed `$params{content}`, so there should be
 > no reason to check that it exists. Also, it shouldn't be done in a
 > sanitize hook, since html sanitization could run _after_ that santize
 > hook. It should use a format hook.
-> 
+
+>> Probably you're right. It was rather paranoid checking ;) Thanks for
+>> the hook hint!
+
 > The preprocess hook needs to call `IkiWiki::preprocess` on the content
 > passed into it if you want to support nesting other preprocessor
 > directives inside the color directive. See `preprocess_toggleable` in the
@@ -68,6 +86,9 @@ comments are very welcome. --[[Paweł|ptecza]]
 > The method used by toggle of using two real `<div>`s seems slightly
 > better. --[[Joey]]
 
+>> I don't like that too, but I didn't have better idea :) Thank you for
+>> the hint! I'll take a look at `toggle` plugin.
+
 	--- /dev/null	2008-07-24 09:38:19.000000000 +0200
 	+++ color.pm	2008-07-25 14:43:15.000000000 +0200
 	@@ -0,0 +1,75 @@