merge Adityas improvements

5 files changed, 41 insertions, 4 deletions

diff --git a/config/config.php b/config/config.php
index 170006a6969..acb6c3546c6 100755..100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,2 +1,2 @@
-<?php 
-?> 
+<?php
+?>
diff --git a/config/config.sample.php b/config/config.sample.php
new file mode 100755
index 00000000000..dfaaa4284d6
--- /dev/null
+++ b/config/config.sample.php
@@ -0,0 +1,11 @@
+<?php 
+$CONFIG_ADMINLOGIN='admin-username';
+$CONFIG_ADMINPASSWORD='password';
+$CONFIG_DATADIRECTORY='write/absolute-drectory/path/here/';
+$CONFIG_HTTPFORCESSL=false;
+$CONFIG_DATEFORMAT='j M Y G:i';
+$CONFIG_DBHOST='localhost';
+$CONFIG_DBNAME='owncloud-db-name';
+$CONFIG_DBUSER='user-name';
+$CONFIG_DBPASSWORD='password';
+?>
diff --git a/docs/FAQs b/docs/FAQs
new file mode 100644
index 00000000000..d766192b99d
--- /dev/null
+++ b/docs/FAQs
@@ -0,0 +1,8 @@
+1. I am not able to upload large files. Is that not supported by ownCloud?
+		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.
diff --git a/docs/INSTALL b/docs/INSTALL
index f8509f363a2..de04e6ff1d4 100755
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -5,7 +5,19 @@ sqlite
 == 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
@@ -18,3 +30,7 @@ appears in your php.ini
 Please help improving this documentation!
 Create merge requests at gitorious.org/owncloud .
 
+Read the FAQs for some common problems.
+For support check out our IRC at Freenode : Channel #owncloud
+Mailing list at https://mail.kde.org/mailman/listinfo/owncloud
+
diff --git a/index.php b/index.php
index 08d94c6079d..dd613f2854f 100755
--- a/index.php
+++ b/index.php
@@ -28,14 +28,16 @@ if(isset($_GET['dir'])) $dir=$_GET['dir']; else $dir='';
 if(isset($_GET['file'])) {
 
   OC_FILES::get($dir,$_GET['file']);
-
+OC_FILES::get($dir,$_GET['file']);
+OC_FILES::get($dir,$_GET['file']);
+echo('heya');
 }else{
 
   OC_UTIL::addscript('js/ajax.js');
   OC_UTIL::showheader();
 
   OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir);
-
+echo('hi');
   echo('<br /><br /><p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php</a></p>');
 
   OC_UTIL::showfooter();