Merge branch 'master' into hotfix/ie

docs/FAQ.md

@@ -6,13 +6,13 @@ To run Lychee, everything you need is a web-server with PHP 5.3 or later and a M
 
 #### I can't upload photos
 If you experience problems uploading large photos, you might want to change the PHP parameters in `.htaccess` (if you are using the PHP Apache module) or in `.user.ini` (if you are using PHP >= 5.3 with CGI or FastCGI).
+
 If possible, change these settings directly in your `php.ini`. We recommend to increase the values of the following properties:
 
 	max_execution_time = 200
-	post_max_size = 200M
-	upload_max_size = 200M
+	post_max_size = 100M
+	upload_max_size = 100M
 	upload_max_filesize = 20M
-	max_file_uploads = 100
 	memory_limit = 256M
 
 #### Which browsers are supported?
@@ -45,5 +45,8 @@ No. Video support is not planned.
 #### Is it possible to create multiple users?
 [No, not yet.](https://github.com/electerious/Lychee/issues/132)
 
+#### Does Lychee use ImageMagick?
+Yes. Lychee uses ImageMagick when available.
+
 #### Blank screen when viewing a photo using iOS
 There's a problem with images compressed by ImageOptim. [Read more.](https://github.com/electerious/Lychee/issues/175#issuecomment-47403992)

docs/Installation.md

@@ -5,6 +5,14 @@ The following PHP extensions must be activated:
 
 	exif, gd, json, mbstring, mysqli, zip
 	
+To use Lychee without restrictions, we recommend to increase the values of the following properties in `php.ini`:
+
+	max_execution_time = 200
+	post_max_size = 100M
+	upload_max_size = 100M
+	upload_max_filesize = 20M
+	memory_limit = 256M
+	
 You might also take a look at [Issue #106](https://github.com/electerious/Lychee/issues/106) if you are using nginx or in the [FAQ](https://github.com/electerious/Lychee/blob/master/docs/FAQ.md#i-cant-upload-multiple-photos-at-once) if you are using CGI or FastCGI.
 	
 ### 2. Download