update eclipse .settings

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

diff --git a/config.php-dist b/config.php-dist
index 3e4e924b9c5a1ede5e2eaeb3d1036bc0170d1d9b..4e231a6f0c81d9a81085dc9e85b3b33c33452038 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -1,7 +1,5 @@
 <?php
-       // Your RDBMS must be configured to accept connections
-       // via TCP/IP and authentified by password.
-
+       // Database server configuration
        define('DB_TYPE', "pgsql"); // or mysql
        define('DB_HOST', "localhost");
        define('DB_USER', "fox");
@@ -9,41 +7,34 @@
        define('DB_PASS', "XXXXXX");
        //define('DB_PORT', '5432'); // when neeeded, PG-only
 
-       define('SELF_URL_PATH', 'http://localhost/tt-rss');
-       // Full URL of your tt-rss installation. You need to set this option
-       // correctly for tt-rss to function properly.
+       define('SELF_URL_PATH', 'http://yourserver/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/
+       // You need to set this option correctly otherwise several features
+       // including PUSH, bookmarklets and browser integration will not work properly.
 
-       define('MAGPIE_FETCH_TIME_OUT', 60);
-       // Magpie's default timeout is 5 seconds.  Some RSS feeds,
-       // such as from large Trac installs, can take significantly
-       // longer than 5 seconds to generate.  To prevent failed
-       // updates, increase this.
+       define('SINGLE_USER_MODE', true);
+       // Operate in single user mode, disables all functionality related to
+       // multiple users.
+       
+       define('CACHE_DIR', 'cache');
+       // Local cache directory for RSS feed content.
 
-       define('MAGPIE_CACHE_DIR', 'cache/magpie');
-       // Local cache directory for RSS feeds
+       define('SIMPLEPIE_CACHE_IMAGES', false);
+       // Allow caching feed images when using SimplePie, to bypass hotlink
+       // prevention and such at expense of local disk space and bandwidth.
+       // Note that you (or your users) also have to enable image caching 
+       // in feed editor.
 
-       define('ICONS_DIR', "icons");
-       define('ICONS_URL', "icons");
+       define('ICONS_DIR', "feed-icons");
+       define('ICONS_URL', "feed-icons");
        // Local and URL path to the directory, where feed favicons are stored.
        // Unless you really know what you're doing, please keep those relative
        // to tt-rss main directory.
-       // Please note that Apache may reserve /icons/ URL to itself so you might
-       // need to change this and rename icons/ directory if you install tt-rss
-       // into website root.
 
-       define('SINGLE_USER_MODE', true);
-       // Operate in single user mode, disables all functionality related to
-       // multiple users.
-       
        define('TMP_DIRECTORY', '/tmp');
        // Directory for temporary files
 
-       define('ENABLE_UPDATE_DAEMON', false);
-       // This enables different mechanism for user-triggered updates designed
-       // for update daemon running in background on the server.
-       // This option suggests FEEDS_FRAME_REFRESH set to a small value 
-       // (like 60 seconds, depending on number of users and server/bandwidth load).
-
        define('DAEMON_SLEEP_INTERVAL', 120);
        // Interval between update daemon update runs
 
@@ -94,15 +85,6 @@
        // 0 - Magpie
        // 1 - SimplePie
 
-       define('SIMPLEPIE_CACHE_DIR',   'cache/simplepie');
-       // Cache directory for RSS feeds when using SimplePie
-
-       define('SIMPLEPIE_CACHE_IMAGES', false);
-       // Allow caching feed images when using SimplePie, to bypass hotlink
-       // prevention and such at expense of local disk space and bandwidth.
-       // Note that you (or your users) also have to enable image caching 
-       // in feed editor.
-       
        define('COUNTERS_MAX_AGE', 365);
        // Hard limit for unread counters calculation. Try tweaking this
        // parameter to speed up tt-rss when having a huge number of articles
@@ -183,7 +165,8 @@
        // Please see http://tt-rss.org/wiki/SphinxSearch for more information.
 
        define('SPHINX_INDEX', 'ttrss');
-       // Index name in Sphinx configuration
+       // Index name in Sphinx configuration. You can specify multiple indexes
+       // as a comma-separated string.
 
        define('ENABLE_TWEET_BUTTON', false);
        // Enable 'tweet this' button for articles
@@ -194,14 +177,18 @@
        // http://twitter.com/oauth_clients to register your instance.
 
        define('PUBSUBHUBBUB_HUB', '');
-       // URL to a PubSubHubbub-compatible hub server. If defined, Published
-       // articles generated feeds would automatically become PUSH-enabled.
+       // URL to a PubSubHubbub-compatible hub server. If defined, "Published
+       // articles" generated feed would automatically become PUSH-enabled.
+
+       define('PUBSUBHUBBUB_ENABLED', true);
+       // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
+       // won't try to subscribe to PUSH feed updates.
 
        define('ISCONFIGURED', false);
        // Please set this to true if you have read everything above and
        // finished setting configuration options.
 
-       define('CONFIG_VERSION', 22);
+       define('CONFIG_VERSION', 23);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).