aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-27 11:50:23 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-27 11:50:23 -0300
commit2939e9470d1ed31db3926045c2bd50f5e2715c28 (patch)
tree5b0f646afde34fbc13cce6c5dc370d8b8cdf441d /guides
parent77f5a706b985773caa84b5fb56624ec2fceb478d (diff)
parentdb2e0f8b04595c392bf9f48806b860a60f376502 (diff)
downloadrails-2939e9470d1ed31db3926045c2bd50f5e2715c28.tar.gz
rails-2939e9470d1ed31db3926045c2bd50f5e2715c28.tar.bz2
rails-2939e9470d1ed31db3926045c2bd50f5e2715c28.zip
Merge pull request #16707 from katmutua/master
update 4_2_release_notes
Diffstat (limited to 'guides')
-rw-r--r--guides/source/4_2_release_notes.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index db74af67a8..b2f64453dd 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -60,7 +60,7 @@ TODO: add some technical details
### Web Console
-New applications generated from Rails 4.2 now comes with the Web Console gem by
+New applications generated from Rails 4.2 now come with the Web Console gem by
default.
Web Console is a set of debugging tools for your Rails application. It will add
@@ -256,9 +256,9 @@ Please refer to the [Changelog][action-pack] for detailed changes.
skip_filter => skip_action_callback
```
- If your application is depending on these methods, you should use the
+ If your application currently depends on these methods, you should use the
replacement `*_action` methods instead. These methods will be deprecated in
- the future and eventually removed from Rails.
+ the future and will eventually be removed from Rails.
(Commit [1](https://github.com/rails/rails/commit/6c5f43bab8206747a8591435b2aa0ff7051ad3de),
[2](https://github.com/rails/rails/commit/489a8f2a44dc9cea09154ee1ee2557d1f037c7d4))