Merge branch 'master' into autoconfig

Conflicts:

	debian/changelog
	doc/todo/color_plugin.mdwn

diff --cc debian/changelog
index e146bf8d4ab93efabb782abe5fda9215d8b0deb1,e2258e9e62643cd0ab4f3a611c3f6c1c4174795f..865544786ae7f91e44b3db8f1eac0d6392ce2b9e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,4 +1,20 @@@
- ikiwiki (2.55) UNRELEASED; urgency=low
 +ikiwiki (2.60) UNRELEASED; urgency=low
 + 
 +  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/simple.setup"
 +    can be used set up a new wiki in seconds.
 +  * Add getsetup hook, all plugins that add fields to %config should use it.
 +  * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
 +    current configuration.
 +  * Large amounts of internal config data reorg.
 +  * The way wrappers are defined in the setup file has changed. Old setup
 +    files will continue to work, for now.
 +  * Version control backends promoted to first-class plugins.
 +  * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
 +    always to add.
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 +
+ ikiwiki (2.55) unstable; urgency=low
  
    * remove: New plugin that adds the ability to remove pages via the web.
      (Sponsored by The TOVA Company.)

diff --cc doc/todo/color_plugin.mdwn
index ec246f9d61393cc3217986bd4a20f1ddc24efa6d,1e1fb174e43d9fb18ffced9500b02123b4da4178..511851ba3b5920e6afd97809ec713fb5fa336694
--- 1/doc/todo/color_plugin.mdwn
--- 2/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@@ -195,6 -190,19 +190,16 @@@ Of course, I'm open for discussion or e
        +
        +Background color is missing, so the text is displayed on default background.
        +
-       +    \[[!color ,#ff0000 "Default color text on red background"]]
+       +    \[[!color background=#ff0000 text="Default color text on red background"]]
        +
        +Foreground is missing, so the text has default color.
 -      +
 -      +This plugin is not enabled by default. You can do that in [[ikiwiki.setup]]
 -      +file (hint: `add_plugins` variable).
+       --- style.css-orig      2008-07-27 15:12:39.000000000 +0200
+       +++ style.css   2008-07-27 15:15:06.000000000 +0200
+       @@ -333,3 +333,7 @@
+               background: #eee; 
+               color: black !important;
+        }
+       +
+       +span.color {
+       +       padding: 2px;
+       +}