aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 11:35:25 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 11:35:25 -0200
commite37edf1c6c520333c66056479b6eb134accc15b7 (patch)
treeb8c1712c7f81b066b3e5f0d30afe7b24d9382d62
parentc7727559e1df44e5930983901949e035b6346774 (diff)
parent6f57e1240eed636a6f47f131a9f39360e28a80c4 (diff)
downloadrails-e37edf1c6c520333c66056479b6eb134accc15b7.tar.gz
rails-e37edf1c6c520333c66056479b6eb134accc15b7.tar.bz2
rails-e37edf1c6c520333c66056479b6eb134accc15b7.zip
Merge pull request #17645 from georgemillo/master
Minor English fixes in docs [ci skip]
-rw-r--r--guides/source/active_support_core_extensions.md2
-rw-r--r--railties/lib/rails/engine.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/active_support_core_extensions.md b/guides/source/active_support_core_extensions.md
index f6f96b79c6..616b813817 100644
--- a/guides/source/active_support_core_extensions.md
+++ b/guides/source/active_support_core_extensions.md
@@ -1011,7 +1011,7 @@ self.default_params = {
}.freeze
```
-They can be also accessed and overridden at the instance level.
+They can also be accessed and overridden at the instance level.
```ruby
A.x = 1
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index d985518fd9..023ea98145 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -110,8 +110,8 @@ module Rails
#
# == Endpoint
#
- # An engine can be also a rack application. It can be useful if you have a rack application that
- # you would like to wrap with +Engine+ and provide some of the +Engine+'s features.
+ # An engine can also be a rack application. It can be useful if you have a rack application that
+ # you would like to wrap with +Engine+ and provide with some of the +Engine+'s features.
#
# To do that, use the +endpoint+ method:
#