diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
| commit | 3cbe111439b22f11670587e2ec6779533dd77090 (patch) | |
| tree | 541ec151c0899e21c3bef1c4b7ad9136b42f9b2f /actionpack | |
| parent | ec736dff7b0a05d58d4c8780863afc47e2bb74a3 (diff) | |
| parent | d191db76e04f065e1b0cff3766c818f9b8e2f43a (diff) | |
| download | rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.gz rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.bz2 rails-3cbe111439b22f11670587e2ec6779533dd77090.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/README.rdoc | 2 |
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 |