diff --git a/README.md b/README.md
index c37f1c36..7fc4c2c9 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,32 @@ An Open Source, web based, CATI system
queXS can operate your outbound telephone research centre. It integrates with the Asterisk VoIP Server, uses AAPOR Standard Outcome codes and only requires a web browser to operate.
+Unless otherwise stated in the code, the code for queXS is licenced under the GPL-v2. All included code has been checked for compatability with this licence.
+
Development for queXS occurs on Launchpad: https://launchpad.net/quexs
+
+##Upgrades
+
+If you have a previous version of queXS installed, please check the CHANGELOG file for details of how to upgrade
+
+##Requirements
+
+`apt-get install php5 mysql-server php5-mysql unzip php5-mbstring
+
+##Installation (from 1.14.0)
+
+```
+#Download and extract queXS to your webroot
+unzip quexs-1.14.0.zip -d /var/www/html
+#Create a MySQL/mariadb database
+mysqladmin create quexs
+#Import the database structure from the database/quexs.sql file
+mysql -uroot quexs < database/quexs.sql
+#Install the timezone database
+mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
+#Create the default config file
+cp config.inc.local.php.example config.inc.local.php
+```
+
+Then browse to the queXS URL and login using the default credentials (admin/password)
+
diff --git a/config.inc.local.php.example b/config.inc.local.php.example
index e77296b6..2bdb8273 100644
--- a/config.inc.local.php.example
+++ b/config.inc.local.php.example
@@ -60,8 +60,8 @@ define('QUEXS_PATH', '/quexs/');
/**
* Database configuration for queXS
*/
-define('DB_USER', 'quexs');
-define('DB_PASS', 'quexs');
+define('DB_USER', 'root');
+define('DB_PASS', '');
define('DB_HOST', 'localhost');
define('DB_NAME', 'quexs');
diff --git a/include/limesurvey/common.php b/include/limesurvey/common.php
index 64dda7e0..248f5cb5 100644
--- a/include/limesurvey/common.php
+++ b/include/limesurvey/common.php
@@ -231,12 +231,12 @@ if ($databasetype=='odbc_mssql' || $databasetype=='odbtp' || $databasetype=='mss
//check if database exist and access is not via install script
if (!$database_exists && !$cmd_install && (strcasecmp($slashlesspath,str_replace(array("\\", "/"), "", $homedir."install")) != 0)) {
- die ("
The LimeSurvey database does not exist. Please run the install script to create the necessary database.");
+ die ("
The queXS/LimeSurvey database does not exist. Please read the README.md file for details of how to create the necessary database.");
}
// Check if the DB is up to date and access is not via install script
if ($dbexistsbutempty && !$cmd_install && (strcasecmp($slashlesspath,str_replace(array("\\", "/"), "", $homedir."install")) != 0)) {
- die ("
The LimeSurvey database does exist but it seems to be empty. Please run the install script to create the necessary tables.");
+ die ("
The queXS/LimeSurvey database does exist but it seems to be empty. Please read the README.md to create the necessary tables.");
}
// Default global values that should not appear in config-defaults.php