aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/guides/source/action_controller_overview.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/action_controller_overview.textile b/railties/guides/source/action_controller_overview.textile
index 31a9c6819c..41b47ca553 100644
--- a/railties/guides/source/action_controller_overview.textile
+++ b/railties/guides/source/action_controller_overview.textile
@@ -76,7 +76,7 @@ class ClientsController < ActionController::Base
if params[:status] = "activated"
@clients = Client.activated
else
- @clients = Client.unativated
+ @clients = Client.unactivated
end
end
@@ -540,7 +540,7 @@ The request object contains a lot of useful information about the request coming
* get?, post?, put?, delete?, head? - Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD.
* headers - Returns a hash containing the headers associated with the request.
* port - The port number (integer) used for the request.
-* protocol - Returns a string containing the prototol used plus "://", for example "http://"
+* protocol - Returns a string containing the protocol used plus "://", for example "http://"
* query_string - The query string part of the URL - everything after "?".
* remote_ip - The IP address of the client.
* url - The entire URL used for the request.