aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-07-28 12:25:39 +0200
committerRobin Dupret <robin.dupret@gmail.com>2015-07-28 15:05:41 +0200
commite18bf1dc49222e25d5a485e876e13fc3e57c6eca (patch)
tree389158e6715e6a9aca347d4d0b78ef4c76a4f016 /actionpack/lib/action_dispatch
parent6f4421e4d981be86c04b13fb6965eaaea1c44644 (diff)
downloadrails-e18bf1dc49222e25d5a485e876e13fc3e57c6eca.tar.gz
rails-e18bf1dc49222e25d5a485e876e13fc3e57c6eca.tar.bz2
rails-e18bf1dc49222e25d5a485e876e13fc3e57c6eca.zip
Tiny documentation edits [ci skip]
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 37e26faffb..fd92e89231 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -201,7 +201,7 @@ module ActionDispatch # :nodoc:
# it sets the charset to utf-8.
#
# response.charset = 'utf-16' # => 'utf-16'
- # response.charset = nil # => 'utf-8'
+ # response.charset = nil # => 'utf-8'
def charset=(charset)
@charset = charset.nil? ? self.class.default_charset : charset
end