diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9c180eae1b41e14623b19acdfb03e3d54524656d..ee0ea8d2e622912b71c8a454714b57d586f12af1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove all remaining references to @params in the documentation. [Marcel Molina Jr.]
+
* Add documentation for redirect_to :back's RedirectBackError exception. [Marcel Molina Jr.]
* Update layout and content_for documentation to use yield rather than magic @content_for instance variables. [Marcel Molina Jr.]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 3ed99ba7931c91d1dc61345b4e8f25527e4f799c..16d54e5071c2bd8aeb0fe736f402818c63cc4973 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -263,10 +263,10 @@ class Base
# Modern REST web services often need to submit complex data to the web application.
# The param_parsers hash lets you register handlers wich will process the http body and add parameters to the
- # @params hash. These handlers are invoked for post and put requests.
+ # params hash. These handlers are invoked for post and put requests.
#
# By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instanciated
- # in the @params. This allows XML requests to mask themselves as regular form submissions, so you can have one
+ # in the params. This allows XML requests to mask themselves as regular form submissions, so you can have one
# action serve both regular forms and web service requests.
#
# Example of doing your own parser for a custom content type:
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 0cb70c865afcf1525154916f54db6779124697ff..91da89ad5a5aad0ef4800707e3173e366ff07d48 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -38,9 +38,9 @@ def self.included(base) #:nodoc:
#
# class WeblogController < ActionController::Base
# def update
- # List.update(@params["list"]["id"], @params["list"])
- # expire_page :action => "show", :id => @params["list"]["id"]
- # redirect_to :action => "show", :id => @params["list"]["id"]
+ # List.update(params[:list][:id], params[:list])
+ # expire_page :action => "show", :id => params[:list][:id]
+ # redirect_to :action => "show", :id => params[:list][:id]
# end
# end
#
diff --git a/actionpack/lib/action_controller/pagination.rb b/actionpack/lib/action_controller/pagination.rb
index 630b244a0efcfada5d888342c8d25a67e1cf1ba6..a1053e65a7e770ed329e8d185209ef224701e5df 100644
--- a/actionpack/lib/action_controller/pagination.rb
+++ b/actionpack/lib/action_controller/pagination.rb
@@ -31,7 +31,7 @@ module ActionController
# instance variable, which is an ordered collection of model objects for the
# current page (at most 20, sorted by last name and first name), and a
# @person_pages Paginator instance. The current page is determined
- # by the @params['page'] variable.
+ # by the params[:page] variable.
#
# ==== Pagination for a single action
#
@@ -47,7 +47,7 @@ module ActionController
# ==== Custom/"classic" pagination
#
# def list
- # @person_pages = Paginator.new self, Person.count, 10, @params['page']
+ # @person_pages = Paginator.new self, Person.count, 10, params[:page]
# @people = Person.find :all, :order => 'last_name, first_name',
# :limit => @person_pages.items_per_page,
# :offset => @person_pages.current.offset
diff --git a/actionpack/lib/action_controller/streaming.rb b/actionpack/lib/action_controller/streaming.rb
index 2c4e76f35995aa57cebb419060fa17d066005d14..c265c86045a4121966548d9368e121ccaf95715e 100644
--- a/actionpack/lib/action_controller/streaming.rb
+++ b/actionpack/lib/action_controller/streaming.rb
@@ -14,7 +14,7 @@ module Streaming
# it feasible to send even large files.
#
# Be careful to sanitize the path parameter if it coming from a web
- # page. send_file(@params['path']) allows a malicious user to
+ # page. send_file(params[:path]) allows a malicious user to
# download any file on your server.
#
# Options:
diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb
index cba4a2b73901f29fc83b33f0cd34099d8713b58e..b12907c35f180b24671de1fbab71f3a592081c92 100644
--- a/actionpack/lib/action_controller/verification.rb
+++ b/actionpack/lib/action_controller/verification.rb
@@ -37,7 +37,7 @@ module ClassMethods
# is a hash consisting of the following key/value pairs:
#
# * :params: a single key or an array of keys that must
- # be in the @params hash in order for the action(s) to be safely
+ # be in the params hash in order for the action(s) to be safely
# called.
# * :session: a single key or an array of keys that must
# be in the @session in order for the action(s) to be safely called.
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 1b0a31abb51be54af2f105b32fbaf30de29b4991..3c4c0ba98d5dab6dc8bce3e513e47693c66b875c 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -143,7 +143,7 @@ def periodically_call_remote(options = {})
# background instead of the regular reloading POST arrangement. Even
# though it's using JavaScript to serialize the form elements, the form
# submission will work just like a regular submission as viewed by the
- # receiving side (all elements available in @params). The options for
+ # receiving side (all elements available in params). The options for
# specifying the target with :url and defining callbacks is the same as
# link_to_remote.
#