aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 15:53:11 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 15:53:11 -0700
commita1bcf1fb921006bf154ded168b1119220ef9af68 (patch)
tree2a71c4171533c90c345406f7262f66aa6a6bc7bd
parentdd9d8697466f111299fd9b7cf1cf565f20951e15 (diff)
parentbf044a9bbe222b45cfa58e65651749ec70f2793b (diff)
downloadrails-a1bcf1fb921006bf154ded168b1119220ef9af68.tar.gz
rails-a1bcf1fb921006bf154ded168b1119220ef9af68.tar.bz2
rails-a1bcf1fb921006bf154ded168b1119220ef9af68.zip
Merge pull request #11105 from mariozig/correct-documentation
Fix typo in docs. HABTM associations should use a pluralized name [ci skip]
-rw-r--r--actionview/lib/action_view/helpers/form_options_helper.rb2
-rw-r--r--guides/source/action_view_overview.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb
index ad26505086..21f892f443 100644
--- a/actionview/lib/action_view/helpers/form_options_helper.rb
+++ b/actionview/lib/action_view/helpers/form_options_helper.rb
@@ -653,7 +653,7 @@ module ActionView
#
# Example object structure for use with this method:
# class Post < ActiveRecord::Base
- # has_and_belongs_to_many :author
+ # has_and_belongs_to_many :authors
# end
# class Author < ActiveRecord::Base
# has_and_belongs_to_many :posts
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index dea1ddef71..187c910e37 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -1090,7 +1090,7 @@ Example object structure for use with this method:
```ruby
class Post < ActiveRecord::Base
- has_and_belongs_to_many :author
+ has_and_belongs_to_many :authors
end
class Author < ActiveRecord::Base