aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-03-10 00:06:51 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-03-10 00:06:51 +0530
commitbe3e402c79d5c1eac4729e2982d05161c1a9b6a2 (patch)
tree55d3b22c54a202b50ac93d7632cc8380f3e6ea1b
parent41b9e86f9eaaaece9b4415c6e7da79dbec44e919 (diff)
downloadrails-be3e402c79d5c1eac4729e2982d05161c1a9b6a2.tar.gz
rails-be3e402c79d5c1eac4729e2982d05161c1a9b6a2.tar.bz2
rails-be3e402c79d5c1eac4729e2982d05161c1a9b6a2.zip
copy edits [ci skip]
-rw-r--r--guides/source/action_mailer_basics.md6
-rw-r--r--guides/source/active_record_querying.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md
index 772b143f8c..31182e9aed 100644
--- a/guides/source/action_mailer_basics.md
+++ b/guides/source/action_mailer_basics.md
@@ -403,7 +403,7 @@ If you wish to override the default delivery options (e.g. SMTP credentials) whi
```ruby
class UserMailer < ActionMailer::Base
- def welcome_email(user,company)
+ def welcome_email(user, company)
@user = user
@url = user_url(@user)
delivery_options = { user_name: company.smtp_user, password: company.smtp_password, address: company.smtp_host }
@@ -414,12 +414,12 @@ end
### Sending Emails without Template Rendering
-There may be cases in which you want to skip the template rendering step and supply the email body as a string. You can achive this using the `:body` option.
+There may be cases in which you want to skip the template rendering step and supply the email body as a string. You can achieve this using the `:body` option.
In such cases don't forget to add the `:content_type` option. Rails will default to `text/plain` otherwise.
```ruby
class UserMailer < ActionMailer::Base
- def welcome_email(user,email_body)
+ def welcome_email(user, email_body)
mail(to: user.email, body: email_body, content_type: "text/html", subject: "Already rendered!")
end
end
diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md
index f8823fd43a..4a4f814917 100644
--- a/guides/source/active_record_querying.md
+++ b/guides/source/active_record_querying.md
@@ -1248,7 +1248,7 @@ User.where(state: 'inactive')
```
As you can see above the `default_scope` is being overridden by both
-`scope` and `where` condition.
+`scope` and `where` conditions.
### Applying a default scope