diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-10-06 20:21:00 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-10-06 20:21:00 +0200 |
| commit | 5b69e30622de27e8010fd8cb32a97b5f0fe194e2 (patch) | |
| tree | 8f686ea632c577cda43eb57b46495cee49fe9c78 | |
| parent | b5e9e1ad3c56778c557e620f18aeae912312e68f (diff) | |
| parent | fe33c15d4d66b7a0ebd6257fb1eef21335424bba (diff) | |
| download | rails-5b69e30622de27e8010fd8cb32a97b5f0fe194e2.tar.gz rails-5b69e30622de27e8010fd8cb32a97b5f0fe194e2.tar.bz2 rails-5b69e30622de27e8010fd8cb32a97b5f0fe194e2.zip | |
Merge pull request #21887 from abhishekjain16/doc_fix
Fix usage of word alternatively in docs [ci skip]
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index f3c6be864f..59c3f9248f 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -53,7 +53,7 @@ module ActionDispatch # resources :posts, :comments # end # - # Alternately, you can add prefixes to your path without using a separate + # Alternatively, you can add prefixes to your path without using a separate # directory by using +scope+. +scope+ takes additional options which # apply to all enclosed routes. # diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index 72ca6f7ec6..ad1cb1a4be 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -75,7 +75,7 @@ module ActionView #:nodoc: # # Headline: <%= local_assigns[:headline] %> # - # This is useful in cases where you aren't sure if the local variable has been assigned. Alternately, you could also use + # This is useful in cases where you aren't sure if the local variable has been assigned. Alternatively, you could also use # <tt>defined? headline</tt> to first check if the variable has been assigned before using it. # # === Template caching |