Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	railties/guides/source/getting_started.textile
  • Loading branch information...
2 parents 39514af + bf94f1c commit 9d06b49913dd2a2254d87c7af1af9f1e4d7f64ec @vijaydev vijaydev committed Mar 17, 2012
@@ -176,7 +176,7 @@ def extract_handler_and_format(path, default_formats)
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 @@ def extract_handler_and_format(path, default_formats)
#
# 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 @@ def extract_handler_and_format(path, default_formats)
#
# ==== 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...)
@@ -244,7 +244,7 @@ It is possible to send email to one or more recipients in one email (for e.g. in
<ruby>
class AdminMailer < ActionMailer::Base
- default :to => Proc.new { Admin.all.map(&:email) },
+ default :to => Proc.new { Admin.pluck(:email) },
:from => "notification@example.com"
def new_registration(user)
Oops, something went wrong.

0 comments on commit 9d06b49

Please sign in to comment.