summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2009-11-10 17:56:53 +0000
committercweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2009-11-10 17:56:53 +0000
commit34ff0bdd39dbd73a97e57b64744e1e3fa06d3ace (patch)
tree61dcce75d8908b332c2b002a472053ed732c668e
parent807df0a7249133dbf153d0243e471281d6c82ae4 (diff)
downloadsemanticscuttle-34ff0bdd39dbd73a97e57b64744e1e3fa06d3ace.tar.gz
semanticscuttle-34ff0bdd39dbd73a97e57b64744e1e3fa06d3ace.tar.bz2
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
-rw-r--r--data/config.php.dist18
-rw-r--r--doc/UPGRADE.txt5
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
@@ -22,19 +22,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.
*
* Examples: de_DE, en_GB, fr_FR
@@ -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;