diff options
| author | Xavier Noria <fxn@hashref.com> | 2008-05-21 23:38:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2008-05-21 23:39:07 +0200 |
| commit | e89b4bc0c787d7010ba653d1cf0e0f5a2766b2f5 (patch) | |
| tree | 8c10bc050153790f6d7c945ab41cb275eace6fe0 | |
| parent | 291333d93a443d378e8837d97e04f06911ff85ab (diff) | |
| download | rails-e89b4bc0c787d7010ba653d1cf0e0f5a2766b2f5.tar.gz rails-e89b4bc0c787d7010ba653d1cf0e0f5a2766b2f5.tar.bz2 rails-e89b4bc0c787d7010ba653d1cf0e0f5a2766b2f5.zip | |
gsub("ActionMailer", "Action Mailer")
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 | ||||
| -rw-r--r-- | railties/environments/test.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index dbc6801146..030bb178da 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -5,12 +5,12 @@ require 'action_mailer/utils' require 'tmail/net' module ActionMailer #:nodoc: - # ActionMailer allows you to send email from your application using a mailer model and views. + # Action Mailer allows you to send email from your application using a mailer model and views. # # # = Mailer Models # - # To use ActionMailer, you need to create a mailer model. + # To use Action Mailer, you need to create a mailer model. # # $ script/generate mailer Notifier # @@ -157,7 +157,7 @@ module ActionMailer #:nodoc: # end # end # - # Multipart messages can also be used implicitly because ActionMailer will automatically + # Multipart messages can also be used implicitly because Action Mailer will automatically # detect and use multipart templates, where each template is named after the name of the action, followed # by the content type. Each such detected template will be added as separate part to the message. # diff --git a/railties/environments/test.rb b/railties/environments/test.rb index 58850a7974..1e709e1d19 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -16,7 +16,7 @@ config.action_controller.perform_caching = false # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false -# Tell ActionMailer not to deliver emails to the real world. +# Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test |