From 6444cf4b29d29f16ef20513a80898f4db0c3a8c4 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Fri, 06 Jun 2008 07:14:55 -0400
Subject: [PATCH] Remove comment characters which where 'helpfully' added by vim.

---
 config/main.inc.php.dist |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index ac34d6d..8d71d8f 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -40,6 +40,10 @@
 // TCP port used for IMAP connections
 $rcmail_config['default_port'] = 143;
 
+// IMAP auth type. Can be "auth" (CRAM-MD5), "plain" (PLAIN) or "check" to auto detect.
+// Optional, defaults to "check"
+$rcmail_config['imap_auth_type'] = null;
+
 // Automatically add this domain to user names for login
 // Only for IMAP servers that require full e-mail addresses for login
 // Specify an array with 'host' => 'domain' values to support multiple hosts
@@ -243,6 +247,7 @@
  *  'name'          => 'Verisign.com',
  *  'hosts'         => array('directory.verisign.com'),
  *  'port'          => 389,
+ *  'use_tls'	    => false,
  *  'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
  *  // %fu - The full username provided, assumes the username is an email
  *  //       address, uses the username_domain value if not an email address.
@@ -273,6 +278,7 @@
 $rcmail_config['dont_override'] = array();
 
 // try to load host-specific configuration
+// see http://trac.roundcube.net/wiki/Howto_Config for more details
 $rcmail_config['include_host_config'] = false;
 
 // don't let users set pagesize to more than this value if set
@@ -323,5 +329,20 @@
 // Compact INBOX on logout
 $rcmail_config['logout_expunge'] = FALSE;
 
+/**
+ * 'Delete always'
+ * This setting reflects if mail should be always marked as deleted,
+ * even if moving to "Trash" fails. This is necessary in some setups
+ * because a) people may not have a Trash folder or b) they are over
+ * quota (and Trash is included in the quota).
+ *
+ * This is a failover setting for iil_C_Move when a message is moved
+ * to the Trash, and not the same as "delete_right_away".
+ */
+$rcmail_config['delete_always'] = false;
+
+// Log successful logins
+$rcmail_config['log_logins'] = false;
+
 // end of config file
 ?>

--
Gitblit v1.9.1