aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/getting_started.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-09-04 18:58:34 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-09-04 18:58:34 +0530
commitabb09054043c556ae38d2c9d1e9037eceb6dc426 (patch)
treeaa71edf8e300faa09135ba83331dffb1ab92a5d3 /railties/guides/source/getting_started.textile
parent74372f7e795dd0e1825dec19dd128b5ae6fb9dfc (diff)
parenta6bafb327d403361ef652d6749f0609cfc2a5578 (diff)
downloadrails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.gz
rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.bz2
rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.zip
Merge docrails, resolving conflicts in the assets guide
Diffstat (limited to 'railties/guides/source/getting_started.textile')
-rw-r--r--railties/guides/source/getting_started.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 256df0eded..6e9613cdae 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -592,7 +592,7 @@ class CreatePosts < ActiveRecord::Migration
end
</ruby>
-The above migration creates a method name +change+ which will be called when you
+The above migration creates a method named +change+ which will be called when you
run this migration. The action defined in that method is also reversible, which
means Rails knows how to reverse the change made by this migration, in case you
want to reverse it at later date. By default, when you run this migration it