aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-12-20 00:10:30 +0530
commita3b1105ada3da64acfa3843b164b14b734456a50 (patch)
treeb3af8434bf411419bb0bc51aaac306ffe1451b95 /actionpack/lib/abstract_controller
parent3968870d31dc5ab272b5e77904c45183227696be (diff)
parent4dd8b0b5484289eaa30975dbd45bf7112f43a64a (diff)
downloadrails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.gz
rails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.bz2
rails-a3b1105ada3da64acfa3843b164b14b734456a50.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 2580a78c7d..6f17e3fcd9 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -47,7 +47,7 @@ module AbstractController
def render_to_body(options = {})
end
- # Return Content-Type of rendered content
+ # Returns Content-Type of rendered content
# :api: public
def rendered_format
Mime::TEXT