diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index ef63a8a105..7eb69f4fbd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix flip flopped logic in docs for url_for's :only_path option. Closes #4998. [esad@esse.at] + * form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10"). [Jeremy Kemper] * Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index f0997e3f6a..475144f539 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -421,7 +421,7 @@ module ActionController #:nodoc: # * :anchor -- specifies the anchor name to be appended to the path. For example, # url_for :controller => 'posts', :action => 'show', :id => 10, :anchor => 'comments' # will produce "/posts/show/10#comments". - # * :only_path -- if true, returns the absolute URL (omitting the protocol, host name, and port) + # * :only_path -- if true, returns the relative URL (omitting the protocol, host name, and port) (false by default) # * :trailing_slash -- if true, adds a trailing slash, as in "/archive/2005/". Note that this # is currently not recommended since it breaks caching. # * :host -- overrides the default (current) host if provided