Updated documentation.

INSTALL

@@ -39,7 +39,7 @@ Pigeonhole build:
     external plugins. The default is not to install development headers.
 
   --with-unfinished-features=no
-	  Controls whether unfinished features and extensions are built. Enabling this
+	Controls whether unfinished features and extensions are built. Enabling this
     will enable the compilation of code that is considered unfinished and highly
     experimental and may therefore introduce bugs and unexpected behavior. 
     In fact, it may not compile at all. Enable this only when you are eager to
@@ -335,12 +335,15 @@ managesieve_implementation_string = Dovecot
   (e.g. 'Cyrus timsieved v2.2.13').
 
 managesieve_max_compile_errors = 5
-	The maximum number of compile errors that are returned to the client upon 
+  The maximum number of compile errors that are returned to the client upon 
   script upload or script verification.
 
 managesieve_sieve_capability =
-	The SIEVE capability reported by the ManageSieve service before 
-  authentication.
+managesieve_notify_capability =
+  Respectively the SIEVE and NOTIFY capabilities reported by the ManageSieve
+  service before authentication. If left unassigned these will be assigned
+  dynamically according to what the Sieve interpreter supports by default
+  (after login this may differ depending on the user).
 
 Additionally, the ManageSieve service uses the following settings from the
 plugin section of the config file. These settings are the ones used by the Sieve
@@ -389,7 +392,7 @@ service managesieve-login {
 }
 
 protocol sieve {
-  managesieve_sieve_capability = fileinto reject
+  managesieve_max_compile_errors = 10
 }
 
 # ***  conf.d/90-sieve.conf ***

doc/example-config/conf.d/20-managesieve.conf

@@ -33,16 +33,17 @@ service managesieve {
 # Service configuration
 
 protocol sieve {
-  # Maximum ManageSieve command line length in bytes. Some clients generate very long
-  # command lines with huge mailboxes, so you may need to raise this if you get
-  # "Too long argument" or "ManageSieve command line too large" errors often.
+  # Maximum ManageSieve command line length in bytes. ManageSieve usually does
+  # not involve overly long command lines, so this setting will not normally need
+  # adjustment 
   #managesieve_max_line_length = 65536
 
   # Maximum number of ManageSieve connections allowed for a user from each IP address.
   # NOTE: The username is compared case-sensitively.
   #mail_max_userip_connections = 10
 
-  # Space separated list of plugins to load (none known so far).
+  # Space separated list of plugins to load (none known to be useful so far). Do NOT
+  # try to load IMAP plugins here.
   #mail_plugins =
 
   # MANAGESIEVE logout format string:
@@ -55,8 +56,14 @@ protocol sieve {
   # For example: 'Cyrus timsieved v2.2.13' 
   #managesieve_implementation_string = Dovecot
 
-  # Explicitly specify the SIEVE capability reported by the server before login.
-  # After login, the sieve capabilities are reported by the Sieve interpreter and
-  # reflect what's really allowed/supported for the user that is logged in. 
+  # Explicitly specify the SIEVE and NOTIFY capability reported by the server before
+  # login. If left unassigned these will be reported dynamically according to what
+  # the Sieve interpreter supports by default (after login this may differ depending
+  # on the user).
   #managesieve_sieve_capability = 
+  #managesieve_notify_capability = 
+
+  # The maximum number of compile errors that are returned to the client upon script
+  # upload or script verification.	
+  #managesieve_max_compile_errors = 5
 }