Merge d5467e7233 into 2a8b1f9ec2

.htaccess

@@ -6,14 +6,12 @@ Options -Indexes
 #<IfModule mod_php5.c>
 #	php_value max_execution_time 200
 #	php_value post_max_size 200M
-#	php_value upload_max_size 200M
 #	php_value upload_max_filesize 20M
 #	php_value max_file_uploads 100
 #</IfModule>
 #<IfModule mod_php7.c>
 #	php_value max_execution_time 200
 #	php_value post_max_size 200M
-#	php_value upload_max_size 200M
 #	php_value upload_max_filesize 20M
 #	php_value max_file_uploads 100
 #</IfModule>
@@ -23,4 +21,4 @@ Options -Indexes
 # ---
 #Header add Access-Control-Allow-Origin "*"
 #Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type"
-#Header add Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS"
+#Header add Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS"

.user.ini

@@ -3,6 +3,5 @@
 
 ;max_execution_time = 200
 ;post_max_size = 200M
-;upload_max_size = 200M
 ;upload_max_filesize = 20M
 ;max_file_uploads = 200

docs/FAQ.md

@@ -11,7 +11,6 @@ If possible, change these settings directly in your `php.ini`. We recommend to i
 
 	max_execution_time = 200
 	post_max_size = 100M
-	upload_max_size = 100M
 	upload_max_filesize = 20M
 	memory_limit = 256M
 
@@ -58,4 +57,4 @@ There's a problem with images compressed by ImageOptim. [Read more.](https://git
 [#455](https://github.com/electerious/Lychee/issues/455)
 
 #### How to reset username and password?
-Simply delete the whole `lychee_settings` table from the database. Lychee will regenerate it and ask you to enter a new username and password.
+Simply delete the whole `lychee_settings` table from the database. Lychee will regenerate it and ask you to enter a new username and password.

docs/Installation.md

@@ -9,7 +9,6 @@ To use Lychee without restrictions, we recommend to increase the values of the f
 
 	max_execution_time = 200
 	post_max_size = 100M
-	upload_max_size = 100M
 	upload_max_filesize = 20M
 	memory_limit = 256M