Permalink
Browse files

Merge pull request #14099 from robertomiranda/render-text-2-plain

Update Docs in favor to use render plain instead of text option
  • Loading branch information...
2 parents 5dc6bf5 + e220a34 commit 11645adf2561fe9c13015600406d212be85d902e @guilleiguaran guilleiguaran committed Feb 18, 2014
View
6 actionmailer/lib/action_mailer/base.rb
@@ -724,11 +724,11 @@ def attachments
# 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
View
2 actionpack/lib/action_controller/base.rb
@@ -45,7 +45,7 @@ module ActionController
#
# def server_ip
# location = request.env["SERVER_ADDR"]
- # render text: "This server hosted at #{location}"
+ # render plain: "This server hosted at #{location}"
# end
#
# == Parameters
View
2 actionpack/lib/action_controller/metal/data_streaming.rb
@@ -96,7 +96,7 @@ def each
end
# Sends the given binary data to the browser. This method is similar to
- # <tt>render text: data</tt>, but also allows you to specify whether
+ # <tt>render plain: data</tt>, but also allows you to specify whether
# the browser should display the response as a file attachment (i.e. in a
# download dialog) or as inline data. You may also set the content type,
# the apparent file name, and other things.
View
12 actionpack/lib/action_controller/metal/http_authentication.rb
@@ -11,11 +11,11 @@ module HttpAuthentication
# http_basic_authenticate_with name: "dhh", password: "secret", except: :index
#
# def index
- # render text: "Everyone can see me!"
+ # render plain: "Everyone can see me!"
# end
#
# def edit
- # render text: "I'm only accessible if you know the password"
+ # render plain: "I'm only accessible if you know the password"
# end
# end
#
@@ -127,11 +127,11 @@ def authentication_request(controller, realm)
# before_action :authenticate, except: [:index]
#
# def index
- # render text: "Everyone can see me!"
+ # render plain: "Everyone can see me!"
# end
#
# def edit
- # render text: "I'm only accessible if you know the password"
+ # render plain: "I'm only accessible if you know the password"
# end
#
# private
@@ -321,11 +321,11 @@ def opaque(secret_key)
# before_action :authenticate, except: [ :index ]
#
# def index
- # render text: "Everyone can see me!"
+ # render plain: "Everyone can see me!"
# end
#
# def edit
- # render text: "I'm only accessible if you know the password"
+ # render plain: "I'm only accessible if you know the password"
# end
#
# private

0 comments on commit 11645ad

Please sign in to comment.