From be3e402c79d5c1eac4729e2982d05161c1a9b6a2 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Sun, 10 Mar 2013 00:06:51 +0530 Subject: [PATCH] copy edits [ci skip] --- guides/source/action_mailer_basics.md | 6 +++--- guides/source/active_record_querying.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md index 772b143f8ce1..31182e9aed43 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 f8823fd43a21..4a4f81491745 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