Updated installation instructions

3 files changed, 35 insertions, 29 deletions

diff --git a/INSTALL b/INSTALL
index 92b8bee0d..645f588ed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,18 @@
 
+REQUIREMENTS
+============
+
+* The Apache Webserver
+* .htaccess support allowing overrides for DirectoryIndex
+* PHP Version 4.3.1 or greater
+* PCRE (perl compatible regular expression) installed with PHP
+* php.ini options:
+   - error_reporting E_ALL & ~E_NOTICE (or lower)
+   - file_uploads on (for attachment upload features)
+* A MySQL or PostgreSQL database engine or the SQLite extension for PHP
+* A database with permission to create tables
+
+
 INSTALLATION
 ============
 
@@ -31,6 +45,10 @@ roundcube user. Here is an example of that procedure:
 > quit
 # mysql roundcubemail < SQL/mysql.initial.sql
 
+For MySQL version 4.1 and up, it's recommended to create the database for
+RoundCube with the following command:
+> CREATE DATABASE `roundcube` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
 
 * SQLite
 --------
@@ -64,28 +82,16 @@ versions don't have a -O option for the createdb, so if you are
 using that version you'll have to change ownership of the DB later.
 
 
+CONFIGURATION
+=============
+
+Change the files in config/* according your to environment and your needs.
+Details about the config paramaters can be found in the config files.
+
+
 UPGRADING
 =========
 If you already have a previous version of RoundCube installed,
 please refer to the instructions in UPGRADING guide.
 
 
-REQUIREMENTS
-============
-
-* The Apache Webserver
-* .htaccess support allowing overrides for DirectoryIndex
-* PHP Version 4.3.1 or greater
-* PCRE (perl compatible regular expression) installed with PHP
-* php.ini options:
-   - error_reporting E_ALL & ~E_NOTICE (or lower)
-   - file_uploads on (for attachment upload features)
-* A MySQL or PostgreSQL database engine or the SQLite extension for PHP
-* A database with permission to create tables
-
-
-CONFIGURATION
-=============
-
-Change the files in config/* according your to environment and your needs.
-Details about the config paramaters can be found in the config files.
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index acaac7bdf..9e3ee2758 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail initial database structure
--- Version 0.1a
+-- Version 0.1b
 -- 
 
 -- --------------------------------------------------------
@@ -19,7 +19,7 @@ CREATE TABLE `cache` (
   KEY `user_id` (`user_id`),
   KEY `cache_key` (`cache_key`),
   KEY `session_id` (`session_id`)
-) TYPE=MyISAM;
+);
 
 -- --------------------------------------------------------
 
@@ -39,7 +39,7 @@ CREATE TABLE `contacts` (
   `vcard` text NOT NULL,
   PRIMARY KEY  (`contact_id`),
   KEY `user_id` (`user_id`)
-) TYPE=MyISAM;
+);
 
 -- --------------------------------------------------------
 
@@ -60,7 +60,7 @@ CREATE TABLE `identities` (
   `signature` text NOT NULL,
   PRIMARY KEY  (`identity_id`),
   KEY `user_id` (`user_id`)
-) TYPE=MyISAM;
+);
 
 -- --------------------------------------------------------
 
@@ -75,7 +75,7 @@ CREATE TABLE `session` (
   `ip` VARCHAR(15) NOT NULL default '',
   `vars` text NOT NULL,
   PRIMARY KEY  (`sess_id`)
-) TYPE=MyISAM;
+);
 
 -- --------------------------------------------------------
 
@@ -93,7 +93,7 @@ CREATE TABLE `users` (
   `language` varchar(5) NOT NULL default 'en',
   `preferences` text NOT NULL default '',
   PRIMARY KEY  (`user_id`)
-) TYPE=MyISAM;
+);
 
 -- --------------------------------------------------------
 
@@ -122,6 +122,6 @@ CREATE TABLE `messages` (
   KEY `cache_key` (`cache_key`),
   KEY `idx` (`idx`),
   KEY `uid` (`uid`)
-) TYPE=MyISAM;
+);
 
 
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index e140a94a3..7fa296b0b 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail update script for MySQL databases
--- Version 0.1-20051007
+-- Updates from version 0.1-20051007
 
 
 ALTER TABLE `session` ADD `ip` VARCHAR(15) NOT NULL AFTER changed;
@@ -8,7 +8,7 @@ ALTER TABLE `users` ADD `alias` VARCHAR(128) NOT NULL AFTER mail_host;
 
 
 -- RoundCube Webmail update script for MySQL databases
--- Version 0.1-20051021
+-- Updates from version 0.1-20051021
 
 ALTER TABLE `session` CHANGE `sess_id` `sess_id` VARCHAR(40) NOT NULL;
 
@@ -52,6 +52,6 @@ CREATE TABLE `messages` (
 
 
 -- RoundCube Webmail update script for MySQL databases
--- Version 0.1-20051216
+-- Updates from version 0.1-20051216
 
 ALTER TABLE `messages` ADD `created` DATETIME NOT NULL AFTER `cache_key` ;