Skip to content
Browse files

copy edits [ci skip]

  • Loading branch information...
1 parent 41b9e86 commit be3e402c79d5c1eac4729e2982d05161c1a9b6a2 @vijaydev vijaydev committed
Showing with 4 additions and 4 deletions.
  1. +3 −3 guides/source/action_mailer_basics.md
  2. +1 −1 guides/source/active_record_querying.md
View
6 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
View
2 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

0 comments on commit be3e402

Please sign in to comment.
Something went wrong with that request. Please try again.