aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-04-29 15:31:51 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-04-29 15:31:51 -0300
commit963e3e0b8811326115aaac9ef5207c99e35806c0 (patch)
tree912ef5d48120d53030faed95b518a1daebf4a268 /guides
parentb1049e7fad57981f2f2b2c94c27d912e04cc965f (diff)
parent58911cccbfb65b050d85270d1f447a957e3110dc (diff)
downloadrails-963e3e0b8811326115aaac9ef5207c99e35806c0.tar.gz
rails-963e3e0b8811326115aaac9ef5207c99e35806c0.tar.bz2
rails-963e3e0b8811326115aaac9ef5207c99e35806c0.zip
Merge pull request #24787 from connorshea/patch-1
Patch 1
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md4
-rw-r--r--guides/source/configuring.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index bb04e5e94c..93acebf000 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -1115,8 +1115,8 @@ assets.
### Serving GZipped version of assets
By default, gzipped version of compiled assets will be generated, along
-with the non-gzipped version of assets. Gzipped assets help reduce, the transmission of
-date over the wire. You can configure this by setting the `gzip` flag.
+with the non-gzipped version of assets. Gzipped assets help reduce the transmission of
+data over the wire. You can configure this by setting the `gzip` flag.
```ruby
config.assets.gzip = false # disable gzipped assets generation
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index b22dc27743..6728e0ea76 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -163,7 +163,7 @@ pipeline is enabled. It is set to true by default.
* `config.assets.js_compressor` defines the JavaScript compressor to use. Possible values are `:closure`, `:uglifier` and `:yui` which require the use of the `closure-compiler`, `uglifier` or `yui-compressor` gems respectively.
-* `config.assets.gzip` a flag that enables the creation of gziped version of compiled assets, along with non-gziped assets. Set to `true` by default.
+* `config.assets.gzip` a flag that enables the creation of gzipped version of compiled assets, along with non-gzipped assets. Set to `true` by default.
* `config.assets.paths` contains the paths which are used to look for assets. Appending paths to this configuration option will cause those paths to be used in the search for assets.