aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-02-18 15:11:33 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-02-18 15:11:33 -0500
commit11645adf2561fe9c13015600406d212be85d902e (patch)
tree30ae3a7b4e7759f646d009046f7b0325c227c6d5 /actionpack/lib/action_controller/base.rb
parent5dc6bf5fbcb70b330edff8da257607acd1760805 (diff)
parente220a34e396f026bbee8c7492aaa0ca515995a05 (diff)
downloadrails-11645adf2561fe9c13015600406d212be85d902e.tar.gz
rails-11645adf2561fe9c13015600406d212be85d902e.tar.bz2
rails-11645adf2561fe9c13015600406d212be85d902e.zip
Merge pull request #14099 from robertomiranda/render-text-2-plain
Update Docs in favor to use render plain instead of text option
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index c0f10da23a..e6fe6b0b00 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/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