aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source
diff options
context:
space:
mode:
authorBen Orenstein <ben.orenstein@gmail.com>2012-02-08 20:37:23 -0500
committerBen Orenstein <ben.orenstein@gmail.com>2012-02-08 20:37:23 -0500
commitb0a39d9feb412777e4f3a0199f07713ef4e343c9 (patch)
treea6b7eb0f5cd45c87d33919509f831893f657db4b /railties/guides/source
parent061fd22783ae3522de5746d9f9c6b5ceab145c12 (diff)
downloadrails-b0a39d9feb412777e4f3a0199f07713ef4e343c9.tar.gz
rails-b0a39d9feb412777e4f3a0199f07713ef4e343c9.tar.bz2
rails-b0a39d9feb412777e4f3a0199f07713ef4e343c9.zip
Clean up some wording.
Diffstat (limited to 'railties/guides/source')
-rw-r--r--railties/guides/source/layouts_and_rendering.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index 9b64300e4a..6ac9645917 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -667,7 +667,7 @@ There are three tag options available for the +auto_discovery_link_tag+:
* +:rel+ specifies the +rel+ value in the link. The default value is "alternate".
* +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically.
-* +:title+ specifies the title of the link. The default value is the upshifted +:type+ value, for example, "ATOM" or "RSS".
+* +:title+ specifies the title of the link. The default value is the uppercased +:type+ value, for example, "ATOM" or "RSS".
h5. Linking to JavaScript Files with the +javascript_include_tag+
@@ -724,7 +724,7 @@ Outputting +script+ tags such as this:
These two files for jQuery, +jquery.js+ and +jquery_ujs.js+ must be placed inside +public/javascripts+ if the application doesn't use the asset pipeline. These files can be downloaded from the "jquery-rails repository on GitHub":https://github.com/indirect/jquery-rails/tree/master/vendor/assets/javascripts
-WARNING: If you are using the asset pipeline, this tag will render a +script+ tag for an asset called +defaults.js+, which would not exist in your application unless you've explicitly defined it to be.
+WARNING: If you are using the asset pipeline, this tag will render a +script+ tag for an asset called +defaults.js+, which would not exist in your application unless you've explicitly created it.
And you can in any case override the +:defaults+ expansion in <tt>config/application.rb</tt>: