diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
| commit | 582edaa1ffd6d875e18c50e36e144544209fd158 (patch) | |
| tree | ce4fb934973e1385ec64b78df6984e4a6267fc11 /actionpack/lib/action_view/helpers/form_helper.rb | |
| parent | 2d3d9e3531d0d49a94ded10b993640053bd76c03 (diff) | |
| parent | 51a269b2282ec09cf58614e738a2d0e40d2909d3 (diff) | |
| download | rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.gz rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.bz2 rails-582edaa1ffd6d875e18c50e36e144544209fd158.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 6df86ae65a..48abf119f1 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -266,8 +266,8 @@ module ActionView # === Removing hidden model id's # # The form_for method automatically includes the model id as a hidden field in the form. - # This is used to maintain the correlation between the form data and it's associated model. - # Some ORM systems do not use id's on nested models so in this case you want to be able + # This is used to maintain the correlation between the form data and its associated model. + # Some ORM systems do not use IDs on nested models so in this case you want to be able # to disable the hidden id. # # In the following example the Post model has many Comments stored within it in a NoSQL database, |