Merge pull request #1262 from eileenmcnaughton/CRM-13072-more-upgrades

[civicrm-core.git] / templates / CRM / common / civicrm.settings.php.tpl

diff --git a/templates/CRM/common/civicrm.settings.php.tpl b/templates/CRM/common/civicrm.settings.php.tpl
index 38ed5bfe9942526c11ac271d276fbe116b428ca1..94d394321bbf7b1f87c7117662053114dc2ec3f5 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.tpl
+++ b/templates/CRM/common/civicrm.settings.php.tpl
@@ -170,11 +170,6 @@ define( 'CIVICRM_UF_BASEURL'      , '%%baseURL%%' );
  */
 define( 'CIVICRM_SITE_KEY', '%%siteKey%%' );
 
-/*
- * If you want to disable IDS, set this to 0.
- */
-define( 'CIVICRM_IDS_ENABLE', 1);
-
 /**
  * Enable this constant, if you want to send your email through the smarty
  * templating engine(allows you to do conditional and more complex logic)
@@ -184,19 +179,14 @@ define( 'CIVICRM_MAIL_SMARTY', 0 );
 
 /**
  * This setting logs all emails to a file. Useful for debugging any mail (or civimail) issues.
- * This will not send any email, so ensure this is commented out in production
+ * Enabling this setting will not send any email, ensure this is commented out in production
+ * The CIVICRM_MAIL_LOG is a debug option which disables MTA (mail transport agent) interaction.
+ * You must disable CIVICRM_MAIL_LOG before CiviCRM will talk to your MTA.
  */
 // define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log' );
 
 define( 'CIVICRM_DOMAIN_ID'      , 1 );
 
-/**
- * For Wordpress users if your public pages are using a different template than the home page
- * you should set the name of the template with the below constant
- * This will be moved to a DB setting in a future version, check CRM-10682
- */
-// define( 'CIVICRM_UF_WP_BASEPAGE', 'YOUR TEMPLATE NAME HERE');
-
 /**
  * Settings to enable external caching using a Memcache server.  This is an
  * advanced feature, and you should read and understand the documentation