aboutsummaryrefslogtreecommitdiffstats
path: root/railties/doc/guides/actioncontroller/actioncontroller.txt
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-10-16 22:13:06 +0200
committerPratik Naik <pratiknaik@gmail.com>2008-10-16 22:13:06 +0200
commit9cb5400871b660e2c6d1654346650f07bb52a0c0 (patch)
tree6cd292650cf80b25494cf2f800318f337517b732 /railties/doc/guides/actioncontroller/actioncontroller.txt
parent517bc500ed95a84fd2aadff34fdc14cb7965bc6b (diff)
downloadrails-9cb5400871b660e2c6d1654346650f07bb52a0c0.tar.gz
rails-9cb5400871b660e2c6d1654346650f07bb52a0c0.tar.bz2
rails-9cb5400871b660e2c6d1654346650f07bb52a0c0.zip
Merge docrails
Diffstat (limited to 'railties/doc/guides/actioncontroller/actioncontroller.txt')
-rw-r--r--railties/doc/guides/actioncontroller/actioncontroller.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/doc/guides/actioncontroller/actioncontroller.txt b/railties/doc/guides/actioncontroller/actioncontroller.txt
index c5a594d713..0b884e590b 100644
--- a/railties/doc/guides/actioncontroller/actioncontroller.txt
+++ b/railties/doc/guides/actioncontroller/actioncontroller.txt
@@ -15,6 +15,8 @@ include::cookies.txt[]
include::filters.txt[]
+include::verification.txt[]
+
include::request_response_objects.txt[]
include::http_auth.txt[]
@@ -23,6 +25,4 @@ include::streaming.txt[]
include::parameter_filtering.txt[]
-include::verification.txt[]
-
include::rescue.txt[]