diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-02 23:00:59 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-02 23:00:59 +0530 |
| commit | eeda8403fd222c1109618834e4fe31a45e6531ca (patch) | |
| tree | 3938573377fdbcd0a956408f8bc8363adec1713a /railties/guides/source/action_mailer_basics.textile | |
| parent | 67790644372ad3a771810f1d6d99687d795789ea (diff) | |
| parent | 44284a613b3efe2319db3f84090c0004505942c1 (diff) | |
| download | rails-eeda8403fd222c1109618834e4fe31a45e6531ca.tar.gz rails-eeda8403fd222c1109618834e4fe31a45e6531ca.tar.bz2 rails-eeda8403fd222c1109618834e4fe31a45e6531ca.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/action_mailer_basics.textile')
| -rw-r--r-- | railties/guides/source/action_mailer_basics.textile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile index 142b9dba7e..351a4498b1 100644 --- a/railties/guides/source/action_mailer_basics.textile +++ b/railties/guides/source/action_mailer_basics.textile @@ -467,7 +467,7 @@ The following configuration options are best made in one of the environment file h4. Example Action Mailer Configuration -An example would be adding the following to your appropriate <tt>config/environments/env.rb</tt> file: +An example would be adding the following to your appropriate <tt>config/environments/$RAILS_ENV.rb</tt> file: <ruby> config.action_mailer.delivery_method = :sendmail @@ -482,7 +482,7 @@ config.action_mailer.raise_delivery_errors = true h4. Action Mailer Configuration for GMail -As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/env.rb</tt> file: +As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/$RAILS_ENV.rb</tt> file: <ruby> config.action_mailer.delivery_method = :smtp @@ -524,4 +524,5 @@ In the test we send the email and store the returned object in the +email+ varia h3. Changelog +* September 1, 2011: Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>. People were mis-interpreting the filename to literally be env.rb. "Andy Leeper":http://mochaleaf.com * September 30, 2010: Fixed typos and reformatted Action Mailer configuration table for better understanding. "Jaime Iniesta":http://jaimeiniesta.com |