aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2015-08-30 10:39:27 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2015-08-30 10:39:27 +0000
commit79f44eb6c84fe1d7a7ba51f3f511d2e744788ef8 (patch)
tree0be258917b6e7fdbf0ad2ade64faefe291951455 /activerecord/lib/active_record
parent49ba2710e9fa01c2bedaf306552fae6f3301a119 (diff)
parent884d07b05e6aefc788f0e6275ff4e919e1b1a32b (diff)
downloadrails-79f44eb6c84fe1d7a7ba51f3f511d2e744788ef8.tar.gz
rails-79f44eb6c84fe1d7a7ba51f3f511d2e744788ef8.tar.bz2
rails-79f44eb6c84fe1d7a7ba51f3f511d2e744788ef8.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/migration.rb2
-rw-r--r--activerecord/lib/active_record/migration/command_recorder.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 4901f9dafd..b4dd8eff5a 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -168,7 +168,7 @@ module ActiveRecord
#
# rails generate migration add_fieldname_to_tablename fieldname:string
#
- # This will generate the file <tt>timestamp_add_fieldname_to_tablename</tt>, which will look like this:
+ # This will generate the file <tt>timestamp_add_fieldname_to_tablename.rb</tt>, which will look like this:
# class AddFieldnameToTablename < ActiveRecord::Migration
# def change
# add_column :tablenames, :fieldname, :string
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb
index b52e89d792..a73ee18170 100644
--- a/activerecord/lib/active_record/migration/command_recorder.rb
+++ b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -48,7 +48,7 @@ module ActiveRecord
@reverting = !@reverting
end
- # record +command+. +command+ should be a method name and arguments.
+ # Record +command+. +command+ should be a method name and arguments.
# For example:
#
# recorder.record(:method_name, [:arg1, :arg2])