aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-02-21 21:17:16 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2017-02-21 21:17:16 +0100
commitecca24e2d76f647f342e6bdf8c68a693ff49ae9a (patch)
treefd3029601a900b30cd6da642aced8e1cd1618302
parente31e992ad847880069cfab913cce91c10998de9b (diff)
downloadrails-ecca24e2d76f647f342e6bdf8c68a693ff49ae9a.tar.gz
rails-ecca24e2d76f647f342e6bdf8c68a693ff49ae9a.tar.bz2
rails-ecca24e2d76f647f342e6bdf8c68a693ff49ae9a.zip
[ci skip] Fix direct/resolve documentation.
Use double quoted strings, come down hard on some typos.
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 8b4ce1ed6a..073dabd0a8 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -2022,7 +2022,7 @@ module ActionDispatch
module CustomUrls
# Define custom url helpers that will be added to the application's
- # routes. This allows you override and/or replace the default behavior
+ # routes. This allows you to override and/or replace the default behavior
# of routing helpers, e.g:
#
# direct :homepage do
@@ -2057,7 +2057,7 @@ module ActionDispatch
# [ :products, options.merge(params.permit(:page, :size)) ]
# end
#
- # NOTE: The `direct` methodn can't be used inside of a scope block such as
+ # NOTE: The `direct` method can't be used inside of a scope block such as
# `namespace` or `scope` and will raise an error if it detects that it is.
def direct(name, options = {}, &block)
unless @scope.root?
@@ -2077,8 +2077,8 @@ module ActionDispatch
# [:basket]
# end
#
- # This will now generate '/basket' when a `Basket` instance is passed to
- # `link_to` or `form_for` instead of the standard '/baskets/:id'.
+ # This will now generate "/basket" when a `Basket` instance is passed to
+ # `link_to` or `form_for` instead of the standard "/baskets/:id".
#
# NOTE: This custom behavior only applies to simple polymorphic urls where
# a single model instance is passed and not more complicated forms, e.g:
@@ -2092,24 +2092,24 @@ module ActionDispatch
# resolve("User") { [:profile] }
#
# # app/views/application/_menu.html.erb
- # link_to 'Profile', @current_user
- # link_to 'Profile', [:admin, @current_user]
+ # link_to "Profile", @current_user
+ # link_to "Profile", [:admin, @current_user]
#
- # The first `link_to` will generate '/profile' but the second will generate
- # the standard polymorphic url of '/admin/users/1'.
+ # The first `link_to` will generate "/profile" but the second will generate
+ # the standard polymorphic url of "/admin/users/1".
#
# You can pass options to a polymorphic mapping - the arity for the block
# needs to be two as the instance is passed as the first argument, e.g:
#
- # direct class: 'Basket', anchor: 'items' do |basket, options|
+ # direct class: "Basket", anchor: "items" do |basket, options|
# [:basket, options]
# end
#
- # This generates the url '/basket#items' because when the last item in an
+ # This generates the url "/basket#items" because when the last item in an
# array passed to `polymorphic_url` is a hash then it's treated as options
# to the url helper that gets called.
#
- # NOTE: The `resolve` methodn can't be used inside of a scope block such as
+ # NOTE: The `resolve` method can't be used inside of a scope block such as
# `namespace` or `scope` and will raise an error if it detects that it is.
def resolve(*args, &block)
unless @scope.root?