diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-17 20:30:08 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-17 20:30:08 +0530 |
| commit | 9d06b49913dd2a2254d87c7af1af9f1e4d7f64ec (patch) | |
| tree | 9e9580ae6f34c57ee599151b07974dc72a858368 /actionpack/lib/action_view | |
| parent | 39514af7e7302dd134d015158325591c1e974d35 (diff) | |
| parent | bf94f1cab77fc4eb7fc806fd43120f9f23b451ad (diff) | |
| download | rails-9d06b49913dd2a2254d87c7af1af9f1e4d7f64ec.tar.gz rails-9d06b49913dd2a2254d87c7af1af9f1e4d7f64ec.tar.bz2 rails-9d06b49913dd2a2254d87c7af1af9f1e4d7f64ec.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
railties/guides/source/getting_started.textile
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 7fa86866a7..8ea2e5bfe4 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -176,7 +176,7 @@ module ActionView end end - # A resolver that loads files from the filesystem. It allows to set your own + # A resolver that loads files from the filesystem. It allows setting your own # resolving pattern. Such pattern can be a glob string supported by some variables. # # ==== Examples @@ -192,7 +192,7 @@ module ActionView # # FileSystemResolver.new("/path/to/views", ":prefix/{:formats/,}:action{.:locale,}{.:formats,}{.:handlers,}") # - # If you don't specify pattern then the default will be used. + # If you don't specify a pattern then the default will be used. # # In order to use any of the customized resolvers above in a Rails application, you just need # to configure ActionController::Base.view_paths in an initializer, for example: @@ -204,10 +204,10 @@ module ActionView # # ==== Pattern format and variables # - # Pattern have to be a valid glob string, and it allows you to use the + # Pattern has to be a valid glob string, and it allows you to use the # following variables: # - # * <tt>:prefix</tt> - usualy the controller path + # * <tt>:prefix</tt> - usually the controller path # * <tt>:action</tt> - name of the action # * <tt>:locale</tt> - possible locale versions # * <tt>:formats</tt> - possible request formats (for example html, json, xml...) |