From e220a34e396f026bbee8c7492aaa0ca515995a05 Mon Sep 17 00:00:00 2001
From: robertomiranda <rjmaltamar@gmail.com>
Date: Tue, 18 Feb 2014 15:04:16 -0500
Subject: Update Docs in favor to use render plain instead of text option ref
 #14062

---
 actionmailer/lib/action_mailer/base.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionmailer/lib/action_mailer/base.rb')

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index eb8cca9ee4..a522dd3164 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -724,11 +724,11 @@ module ActionMailer
     #     format.html
     #   end
     #
-    # You can even render text directly without using a template:
+    # You can even render plain directly without using a template:
     #
     #   mail(to: 'mikel@test.lindsaar.net') do |format|
-    #     format.text { render text: "Hello Mikel!" }
-    #     format.html { render text: "<h1>Hello Mikel!</h1>" }
+    #     format.text { render plain: "Hello Mikel!" }
+    #     format.html { render plain: "<h1>Hello Mikel!</h1>" }
     #   end
     #
     # Which will render a +multipart/alternative+ email with +text/plain+ and
-- 
cgit v1.2.3


From 1c248dfbabd2f2d99191e3ab2a013061e7a1c896 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Tue, 18 Feb 2014 15:18:37 -0500
Subject: Fix render plain docs example in AM::Base

The errors were introduced in e220a34e39
---
 actionmailer/lib/action_mailer/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionmailer/lib/action_mailer/base.rb')

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a522dd3164..18a41ba7a4 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -724,11 +724,11 @@ module ActionMailer
     #     format.html
     #   end
     #
-    # You can even render plain directly without using a template:
+    # You can even render plain text directly without using a template:
     #
     #   mail(to: 'mikel@test.lindsaar.net') do |format|
     #     format.text { render plain: "Hello Mikel!" }
-    #     format.html { render plain: "<h1>Hello Mikel!</h1>" }
+    #     format.html { render html: "<h1>Hello Mikel!</h1>".html_safe }
     #   end
     #
     # Which will render a +multipart/alternative+ email with +text/plain+ and
-- 
cgit v1.2.3