aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/association_basics.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-10-17 10:19:31 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-10-17 10:19:31 -0300
commit759e797c1d677d0695885dc959d6ebaecc538252 (patch)
tree845bb9b6579cc4d5175b31acf0bbfd30c2fd7f77 /guides/source/association_basics.md
parent9eeb00976d4b0a963c58117b46b7a5c6edcacc31 (diff)
downloadrails-759e797c1d677d0695885dc959d6ebaecc538252.tar.gz
rails-759e797c1d677d0695885dc959d6ebaecc538252.tar.bz2
rails-759e797c1d677d0695885dc959d6ebaecc538252.zip
Revert "Change with start of translation in internationalization, this time with pt_br."
This reverts commit 09682e9e7328b1c1466ae87af08f1785a0b5d7e3. Conflicts: guides/source/en/association_basics.md REASON: Translation work can not be done in the docrails repository
Diffstat (limited to 'guides/source/association_basics.md')
-rw-r--r--guides/source/association_basics.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md
index 42c7c07745..cf3ae581b3 100644
--- a/guides/source/association_basics.md
+++ b/guides/source/association_basics.md
@@ -637,7 +637,7 @@ The `create_association` method returns a new object of the associated type. Thi
#### Options for `belongs_to`
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `belongs_to` association reference. Such customizations can easily be accomplished by passing options and scope blocks when you create the association. For example, this assocation uses two such options:
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `belongs_to` association reference. Such customizations can easily be accomplished by passing options and scope blocks when you create the association. For example, this association uses two such options:
```ruby
class Order < ActiveRecord::Base
@@ -932,7 +932,7 @@ The `create_association` method returns a new object of the associated type. Thi
#### Options for `has_one`
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_one` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_one` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this association uses two such options:
```ruby
class Supplier < ActiveRecord::Base
@@ -1143,7 +1143,7 @@ When you declare a `has_many` association, the declaring class automatically gai
* `collection.build(attributes = {}, ...)`
* `collection.create(attributes = {})`
-In all of these methods, `collection` is replaced with the symbol passed as the first argument to `has_many`, and `collection_singular` is replaced with the singularized version of that symbol.. For example, given the declaration:
+In all of these methods, `collection` is replaced with the symbol passed as the first argument to `has_many`, and `collection_singular` is replaced with the singularized version of that symbol. For example, given the declaration:
```ruby
class Customer < ActiveRecord::Base
@@ -1286,7 +1286,7 @@ The `collection.create` method returns a new object of the associated type. This
#### Options for `has_many`
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_many` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_many` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this association uses two such options:
```ruby
class Customer < ActiveRecord::Base
@@ -1737,7 +1737,7 @@ The `collection.create` method returns a new object of the associated type. This
#### Options for `has_and_belongs_to_many`
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_and_belongs_to_many` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the `has_and_belongs_to_many` association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this association uses two such options:
```ruby
class Parts < ActiveRecord::Base