aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/README.rdoc
diff options
context:
space:
mode:
authorBrian Lopez <seniorlopez@gmail.com>2010-08-09 12:43:49 -0700
committerBrian Lopez <seniorlopez@gmail.com>2010-08-09 12:43:49 -0700
commitee9c950f2fe0c7953f0a9ad6a53439da7a4e89bc (patch)
tree1b3f6a3e49be0ebacb251de0c0fc12bf64e2e596 /actionpack/README.rdoc
parentd8b90114ddd2a432280d114b9fe4ef1fdb38d132 (diff)
parent7171161124a2852ee7b40c5c632ba8e092c97409 (diff)
downloadrails-ee9c950f2fe0c7953f0a9ad6a53439da7a4e89bc.tar.gz
rails-ee9c950f2fe0c7953f0a9ad6a53439da7a4e89bc.tar.bz2
rails-ee9c950f2fe0c7953f0a9ad6a53439da7a4e89bc.zip
bringing over latest from master
Diffstat (limited to 'actionpack/README.rdoc')
-rw-r--r--actionpack/README.rdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc
index 0e7d164623..b297ceb0e2 100644
--- a/actionpack/README.rdoc
+++ b/actionpack/README.rdoc
@@ -1,6 +1,6 @@
= Action Pack -- From request to response
-Action Pack is a framework for handling and responding to web requests. It it
+Action Pack is a framework for handling and responding to web requests. It
provides mechanisms for *routing* (mapping request URLs to actions), defining
*controllers* that implement actions, and generating responses by rendering
*views*, which are templates of various formats. In short, Action Pack