Merge pull request #10626 from firedev/master

Removed incorrect warning from application.js templates and replaced it with stub command description
rails · May 15, 2013 · e2f3e50 · e2f3e50
2 parents dd03f10 + 877920b
commit e2f3e50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/guides/code/getting_started/app/assets/javascripts/application.js b/guides/code/getting_started/app/assets/javascripts/application.js
@@ -7,8 +7,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// stub path allows dependency to be excluded from the asset bundle.
-// GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
 //= require jquery_ujs

diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
@@ -7,8 +7,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// stub path allows dependency to be excluded from the asset bundle.
-// GO AFTER THE REQUIRES BELOW.
 //
 <% unless options[:skip_javascript] -%>
 //= require <%= options[:javascript] %>

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js b/railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
@@ -7,7 +7,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// stub path allows dependency to be excluded from the asset bundle.
-// GO AFTER THE REQUIRES BELOW.
 //
 //= require_tree .