diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-18 22:02:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-18 22:02:34 +0530 |
| commit | 2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3 (patch) | |
| tree | 1c1f928ff506c4a605356e2b1da522e08ff12020 /actionmailer | |
| parent | 2f689d462d8e94365724c5575b14ab997e11bb43 (diff) | |
| parent | 709f33d6042463bd4dbfb16f6f8946785556d5ab (diff) | |
| download | rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.gz rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.bz2 rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index 4c2516db59..755717cfba 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -82,7 +82,7 @@ Note that every value you set with this method will get over written if you use Example: - class Authenticationmailer < ActionMailer::Base + class AuthenticationMailer < ActionMailer::Base default :from => "awesome@application.com", :subject => Proc.new { "E-mail was generated at #{Time.now}" } ..... end diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index 72314d81ad..2036883b22 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -1,7 +1,6 @@ module ActionMailer module MailHelper - # Uses Text::Format to take the text and format it, indented two spaces for - # each line, and wrapped at 72 columns. + # Take the text and format it, indented two spaces for each line, and wrapped at 72 columns. def block_format(text) formatted = text.split(/\n\r?\n/).collect { |paragraph| format_paragraph(paragraph) |