aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/action_controller_overview.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-06-14 01:14:56 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-06-14 01:14:56 +0530
commit41a398f859cc46430cb3b655d44c0cb3b41e42ae (patch)
tree1fefe6aa5560b49ca2142866080caaedaf2bf04d /guides/source/action_controller_overview.md
parent930d0e129c730292ab987eaaf1cd2ba8094e580b (diff)
parent2f0a5c7ac506b900d101620c4cc338a88ee620e3 (diff)
downloadrails-41a398f859cc46430cb3b655d44c0cb3b41e42ae.tar.gz
rails-41a398f859cc46430cb3b655d44c0cb3b41e42ae.tar.bz2
rails-41a398f859cc46430cb3b655d44c0cb3b41e42ae.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/upgrading_ruby_on_rails.md
Diffstat (limited to 'guides/source/action_controller_overview.md')
-rw-r--r--guides/source/action_controller_overview.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/action_controller_overview.md b/guides/source/action_controller_overview.md
index 28939f307f..2701f5bb72 100644
--- a/guides/source/action_controller_overview.md
+++ b/guides/source/action_controller_overview.md
@@ -257,7 +257,7 @@ params.require(:log_entry).permit!
```
This will mark the `:log_entry` parameters hash and any subhash of it
-permitted. Extreme care should be taken when using `permit!` as it
+permitted. Extreme care should be taken when using `permit!` as it
will allow all current and future model attributes to be
mass-assigned.