aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/action_mailer_basics.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-24 21:02:51 +0200
committerXavier Noria <fxn@hashref.com>2011-07-24 21:02:51 +0200
commit4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch)
treed2bd733be55a75d5aab8fbcfc4adbb83034980bc /railties/guides/source/action_mailer_basics.textile
parent97716e6273018c5531c7c927d226af823a0a3820 (diff)
parent0626668374d092a3cf72b16fe24944beffddf804 (diff)
downloadrails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz
rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2
rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip
Merge branch 'master' of git://github.com/lifo/docrails
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.