copy edits[ci skip]

3 files changed, 10 insertions, 15 deletions

diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 4b72846ef6..6a3658f328 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -1,17 +1,14 @@
-# This is the parent Association class which defines certain class variables (valid_options) and
-# instance variables (model, name, scope, options, reflection) which would be common across all the associations that we known today in Rails..
-# Every association need to have the values of these variables set and they are used at multiple places
-# The heirarchy is defined as follows:
+# This is the parent Association class which defines the variables
+# used by all associations.
+#
+# The hierarchy is defined as follows:
 #  Association 
 #    - SingularAssociation
-#      - BelongsTo
-#      - HasOne
+#      - BelongsToAssociation
+#      - HasOneAssociation
 #    - CollectionAssociation
-#      - HasMany
-#      - HasAndBelongsToMany
-#
-# The HasMany :Through association is a special case of HasMany association with the :through option set for it
-#
+#      - HasManyAssociation
+#      - HasAndBelongsToManyAssociation
 
 module ActiveRecord::Associations::Builder
   class Association #:nodoc:
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
index 821df0e0d6..7e8d68ce69 100644
--- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -13,7 +13,7 @@ module ActiveRecord
       class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
 
       
-      # creates the migration file for the model first followed by the model file itself
+      # creates the migration file for the model.
 
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index fbb747970d..e712c747b0 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -19,9 +19,7 @@ module Rails
       end
 
       # Defines the template that would be used for the migration file.
-      # The source defines the source template file that would be used in creating the migration
-      # The args is an array containing any other options and the name of the file which would be saved on the filesystem
-
+      # The arguments include the source template file, the migration filename etc.
       no_tasks do
         def template(source, *args, &block)
           inside_template do