aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-04-24 10:16:18 -0500
committerSantiago Pastorino <santiago@wyeworks.com>2014-04-24 10:16:18 -0500
commita5db212a300fee63994d4f6538fb5eb3bfab0490 (patch)
treee80bdc96b57288507796addedc423d69e2a3a27e
parent43101ab3afe2a008d50cd78069e3bd94736da07d (diff)
parentc4807672a86ba8d06180749e2415d510e2669521 (diff)
downloadrails-a5db212a300fee63994d4f6538fb5eb3bfab0490.tar.gz
rails-a5db212a300fee63994d4f6538fb5eb3bfab0490.tar.bz2
rails-a5db212a300fee63994d4f6538fb5eb3bfab0490.zip
Merge pull request #14856 from Gaurav2728/gaurav-typo_fix
[ci skip] Improve formatting and yml
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 951a3e5fb5..652ce0b3d8 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -154,7 +154,7 @@ module ActionMailer
# * signup_notification.text.erb
# * signup_notification.html.erb
# * signup_notification.xml.builder
- # * signup_notification.yaml.erb
+ # * signup_notification.yml.erb
#
# Each would be rendered and added as a separate part to the message, with the corresponding content
# type. The content type for the entire message is automatically set to <tt>multipart/alternative</tt>,
@@ -325,7 +325,7 @@ module ActionMailer
# directory can be configured using the <tt>preview_path</tt> option which has a default
# of <tt>test/mailers/previews</tt>:
#
- # config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
+ # config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
#
# An overview of all previews is accessible at <tt>http://localhost:3000/rails/mailers</tt>
# on a running development server instance.