aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-15 10:54:52 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-15 10:54:52 -0400
commit75f141553d1648f5f69332313fd4541da7f60998 (patch)
tree25148283ad284ef0032b8510687b526a0ce83d36 /guides
parent810c3cf6ab517f7c8ffea5a60435d691f2ee47b2 (diff)
parent62a5d8ad08d0181c2243d7febe66b4d336cf133d (diff)
downloadrails-75f141553d1648f5f69332313fd4541da7f60998.tar.gz
rails-75f141553d1648f5f69332313fd4541da7f60998.tar.bz2
rails-75f141553d1648f5f69332313fd4541da7f60998.zip
Merge pull request #19766 from blasterpal/small_typo_in_asset_pipeline
Correct small typo.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index d9dfd85860..4a610e8458 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -643,7 +643,7 @@ above. By default Rails assumes assets have been precompiled and will be
served as static assets by your web server.
During the precompilation phase an MD5 is generated from the contents of the
-compiled files, and inserted into the filenames as they are written to disc.
+compiled files, and inserted into the filenames as they are written to disk.
These fingerprinted names are used by the Rails helpers in place of the manifest
name.