diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
| commit | 6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3 (patch) | |
| tree | 3da8d75101aabe3c1d90d0582505ec1480c9d885 /railties/README | |
| parent | 77bf78b3b78a41d4f2f6e733f5c9c00608c0adba (diff) | |
| parent | a1b60696e2b13cbe94d748444cc0da37b190fbb8 (diff) | |
| download | rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.gz rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.bz2 rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/README
railties/guides/source/active_support_core_extensions.textile
railties/guides/source/getting_started.textile
railties/lib/generators/rails/app/templates/README
Diffstat (limited to 'railties/README')
| -rw-r--r-- | railties/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/README b/railties/README index ffed467872..e4de4a5cb2 100644 --- a/railties/README +++ b/railties/README @@ -250,7 +250,7 @@ app/views/layouts app/helpers Holds view helpers that should be named like weblogs_helper.rb. These are generated - for you automatically when using rails generate for controllers. Helpers can be used to + for you automatically when using <tt>rails generate</tt> for controllers. Helpers can be used to wrap functionality for your views into methods. config @@ -277,7 +277,7 @@ script Helper scripts for automation and generation. test - Unit and functional tests along with fixtures. When using the rails generate command, template + Unit and functional tests along with fixtures. When using the <tt>rails generate</tt> scripts, template test files will be generated for you and placed in this directory. vendor |