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

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.
 

include/sanity_check.php

@@ -95,7 +95,7 @@
 				}
 			}
 
-			if (SELF_URL_PATH == "http://yourserver/tt-rss/") {
+			if (SELF_URL_PATH == "http://example.org/tt-rss/") {
 				$urlpath = preg_replace("/\w+\.php$/", "", make_self_url_path());
 
 				array_push($errors,