aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-06 18:36:27 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-06 18:36:27 -0700
commit842f27dd8227289ab4fd232bf89944584ad38fae (patch)
tree99b166dc1619b45e1a6da8c2bfe524c7e4f269e5 /guides
parent4503926e4d0775bb8e3b1267e9341c0d7307cca9 (diff)
parentedaa2c48179681efd96d0cad4b5dea696a2a31fb (diff)
downloadrails-842f27dd8227289ab4fd232bf89944584ad38fae.tar.gz
rails-842f27dd8227289ab4fd232bf89944584ad38fae.tar.bz2
rails-842f27dd8227289ab4fd232bf89944584ad38fae.zip
Merge pull request #6950 from paneq/default_from2
Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile
index af46538bf5..d69235a9ab 100644
--- a/guides/source/configuring.textile
+++ b/guides/source/configuring.textile
@@ -424,12 +424,12 @@ There are a number of settings available on +config.action_mailer+:
* +config.action_mailer.perform_deliveries+ specifies whether mail will actually be delivered and is true by default. It can be convenient to set it to false for testing.
-* +config.action_mailer.default+ configures Action Mailer defaults. These default to:
+* +config.action_mailer.default_options+ configures Action Mailer defaults. Use to set options like `from` or `replay_to` for every mailer. These default to:
<ruby>
:mime_version => "1.0",
:charset => "UTF-8",
:content_type => "text/plain",
-:parts_order => [ "text/plain", "text/enriched", "text/html" ]
+:parts_order => [ "text/plain", "text/enriched", "text/html" ],
</ruby>
* +config.action_mailer.observers+ registers observers which will be notified when mail is delivered.