aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/action_mailer_basics.textile
diff options
context:
space:
mode:
authorEvan Farrar <evanfarrar@gmail.com>2011-07-23 13:57:56 -0400
committerEvan Farrar <evanfarrar@gmail.com>2011-07-23 13:57:56 -0400
commit66b4d112363f3786ecfe4b28d2b00bdcde7e706f (patch)
treeb80bb5179f82cea20a811d4df19361cff8509c4d /railties/guides/source/action_mailer_basics.textile
parent662a71b09f025016db223991017df9a179f42ff4 (diff)
downloadrails-66b4d112363f3786ecfe4b28d2b00bdcde7e706f.tar.gz
rails-66b4d112363f3786ecfe4b28d2b00bdcde7e706f.tar.bz2
rails-66b4d112363f3786ecfe4b28d2b00bdcde7e706f.zip
Changed several instances of British English to be American English
Diffstat (limited to 'railties/guides/source/action_mailer_basics.textile')
-rw-r--r--railties/guides/source/action_mailer_basics.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 2eaee158ff..f05d9dcf1c 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -422,7 +422,7 @@ The above will send a multipart email with an attachment, properly nested with t
h3. Receiving Emails
-Receiving and parsing emails with Action Mailer can be a rather complex endeavour. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need to:
+Receiving and parsing emails with Action Mailer can be a rather complex endeavor. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need to:
* Implement a +receive+ method in your mailer.