aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/layouts_and_rendering.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-24 01:55:12 +0100
committerXavier Noria <fxn@hashref.com>2010-12-24 01:55:12 +0100
commit3822673151cd0f53e0e4e671988e35603bf2901c (patch)
treef1d54c60d3dfdfc6a1b854dedff649eb39fe4287 /railties/guides/source/layouts_and_rendering.textile
parent0b5222fa45ff8da340ca4f086d735e97b7fb7326 (diff)
parentd1e95e12b4d56fac58ee680fd2d8d5cdac57b2ac (diff)
downloadrails-3822673151cd0f53e0e4e671988e35603bf2901c.tar.gz
rails-3822673151cd0f53e0e4e671988e35603bf2901c.tar.bz2
rails-3822673151cd0f53e0e4e671988e35603bf2901c.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/guides/source/layouts_and_rendering.textile')
-rw-r--r--railties/guides/source/layouts_and_rendering.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index 4cdd4f2709..f0e40b0980 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -681,7 +681,7 @@ There are three tag options available for +auto_discovery_link_tag+:
* +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically.
* +:title+ specifies the title of the link
-h5. Linking to Javascript Files with +javascript_include_tag+
+h5. Linking to JavaScript Files with +javascript_include_tag+
The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+: