We changed name to scaffold

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6768 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 5 insertions, 5 deletions

diff --git a/railties/lib/rails_generator/generators/components/resource/USAGE b/railties/lib/rails_generator/generators/components/resource/USAGE
index 545cbb9cf7..637ddd83e3 100644
--- a/railties/lib/rails_generator/generators/components/resource/USAGE
+++ b/railties/lib/rails_generator/generators/components/resource/USAGE
@@ -21,7 +21,7 @@ Description:
     your config/routes.rb file, hooking up the rules that'll point URLs to 
     this new resource. 
     
-    Unlike the scaffold_resource generator, the resource generator does not
+    Unlike the scaffold generator, the resource generator does not
     create views or add any methods to the generated controller.
     
 Examples:
diff --git a/railties/lib/rails_generator/generators/components/scaffold/USAGE b/railties/lib/rails_generator/generators/components/scaffold/USAGE
index 82fd6e2fb4..a194f8d415 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/USAGE
+++ b/railties/lib/rails_generator/generators/components/scaffold/USAGE
@@ -9,14 +9,14 @@ Description:
     
     The generator takes the name of the model as its first argument. This
     model name is then pluralized to get the controller name. So
-    "scaffold_resource post" will generate a Post model and a
+    "scaffold post" will generate a Post model and a
     PostsController and will be intended for URLs like /posts and
     /posts/45.
     
     As additional parameters, the generator will take attribute pairs
     described by name and type. These attributes will be used to
     prepopulate the migration to create the table for the model and to give
-    you a set of templates for the view. For example, "scaffold_resource
+    you a set of templates for the view. For example, "scaffold
     post title:string created_on:date body:text published:boolean" will
     give you a model with those four attributes, forms to create and edit
     those models from, and an index that'll list them all.
@@ -27,7 +27,7 @@ Description:
     
     The generator also adds a declaration to your config/routes.rb file
     to hook up the rules that'll point URLs to this new resource. If you 
-    create a resource like "scaffold_resource post", it will add
+    create a resource like "scaffold post", it will add
     "map.resources :posts" (notice the plural form) in the routes file, 
     making your new resource accessible from /posts. 
 
diff --git a/railties/lib/rails_generator/scripts/destroy.rb b/railties/lib/rails_generator/scripts/destroy.rb
index 4c5f483c5b..4fcbc3e0df 100644
--- a/railties/lib/rails_generator/scripts/destroy.rb
+++ b/railties/lib/rails_generator/scripts/destroy.rb
@@ -18,7 +18,7 @@ module Rails::Generator::Scripts
 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_resource Post will delete the posts controller and 
+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.