update eclipse .settings

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

diff --git a/config.php-dist b/config.php-dist
index 1fc384c74fbef57fac31a44c4c8240cca659b54e..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,9 +7,11 @@
        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('SINGLE_USER_MODE', true);
        // Operate in single user mode, disables all functionality related to
@@ -26,14 +26,11 @@
        // 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('TMP_DIRECTORY', '/tmp');
        // Directory for temporary files
@@ -180,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).