diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9189a076e5..c77c4d3329 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* ActionController documentation update #2051 [fbeausoleil@ftml.net] + * Yield @content_for_ variables to templates #2058 [Sam Stephenson] * Make rendering an empty partial collection behave like :nothing => true #2080 [Sam Stephenson] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 2c4de733cc..5f4cd5a932 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -117,7 +117,7 @@ module ActionController #:nodoc: # 50kb object could lead to a 50MB memory overhead. In other words, think carefully about size and caching before resorting to the use # of the session. # - # For removing objects from the session, you can either assign a single key to nil, like <tt>@session[:person] = nil</tt>, or you can + # For removing objects from the session, you can either assign a single key to nil, like <tt>session[:person] = nil</tt>, or you can # remove the entire session with reset_session. # # == Responses @@ -196,7 +196,9 @@ module ActionController #:nodoc: # def do_something # redirect_to(:action => "elsewhere") and return if monkeys.nil? # render :action => "overthere" # won't be called unless monkeys is nil - # end # == Environments + # end + # + # == Environments # # Action Controller works out of the box with CGI, FastCGI, and mod_ruby. CGI and mod_ruby controllers are triggered just the same using: # @@ -261,7 +263,7 @@ module ActionController #:nodoc: # <tt>request.env["REQUEST_URI"]</tt>. attr_accessor :request - # Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>@params["post_id"]</tt> + # Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>params["post_id"]</tt> # to get the post_id. No type casts are made, so all values are returned as strings. attr_accessor :params |