updated docs

4 files changed, 68 insertions, 50 deletions

diff --git a/docs/FAQs b/docs/FAQs
index d766192b99d..f1e6149c48c 100755
--- a/docs/FAQs
+++ b/docs/FAQs
@@ -2,7 +2,7 @@
 		Ofcourse it is supported. The problem lies with the PHP configuration. If you have access to php.ini file (which resides in /etc/php5/apache2 folder) then you can fix this issue by changing the following lines :
 							; Maximum allowed size for uploaded files.
 							upload_max_filesize = 2M
-	In place of 2M write the maximum size you want to be allowed.
-
-2. I tried to install the ownCloud in some XYZ directory but its not working.
-	Unfortunately ownCloud can be installed into your default Apache directory only which is /var/www/ for most of the distributions.
+							
+		Also look for the following line:
+							post_max_size= 2M
+	In place of 2M write the maximum size you want to be allowed.
\ No newline at end of file
diff --git a/docs/INSTALL b/docs/INSTALL
index de04e6ff1d4..970af77574c 100755
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -1,31 +1,25 @@
+also see http://owncloud.org/index.php/Installation
+
 == PREREQUISITS ==
 php5
-sqlite
+sqlite or mysql
 
 == SETUP ==
 Place owncloud in a subdirectory of your web server. Go to that directory with
 a web browser and the first run wizard should take it from there.
-Set up your paths in:
-config/config.php
 Check out config/config.sample.php for details if you want to set config.php manually.
 
-Your data will be in:
-$CONFIG_DATADIRECTORY = '/www/testy';
-Apache needs to have write permissions to this directory.
-
-And the ownCloud path is:
-$CONFIG_DOCUMENTROOT = '/www/owncloud/htdocs';
-The ownCloud checkout should be in the root of "htdocs".
-
-Both are absolute paths, so if your server is in /var/www, you need to add the /var
-
 == Database ==
-The database is sqlite. If you are having trouble make sure that the line
+--SQLite--
+When sqlite is chosen. If you are having trouble make sure that the line
 
 extension=sqlite.so
 
 appears in your php.ini
 
+--MySQL--
+when mysql is chosen, you can let ownCloud create the database and user when you have administrator credentials for mysql.
+
 
 Please help improving this documentation!
 Create merge requests at gitorious.org/owncloud .
diff --git a/docs/TODO b/docs/TODO
index aba8f8345a9..0bbca7c2dab 100755
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,11 +1,5 @@
-- write installation documentation
-
-- better ajax web gui
-
 - internationalizing of the web gui
 
-- write support for web gui
-
 - themed webgui to match plasma theme
 
 - plugin system
@@ -15,8 +9,6 @@
 
 - create a versioning backend
 
-- create an automatic backup system to store files an a second device/server
-
 - create a usermanagement to share data
 
 
diff --git a/docs/owncloud.sql b/docs/owncloud.sql
index 1f2b0a1b552..94e500bf004 100755
--- a/docs/owncloud.sql
+++ b/docs/owncloud.sql
@@ -1,29 +1,61 @@
-CREATE TABLE 'locks' (
-  'token' VARCHAR(255) NOT NULL DEFAULT '',
-  'path' varchar(200) NOT NULL DEFAULT '',
-  'created' int(11) NOT NULL DEFAULT '0',
-  'modified' int(11) NOT NULL DEFAULT '0',
-  'expires' int(11) NOT NULL DEFAULT '0',
-  'owner' varchar(200) DEFAULT NULL,
-  'recursive' int(11) DEFAULT '0',
-  'writelock' int(11) DEFAULT '0',
-  'exclusivelock' int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY ('token'),
-  UNIQUE ('token')
- );
+CREATE TABLE IF NOT EXISTS `locks` (
+  `token` varchar(255) NOT NULL DEFAULT '',
+  `path` varchar(200) NOT NULL DEFAULT '',
+  `created` int(11) NOT NULL DEFAULT '0',
+  `modified` int(11) NOT NULL DEFAULT '0',
+  `expires` int(11) NOT NULL DEFAULT '0',
+  `owner` varchar(200) DEFAULT NULL,
+  `recursive` int(11) DEFAULT '0',
+  `writelock` int(11) DEFAULT '0',
+  `exclusivelock` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`token`),
+  UNIQUE KEY `token` (`token`),
+  KEY `path` (`path`),
+  KEY `path_2` (`path`),
+  KEY `path_3` (`path`,`token`),
+  KEY `expires` (`expires`)
+);
+
+CREATE TABLE IF NOT EXISTS `log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `timestamp` int(11) NOT NULL,
+  `user` varchar(250) NOT NULL,
+  `type` int(11) NOT NULL,
+  `message` varchar(250) NOT NULL,
+  PRIMARY KEY (`id`)
+);
 
-CREATE TABLE 'log' (
-  'timestamp' int(11) NOT NULL,
-  'user' varchar(250) NOT NULL,
-  'type' int(11) NOT NULL,
-  'message' varchar(250) NOT NULL
+
+CREATE TABLE IF NOT EXISTS `properties` (
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(120) NOT NULL DEFAULT '',
+  `ns` varchar(120) NOT NULL DEFAULT 'DAV:',
+  `value` text,
+  PRIMARY KEY (`path`,`name`,`ns`),
+  KEY `path` (`path`)
 );
 
+CREATE TABLE IF NOT EXISTS  `users` (
+`user_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`user_name` VARCHAR( 64 ) NOT NULL ,
+`user_name_clean` VARCHAR( 64 ) NOT NULL ,
+`user_password` VARCHAR( 340) NOT NULL ,
+UNIQUE (
+`user_name` ,
+`user_name_clean`
+)
+);
 
-CREATE TABLE  'properties' (
-  'path' varchar(255) NOT NULL DEFAULT '',
-  'name' varchar(120) NOT NULL DEFAULT '',
-  'ns' varchar(120) NOT NULL DEFAULT 'DAV:',
-  'value' text,
-  PRIMARY KEY ('path','name','ns')
+CREATE TABLE IF NOT EXISTS  `groups` (
+`group_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`group_name` VARCHAR( 64 ) NOT NULL ,
+UNIQUE (
+`group_name`
+)
 );
+
+CREATE TABLE IF NOT EXISTS  `user_group` (
+`user_group_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`user_id` VARCHAR( 64 ) NOT NULL ,
+`group_id` VARCHAR( 64 ) NOT NULL
+)
\ No newline at end of file