Changes migration number to version due to ambiguity. [#3065 state:committed]

2 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 367b4ce217..1c93346a52 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -374,7 +374,7 @@ module ActiveRecord #:nodoc:
 
     ##
     # :singleton-method:
-    # Specify whether or not to use timestamps for migration numbers
+    # Specify whether or not to use timestamps for migration versions
     cattr_accessor :timestamped_migrations , :instance_writer => false
     @@timestamped_migrations = true
 
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index 7975326c52..9244307261 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -2,7 +2,7 @@ module Rails
   module Generators
     # Holds common methods for migrations. It assumes that migrations has the
     # [0-9]*_name format and can be used by another frameworks (like Sequel)
-    # just by implementing the next migration number method.
+    # just by implementing the next migration version method.
     #
     module Migration
       attr_reader :migration_number, :migration_file_name, :migration_class_name
@@ -32,10 +32,10 @@ module Rails
       end
 
       # Creates a migration template at the given destination. The difference
-      # to the default template method is that the migration number is appended
+      # to the default template method is that the migration version is appended
       # to the destination file name.
       #
-      # The migration number, migration file name, migration class name are
+      # The migration version, migration file name, migration class name are
       # available as instance variables in the template to be rendered.
       #
       # ==== Examples