X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=config.php-dist;h=ac4e098c536c4de0cd10b0de932ed11b740ad44e;hb=3a0292303e453f38204279b5d1c978a4b9c367e9;hp=2eaaab6173de0d68bb01243338346957399abf7f;hpb=f5e66c439e9c8881d745499243341b4095274c12;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
old mode 100644
new mode 100755
index 2eaaab61..ac4e098c
--- a/config.php-dist
+++ b/config.php-dist
@@ -23,13 +23,6 @@
 	// 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.
-
-	define('FEED_CRYPT_KEY', '');
-	// Key used for encryption of 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
@@ -94,16 +87,6 @@
 	// intervals is disabled and all articles (which are not starred) 
 	// older than this amount of days are purged.
 
-	// *** PubSubHubbub settings ***
-
-	define('PUBSUBHUBBUB_HUB', '');
-	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
-	// articles" generated feed would automatically become PUSH-enabled.
-
-	define('PUBSUBHUBBUB_ENABLED', false);
-	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
-	// won't try to subscribe to PUSH feed updates.
-
 	// ****************************
 	// *** Sphinx search plugin ***
 	// ****************************
@@ -190,10 +173,12 @@
 	// reset password link on the login form.
 	
 	define('LOG_DESTINATION', 'sql');
-	// Log destination to use. Possible values: sql (uses internal logging
+	// Error log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
 	// Setting this to blank uses PHP logging (usually to http server 
 	// error.log).
+	// Note that feed updating daemons don't use this logging facility
+	// for normal output.
 
 	define('CONFIG_VERSION', 26);
 	// Expected config version. Please update this option in config.php