Permalink
Browse files

Replace comment about Sprockets stub directive with a link to README …

…about all directives

Conflicts:
	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
	railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
  • Loading branch information...
1 parent ee95bbf commit 79af2c770a765cd18eae4e6a85107da6823612d3 @guilleiguaran guilleiguaran committed Jun 3, 2013
View
4 railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
@@ -7,8 +7,8 @@
// 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
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
//
<% unless options[:skip_javascript] -%>
//= require <%= options[:javascript] %>
View
4 railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
@@ -7,7 +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
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
//
//= require_tree .

0 comments on commit 79af2c7

Please sign in to comment.