Merge with docrails.

4 files changed, 17 insertions, 14 deletions

diff --git a/railties/lib/rails_generator/generators/components/scaffold/USAGE b/railties/lib/rails_generator/generators/components/scaffold/USAGE
index a0e4baea08..810aea16f1 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/USAGE
+++ b/railties/lib/rails_generator/generators/components/scaffold/USAGE
@@ -1,10 +1,11 @@
 Description:
     Scaffolds an entire resource, from model and migration to controller and
     views, along with a full test suite. The resource is ready to use as a
-    starting point for your restful, resource-oriented application.
+    starting point for your RESTful, resource-oriented application.
 
-    Pass the name of the model, either CamelCased or under_scored, as the first
-    argument, and an optional list of attribute pairs.
+    Pass the name of the model (in singular form), either CamelCased or
+    under_scored, as the first argument, and an optional list of attribute
+    pairs.
 
     Attribute pairs are column_name:sql_type arguments specifying the
     model's attributes. Timestamps are added by default, so you don't have to
@@ -13,13 +14,16 @@ Description:
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the resource immediately.
 
-    For example, `scaffold post title:string body:text published:boolean`
+    For example, 'scaffold post title:string body:text published:boolean'
     gives you a model with those three attributes, a controller that handles
     the create/show/update/destroy, forms to create and edit your posts, and
     an index that lists them all, as well as a map.resources :posts
     declaration in config/routes.rb.
 
+    If you want to remove all the generated files, run
+    'script/destroy scaffold ModelName'.
+
 Examples:
-    `./script/generate scaffold post` # no attributes, view will be anemic
+    `./script/generate scaffold post`
     `./script/generate scaffold post title:string body:text published:boolean`
     `./script/generate scaffold purchase order_id:integer amount:decimal`
diff --git a/railties/lib/rails_generator/scripts.rb b/railties/lib/rails_generator/scripts.rb
index f857f68de4..9b1a99838a 100644
--- a/railties/lib/rails_generator/scripts.rb
+++ b/railties/lib/rails_generator/scripts.rb
@@ -45,7 +45,7 @@ module Rails
             usage = "\nInstalled Generators\n"
             Rails::Generator::Base.sources.inject([]) do |mem, source|
               # Using an association list instead of a hash to preserve order,
-              # for esthetic reasons more than anything else.
+              # for aesthetic reasons more than anything else.
               label = source.label.to_s.capitalize
               pair = mem.assoc(label)
               mem << (pair = [label, []]) if pair.nil?
diff --git a/railties/lib/rails_generator/scripts/destroy.rb b/railties/lib/rails_generator/scripts/destroy.rb
index 4fcbc3e0df..a7c2a14751 100644
--- a/railties/lib/rails_generator/scripts/destroy.rb
+++ b/railties/lib/rails_generator/scripts/destroy.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../scripts'
 module Rails::Generator::Scripts
   class Destroy < Base
     mandatory_options :command => :destroy
-    
+
     protected
     def usage_message
       usage = "\nInstalled Generators\n"
@@ -15,14 +15,13 @@ module Rails::Generator::Scripts
 
       usage << <<end_blurb
 
-This script will destroy all files created by the corresponding 
-script/generate command. For instance, script/destroy migration CreatePost
-will delete the appropriate ###_create_post.rb file in db/migrate, while 
-script/destroy scaffold Post will delete the posts controller and 
+script/generate command. For instance, 'script/destroy migration CreatePost'
+will delete the appropriate XXX_create_post.rb migration file in db/migrate,
+while 'script/destroy scaffold Post' will delete the posts controller and
 views, post model and migration, all associated tests, and the map.resources
 :posts line in config/routes.rb.
-      
-For instructions on finding new generators, run script/generate
+
+For instructions on finding new generators, run script/generate.
 end_blurb
       return usage
     end
diff --git a/railties/lib/rails_generator/secret_key_generator.rb b/railties/lib/rails_generator/secret_key_generator.rb
index 64fbbb90f8..5ae492312e 100644
--- a/railties/lib/rails_generator/secret_key_generator.rb
+++ b/railties/lib/rails_generator/secret_key_generator.rb
@@ -23,7 +23,7 @@ module Rails
 
     # Generate a random secret key by using the Win32 API. Raises LoadError
     # if the current platform cannot make use of the Win32 API. Raises
-    # SystemCallError if some other error occured.
+    # SystemCallError if some other error occurred.
     def generate_secret_with_win32_api
       # Following code is based on David Garamond's GUID library for Ruby.
       require 'Win32API'