[Pkg-owncloud-commits] [owncloud-doc] 120/270: Merge pull request #360 from aykit/stable6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit d04393e4765356972f84d685a9809abececfc3dd
Author: Volkan Gezer <wakeup at users.noreply.github.com>
Date:   Fri May 30 21:40:46 2014 +0200

    Merge pull request #360 from aykit/stable6
    
    Changed configuring_big_file_upload.rst to reflect .htaccess, ...
    Conflicts:
    	admin_manual/configuration/configuring_big_file_upload.rst
    
    Conflicts:
    	admin_manual/configuration/configuring_big_file_upload.rst
---
 .../configuration/configuring_big_file_upload.rst  | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/admin_manual/configuration/configuring_big_file_upload.rst b/admin_manual/configuration/configuring_big_file_upload.rst
index 551ab15..24129b9 100644
--- a/admin_manual/configuration/configuring_big_file_upload.rst
+++ b/admin_manual/configuration/configuring_big_file_upload.rst
@@ -14,6 +14,7 @@ Other recommendable preconditions:
 
 * Make sure, that the latest version of PHP (at least 5.4.9) is installed
 * Disable user quota. This means: set the user quota of the account, you are currently logged in, to "unlimited".
+
 This is important, because you possibly could not watch otherwise, whether the desired changes take effect.
 
 Enabling uploading big files
@@ -25,7 +26,14 @@ Note: The order of the following steps is important! If you swap steps described
 * Under "File handling" set the Maximum upload size to the desired value (e.g. 16GB)
 * Click the "save"-Button
 
-**Open the php.ini - file**
+**Configuring your webserver**
+
+ownCloud comes with a .htaccess - file which propagates all config to your webserver. To adapt those settings go to the ownCloud - Folder on your server and set the following two parameters inside the .htaccess file:
+
+* ``upload_max_filesize = 16G``   (e.g., to stay consistent with the example value above)
+* ``post_max_size = 16G``   (e.g., to stay consistent with the example value above)
+
+If you don't want to use the shipped .htaccess - file, outcomment those options there and edit them in your global php.ini file:
 
 You can easily learn the loaded configuration file by saving ``<?php phpinfo(); ?>`` code piece
 into a php file and calling it with your browser. Then look for the **Loaded Configuration File** value.
@@ -35,17 +43,18 @@ Alternatively:
 * Under Debian or SUSE and their derivatives this file lies at /etc/php5/apache2/php.ini
 * On Windows, you can find this file within C:/Program Files (x86)/PHP/PHP.ini 
 
+Set the following two parameters inside the php.ini to the same value as chosen inside the admin-section one step before:
+
+* ``upload_max_filesize = 16G``   (e.g., to stay consistent with the example value above)
+* ``post_max_size = 16G``   (e.g., to stay consistent with the example value above)
 
-**Do the following:**
+**Output Buffering** allows you to get performance benefits in some setups. Please make sure you know what you are doing before using it in production. As previously mentioned, add this option in your .htaccess file or edit your php.ini file:
 
-* Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:
-* upload_max_filesize = 16G   (e.g., to stay consistent with the example value above)
-* post_max_size = 16G   (e.g., to stay consistent with the example value above)
-* output_buffering = 16384	(e.g., to stay consistent with the example value above)
+* ``output_buffering = 16384``	(e.g., to stay consistent with the example value above)
 
-whereas the "output_buffering" has to be given in MegaBytes but as a plain figure (without size-units as 'M' or 'G')
+As you can see, the "output_buffering" has to be given in MegaBytes but as a plain figure (without size-units as 'M' or 'G')
 
-These client configurations have been proven by testing maximum file sizes of 16 GB:
+**These client configurations have been proven by testing maximum file sizes of 16 GB:**
 
 * Linux 32 Bit: Ubuntu, Firefox => 16GB 
 * Windows 8  64 Bit: Google Chrome => 8GB

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git