aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-09-27 13:55:41 -0700
committerXavier Noria <fxn@hashref.com>2011-09-27 13:55:41 -0700
commit41c8277a9b04dda40972bbafa2dbfc00c5c238fb (patch)
tree3cf799c13324ffb4e2e26678ff4a5e1fde7495bc /railties
parentc612183ad19f2c11eb58e4393a759a1016ce4c05 (diff)
downloadrails-41c8277a9b04dda40972bbafa2dbfc00c5c238fb.tar.gz
rails-41c8277a9b04dda40972bbafa2dbfc00c5c238fb.tar.bz2
rails-41c8277a9b04dda40972bbafa2dbfc00c5c238fb.zip
the infamous detail only spotted in GitHub diffs no matter how careful you were before pushing
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/source/asset_pipeline.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index c5bbe3226a..8a15618eb2 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -219,7 +219,7 @@ NOTE. In Rails 3.1 the +jquery-rails+ gem provides the +jquery.js+ and +jquery_u
The +require_tree+ directive tells Sprockets to recursively include _all_ JavaScript files in this directory into the output. Only a path relative to the manifest file can be specified. There is also a +require_directory+ directive which includes all JavaScript files only in the directory specified (no nesting).
-Directives are processed top to bottom, but the order in which files are included by +require_tree+ is unespecified. You should not rely on any particular among those. If you need to ensure some particular JavaScript ends up above some other, require it before in the manifest. Note that the family of +require+ directives prevents files from being included twice in the output.
+Directives are processed top to bottom, but the order in which files are included by +require_tree+ is unespecified. You should not rely on any particular order among those. If you need to ensure some particular JavaScript ends up above some other, require it before in the manifest. Note that the family of +require+ directives prevents files from being included twice in the output.
There's also a default +app/assets/stylesheets/application.css+ file which contains these lines: