Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/adapter_test.rb
	guides/source/testing.md

[ci skip]

1 files changed, 30 insertions, 2 deletions

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index e939606c88..448f0e1f9a 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -547,7 +547,35 @@ This directive is available if the core module that provides this feature was co
 
 If you're compiling nginx with Phusion Passenger you'll need to pass that option when prompted.
 
-A robust configuration for Apache is possible but tricky; please Google around. (Or help update this Guide if you have a good example configuration for Apache.)
+Apache is also able to serve the [gzipped](http://en.wikipedia.org/wiki/Gzip) version of your assets; however, it requires a bit more work:
+
+```apache
+<LocationMatch "^/assets/.*$">
+  Header unset ETag
+  FileETag None
+
+  # RFC says only cache for 1 year
+  ExpiresActive On
+  ExpiresDefault "access plus 1 year"
+
+  RewriteEngine	On
+  RewriteCond %{HTTP:Accept-Encoding} gzip
+  RewriteCond %{HTTP_USER_AGENT} !Konqueror
+  RewriteCond %{REQUEST_FILENAME}.gz -f
+  RewriteRule ^(.+).(css|js)$ $1.$2.gz [QSA,L]
+</LocationMatch>
+
+<FilesMatch \.css\.gz>
+  ForceType text/css
+</FilesMatch>
+
+<FilesMatch \.js\.gz>
+  ForceType application/javascript
+</FilesMatch>
+AddEncoding gzip .gz
+```
+
+NOTE: You will need to make sure `mod_headers`, `mod_mime` and `mod_rewrite` are loaded; otherwise, the above configuration will fail.
 
 ### Local Precompilation
 
@@ -740,7 +768,7 @@ end
 ```
 
 Now that you have a `Template` class, it's time to associate it with an
-extenstion for template files:
+extension for template files:
 
 ```ruby
 Sprockets.register_engine '.bang', BangBang::Template