Merge branch 'master' into release-2.0

Author: johndoh

README.md

@@ -196,12 +196,21 @@ parser or an array, similar to the one created by the SieveRules parser.
 The structure of the rule file
 ------------------------------
 By default this plugin uses \r\n to seperate lines (RFC 5228) if you want to
-use \n instead then set ```php define('RCUBE_SIEVE_NEWLINE', "\n");``` in your
-config. Add ```php define('RCUBE_SIEVE_INDENT', "\t");``` to change the tab
-character. By default this plugin places a simple comment at the top of the
-rule file to show it was generated by the plugin. This header can be overridden
-by setting ```php define('RCUBE_SIEVE_HEADER', "## Generated by Roundcube
-Webmail SieveRules Plugin ##");``` in your config.
+use \n instead then set
+```php
+define('RCUBE_SIEVE_NEWLINE', "\n");
+```
+in your config. Add
+```php
+define('RCUBE_SIEVE_INDENT', "\t");
+```
+to change the indent character. By default this plugin places a simple comment
+at the top of the rule file to show it was generated by the plugin. This header
+can be overridden by setting
+```php
+define('RCUBE_SIEVE_HEADER', "## Generated by Roundcube SieveRules ##");
+```
+in your config.
 
 sieverules_connect hook
 -----------------------