From 8bb7c863966695ef0b0bdfb7868394c20beeace4 Mon Sep 17 00:00:00 2001
From: Mohammad Typaldos <mohammad.elabid@gmail.com>
Date: Sat, 18 Jun 2011 11:48:00 -0700
Subject: Let the reader know what JS and CSS stand for. Slight rewording as
 well.

---
 railties/guides/source/asset_pipeline.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/asset_pipeline.textile')

diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index 2a3a172118..eca38d8543 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -21,7 +21,7 @@ In previous versions of Rails, all assets lived under the +public+ directory in
 
 This is not to say that assets can (or should) no longer be placed in +public+. They still can be, they will just be served by the application or the web server which is running the application and served just like normal files. You would only use +app/assets+ if you wish your files to undergo some pre-processing before they are served.
 
-When a scaffold or controller is generated for the application, Rails will also generate a JavaScript (or CoffeeScript if the +coffee-script+ gem is in the +Gemfile+) and CSS (or SCSS if +sass-rails+ is in the +Gemfile+) file for that controller. For example, if a +ProjectsController+ is generated, there will be a new file at +app/assets/javascripts/projects.js.coffee+ and another at +app/assets/stylesheets/projects.css.scss+. It's in these files that JavaScript and CSS unique to this part of the application belong.
+When a scaffold or controller is generated for the application, Rails will also generate a JavaScript (JS) file (or CoffeeScript if the +coffee-script+ gem is in the +Gemfile+) and a Cascade Style Sheet (CSS) file (or SCSS if +sass-rails+ is in the +Gemfile+) file for that controller. For example, if a +ProjectsController+ is generated, there will be a new file at +app/assets/javascripts/projects.js.coffee+ and another at +app/assets/stylesheets/projects.css.scss+. You should put any JavaScript or CSS unique to the controller insider their respective asset files.
 
 h4. Asset Organization
 
-- 
cgit v1.2.3

