Prototype and Scriptaculous are no longer vendored, but provided by prototype-rails from now on, also the -j option of the application generator is removed

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index 620df970dc..d67668df91 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -695,13 +695,13 @@ To include +http://example.com/main.js+:
 <%= javascript_include_tag "http://example.com/main.js" %>
 </erb>
 
-The +:defaults+ option loads jQuery by default:
+If the application does not use the asset pipeline, the +:defaults+ option loads jQuery by default:
 
 <erb>
 <%= javascript_include_tag :defaults %>
 </erb>
 
-If the application was generated with "-j prototype" <tt>:defaults</tt> loads Prototype and Scriptaculous. And you can in any case override the expansion in <tt>config/application.rb</tt>:
+And you can in any case override the expansion in <tt>config/application.rb</tt>:
 
 <ruby>
 config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
@@ -709,7 +709,7 @@ config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
 
 When using <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in <tt>public/javascripts</tt> it will be included as well at then end.
 
-The +:all+ option loads every JavaScript file in +public/javascripts+:
+Also, the +:all+ option loads every JavaScript file in +public/javascripts+:
 
 <erb>
 <%= javascript_include_tag :all %>