From 34ff0bdd39dbd73a97e57b64744e1e3fa06d3ace Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Tue, 10 Nov 2009 17:56:53 +0000
Subject: [PATCH] explain we cannot really run SS in a subdirectory and remove
 root option from dist config

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@539 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 data/config.php.dist | 18 +++++-------------
 doc/UPGRADE.txt      |  5 +++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/data/config.php.dist b/data/config.php.dist
index 9fc37ca..6439478 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -21,19 +21,6 @@ $sitename = 'SemanticScuttle';
  */
 $welcomeMessage = 'Welcome to SemanticScuttle! Social bookmarking for small communities.';
 
-/**
- * SemanticScuttle root directory.
- *
- * Set to NULL to autodetect the root url of the website.
- *
- * If your installation is in a subdirectory like
- * "http://www.example.com/semanticscuttle/" then
- * replace NULL by your address (between "" and with trailing '/')
- *
- * @var string
- */
-$root = null;
-
 /**
  * Translation from locales/ folder.
  *
@@ -128,4 +115,9 @@ $adminemail = 'admin@example.org';
  */
 $admin_users = array();
 
+
+/**
+* You have completed the basic configuration!
+* More options can be found in config.default.php.
+*/
 ?>
diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index 4891ba1..1aec5f4 100644
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -8,6 +8,11 @@ to previous versions. We recommend that you start with a
 fresh installation, just copying over your config.php file.
 Set your web server document root directory to www/.
 
+Yes, we kind of lost the ability to run SemanticScuttle
+in a subdirectory of a hostname. This functionality will
+be back in one of the next releases, but for now, you have
+to live with it.
+
 Update your database:
 - ALTER TABLE `sc_bookmarks` ADD `bVoting` INT NOT NULL;
 - ALTER TABLE `sc_bookmarks` ADD `bVotes` INT NOT NULL;