aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSergey Parizhskiy <parizhskiy@gmail.com>2011-12-05 16:25:25 +0200
committerSergey Parizhskiy <parizhskiy@gmail.com>2011-12-05 16:25:25 +0200
commit0bcac982b603787265e567d0f71da205d4be63c4 (patch)
treee821cad861f01de59e0e701c52d98e85a0f200b3 /railties
parentc9cc535d2be6a30ee0f921c996f5d27c62070f66 (diff)
parentc921ba97b80c50f22373ba8779d6a8587511c2f8 (diff)
downloadrails-0bcac982b603787265e567d0f71da205d4be63c4.tar.gz
rails-0bcac982b603787265e567d0f71da205d4be63c4.tar.bz2
rails-0bcac982b603787265e567d0f71da205d4be63c4.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/source/migrations.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/migrations.textile b/railties/guides/source/migrations.textile
index e67be0ae9f..92356edf90 100644
--- a/railties/guides/source/migrations.textile
+++ b/railties/guides/source/migrations.textile
@@ -541,7 +541,7 @@ Note that running the +db:migrate+ also invokes the +db:schema:dump+ task, which
will update your db/schema.rb file to match the structure of your database.
If you specify a target version, Active Record will run the required migrations
-(up or down or change) until it has reached the specified version. The version
+(up, down or change) until it has reached the specified version. The version
is the numerical prefix on the migration's filename. For example, to migrate
to version 20080906120000 run