Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

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

diff --git a/config.php-dist b/config.php-dist
index 58218bab1519dc80a2b966915db2475a68c99add..0d1bfbc01da0fdacc1af0867f4cfcbe3ec45d29c 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -18,9 +18,9 @@
        // *** Basic settings (important!) ***
        // ***********************************
 
-       define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
+       define('SELF_URL_PATH', 'http://example.org/tt-rss/');
        // Full URL of your tt-rss installation. This should be set to the
-       // location of tt-rss directory, e.g. http://yourserver/tt-rss/
+       // location of tt-rss directory, e.g. http://example.org/tt-rss/
        // You need to set this option correctly otherwise several features
        // including PUSH, bookmarklets and browser integration will not work properly.
 
@@ -50,7 +50,10 @@
        // *****************************
 
        define('PHP_EXECUTABLE', '/usr/bin/php');
-       // Path to PHP executable, used for various command-line tt-rss programs
+       // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss programs and
+       // update daemon. Do not try to use CGI binary here, it won't work. If you see HTTP headers
+       // being displayed while running tt-rss scripts, then most probably you are using the CGI
+       // binary. If you are unsure what to put in here, ask your hosting provider.
 
        define('LOCK_DIRECTORY', 'lock');
        // Directory for lockfiles, must be writable to the user you run
@@ -111,9 +114,10 @@
        define('SPHINX_SERVER', 'localhost:9312');
        // Hostname:port combination for the Sphinx server.
 
-       define('SPHINX_INDEX', 'ttrss');
+       define('SPHINX_INDEX', 'ttrss, delta');
        // Index name in Sphinx configuration. You can specify multiple indexes
        // as a comma-separated string.
+       // Example configuration files are available on tt-rss wiki.
 
        // ***********************************
        // *** Self-registrations by users ***
@@ -168,6 +172,9 @@
        // These two options enable SMTP authentication when sending
        // outgoing mail. Only used with SMTP_SERVER.
 
+       define('SMTP_SECURE', '');
+       // used to select a secure SMTP conneciton.  can be tls, ssl or enpty
+       
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************