unify SMTP_HOST and SMTP_PORT as SMTP_SERVER

[tt-rss.git] / config.php-dist

diff --git a/config.php-dist b/config.php-dist
index eb3339742d5608f77961e141188ff9972c6ff977..5366120af6ce94b34676fd2e93a0e83e62b89ca9 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -24,6 +24,13 @@
        // You need to set this option correctly otherwise several features
        // including PUSH, bookmarklets and browser integration will not work properly.
 
+       define('FEED_CRYPT_KEY', '');
+   // Key used for encryption of login/passwords for password-protected feeds
+   // in the database. A string of 24 random characters. If left blank, encryption
+       // is not used. Requires mcrypt functions.
+       // Warning: changing this key will make your stored feed passwords impossible
+       // to decrypt.
+       
        define('SINGLE_USER_MODE', false);
        // Operate in single user mode, disables all functionality related to
        // multiple users and authentication. Enabling this assumes you have
@@ -153,12 +160,10 @@
        define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
        // Subject line for email digests
 
-       define('SMTP_HOST', '');
-       // SMTP Host to send outgoing mail. Blank - use system MTA.
+       define('SMTP_SERVER', '');
+       // Hostname:port combination to send outgoing mail (i.e. localhost:25). 
+       // Blank - use system MTA.
        
-       define('SMTP_PORT','');
-       // SMTP port to sent outgoing mail. Default is 25.
-
        define('SMTP_LOGIN', '');
        define('SMTP_PASSWORD', '');
        // These two options enable SMTP authentication when sending