aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-09-10 22:34:40 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-09-10 22:34:40 -0300
commit9ba9ce6e6829d5a5e9741ba8bcff19f7977a95b7 (patch)
treec9b899d7aeb2615def5bab25879ae3c0371a7b7b /guides
parent412f6516650fcc0f86f39b0e912d5a1338475c61 (diff)
downloadrails-9ba9ce6e6829d5a5e9741ba8bcff19f7977a95b7.tar.gz
rails-9ba9ce6e6829d5a5e9741ba8bcff19f7977a95b7.tar.bz2
rails-9ba9ce6e6829d5a5e9741ba8bcff19f7977a95b7.zip
Fix typo
Diffstat (limited to 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 120dea51e9..2c6797d1fd 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -89,7 +89,7 @@ See [#14488](https://github.com/rails/rails/pull/14488) and
In Rails 5.0, test cases will be executed in random order by default. In
anticipation of this change, Rails 4.2 introduced a new configuration option
`active_support.test_order` for explicitly specifying the test ordering. This
-allows you to either locking down the current behavior by setting the option to
+allows you to either lock down the current behavior by setting the option to
`:sorted`, or opt into the future behavior by setting the option to `:random`.
If you do not specify a value for this option, a deprecation warning will be