Merge of Steve Brown's patch

[squirrelmail.git] / doc / presets.txt

diff --git a/doc/presets.txt b/doc/presets.txt
index 339e8f62fa64b092f65302032db11e33c1e00b52..bb0919d8bffa04dcb4e0e940aab0c4d2ff4e5019 100644 (file)
--- a/doc/presets.txt
+++ b/doc/presets.txt
@@ -6,14 +6,15 @@ It can be used if user can't run conf.pl and changes options manually.
 Settings can be different if IMAP server uses shared folders.
 
 Possible server values are:
+ bincimap    = Binc IMAP server
+ courier     = Courier IMAP server
  cyrus       = Cyrus IMAP server
- uw          = University of Washington's IMAP server
+ dovecot     = Dovecot Secure IMAP server
  exchange    = Microsoft Exchange IMAP server
- courier     = Courier IMAP server
- macosx      = Mac OS X Mailserver
  hmailserver = hMailServer
+ macosx      = Mac OS X Mailserver
  mercury32   = Mercury/32
- dovecot     = Dovecot Secure IMAP server
+ uw          = University of Washington's IMAP server
 
 -----------------
 default settings:
@@ -34,6 +35,10 @@ show_contain_subfolders_option = false
 -----------------
 'cyrus' settings:
 -----------------
+Server supports server side sorting since 2.0.4 version. euc-jp, euc-kr, 
+tis-620, cp1251, cp1255 character sets are not supported by sorting functions 
+(v.2.2.12).
+
               imap_server_type = cyrus
          default_folder_prefix = <none> (is set to empty string)
                   trash_folder = INBOX.Trash
@@ -49,6 +54,8 @@ show_contain_subfolders_option = false
 --------------
 'uw' settings:
 --------------
+Server supports server side sorting. Plain text logins are disabled by default.
+
               imap_server_type = uw
          default_folder_prefix = mail/
                   trash_folder = Trash
@@ -64,6 +71,8 @@ show_contain_subfolders_option = true
 --------------------
 'exchange' settings:
 --------------------
+Server does not support server side sorting.
+
               imap_server_type = exchange
          default_folder_prefix = <none> (is set to empty string)
                   trash_folder = INBOX/Deleted Items
@@ -79,6 +88,12 @@ show_contain_subfolders_option = false
 -------------------
 'courier' settings:
 -------------------
+Fast, scalable, enterprise IMAP server that uses Maildirs
+
+Server supports server side sorting. SquirrelMail can issue IMAP commands
+that are supported only when courier-imap is compiled with --enable-unicode
+option.
+
               imap_server_type = courier
          default_folder_prefix = INBOX.
                   trash_folder = Trash
@@ -109,6 +124,9 @@ show_contain_subfolders_option = false
 -----------------------
 'hmailserver' settings:
 -----------------------
+Preset is used with hMailServer IMAP server. Available since SquirrelMail 1.5.1 
+and 1.4.4. Open source email server for WinNT and later.
+
               imap_server_type = hmailserver   (used in imap_search.php)
          default_folder_prefix = <none> (is set to empty string)
                   trash_folder = INBOX.Trash
@@ -124,11 +142,8 @@ show_contain_subfolders_option = false
 ---------------------
 'mercury32' settings:
 ---------------------
-Preset is used for Mercury Mail Transport System. Available since 1.5.0
+Preset is used for Mercury Mail Transport System. Available since 1.5.0 and 1.4.6.
 Free email server for Win32 and Netware.
-Tested Win32 v.4.01b
-CAPABILITY IMAP4rev1 X-MERCURY
-PERMANENTFLAGS (\Deleted \Draft \Seen \Answered)
 
 Comments:
 * Server side sorting and threading are not supported.
@@ -140,8 +155,6 @@ Comments:
 $imap_server_type variable is used to handle imap folder subscription
 differences.
 
-Site URL: http://www.pmail.com
-
               imap_server_type = mercury32
          default_folder_prefix = <none> (is set to empty string)
                   trash_folder = Trash
@@ -157,22 +170,13 @@ show_contain_subfolders_option = true
 -------------------
 'dovecot' settings:
 -------------------
-Preset used for Dovecot Secure IMAP server. Available since 1.5.1.
+Preset used for Dovecot Secure IMAP server. Available since 1.5.1 and 1.4.6.
 
 There is no code specific to Dovecot IMAP server. Preset provides only a quick
 way to set correct folder settings.
 
-Tested v.0.99.14
-
-CAPABILITY IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE 
-  CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE
-
-PERMANENTFLAGS (\Answered \Flagged \Deleted \Seen \Draft \*)
-
 IMAP server supports server side sorting and threading.
 
-Site URL: http://www.dovecot.org
-
               imap_server_type = dovecot
          default_folder_prefix = <none> (is set to empty string)
                   trash_folder = Trash
@@ -189,21 +193,12 @@ show_contain_subfolders_option = false
 --------------------
 'bincimap' settings:
 --------------------
-
-Tested v.1.2.13 and 1.3.4
-
-CAPABILITY IMAP4rev1 STARTTLS AUTH=LOGIN AUTH=PLAIN (1.2.13)
-CAPABILITY IMAP4rev1 STARTTLS AUTH=LOGIN AUTH=PLAIN IDLE LITERAL+ NAMESPACE CHILDREN (1.3.4)
-
-PERMANENTFLAGS (\Answered \Flagged \Deleted \Seen \Draft) - 1.2.13
-PERMANENTFLAGS (\Answered \Flagged \Deleted \Seen \Draft \*) - 1.3.4
+Preset is used with Binc IMAP server. Available since 1.5.1 and 1.4.6.
 
 IMAP server does not support server side sorting and threading. Plain text 
 logins are disabled by default. Due to available storage backend configuration 
 options it is impossible to create single preset, which covers all setups.
 
-Site URL: http://www.bincimap.org
-
 * Default (1.2.13) configuration with Maildir++ depot and / delimiter
               imap_server_type = bincimap (is used to handle INBOX in folder management)
          default_folder_prefix = INBOX/