aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-07 22:11:47 +0100
committerXavier Noria <fxn@hashref.com>2011-03-07 22:11:47 +0100
commit89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af (patch)
tree762f7860f65b7e058016707ef6771b1ff2feb7cb /actionmailer
parent5968d7a65886d3450698889f685eccaf54749f43 (diff)
parentf99db5a6a8295b463325accaefe53ab6c89c9982 (diff)
downloadrails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.gz
rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.tar.bz2
rails-89ecc0a5dc1d06a6bbd2a59edd57187c6eedf8af.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/README.rdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index fb93fd1080..0fa18d751b 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -74,7 +74,7 @@ Or you can just chain the methods together like:
== Receiving emails
-To receive emails, you need to implement a public instance method called <tt>receive</tt> that takes a
+To receive emails, you need to implement a public instance method called <tt>receive</tt> that takes an
email object as its single parameter. The Action Mailer framework has a corresponding class method,
which is also called <tt>receive</tt>, that accepts a raw, unprocessed email as a string, which it then turns
into the email object and calls the receive instance method.
@@ -128,7 +128,7 @@ The latest version of Action Mailer can be installed with Rubygems:
Source code can be downloaded as part of the Rails project on GitHub
-* http://github.com/rails/rails/tree/master/actionmailer/
+* https://github.com/rails/rails/tree/master/actionmailer/
== License