Merge pull request #1071 from mikealmond/master

Add some MIME-types (JSON, JSONP, audio, video and flash), a note about a custom 404-file and a PHP flag (magic_quotes_gpc)

.htaccess

@@ -92,16 +92,18 @@
 # JavaScript
 #   Normalize to standard type (it's sniffed in IE anyways)
 #   tools.ietf.org/html/rfc4329#section-7.2
-AddType application/javascript         js
+AddType application/javascript         js jsonp
+AddType application/json               json
 
 # Audio
 AddType audio/ogg                      oga ogg
-AddType audio/mp4                      m4a
+AddType audio/mp4                      m4a f4a f4b
 
 # Video
 AddType video/ogg                      ogv
-AddType video/mp4                      mp4 m4v
+AddType video/mp4                      mp4 m4v f4v f4p 
 AddType video/webm                     webm
+AddType video/x-flv                    flv
 
 # SVG
 #   Required for svg webfonts on iPad
@@ -127,6 +129,7 @@ AddType application/x-xpinstall             xpi
 AddType application/octet-stream            safariextz
 AddType application/x-web-app-manifest+json webapp
 AddType text/x-vcard                        vcf
+AddType application/x-shockwave-flash       swf
 
 
 
@@ -423,6 +426,8 @@ Options -MultiViews
 # ----------------------------------------------------------------------
 
 # You can add custom pages to handle 500 or 403 pretty easily, if you like.
+# If you are hosting your site in subdirectory, adjust this accordingly
+#    e.g. ErrorDocument 404 /subdir/404.html
 ErrorDocument 404 /404.html
 
 
@@ -497,6 +502,9 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
 # Rename session cookie to something else, than PHPSESSID
 # php_value session.name sid
 
+# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
+# php_flag magic_quotes_gpc Off
+
 # Do not show you are using PHP
 # Note: Move this line to php.ini since it won't work in .htaccess
 # php_flag expose_php Off