aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-05-18 15:00:15 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-05-18 15:00:15 -0700
commitd3d8cfd5689188f48714f49ad000a1c1fbd9edcd (patch)
tree83c32cbf87bf1b0caaa7d815ef3064d8444aa19c /railties
parent5cb2f8256a3e5ece2fb9b1d3c94897147751d49c (diff)
parentf8a3dda6ce268ac428a8624d788bf16dc4264d55 (diff)
downloadrails-d3d8cfd5689188f48714f49ad000a1c1fbd9edcd.tar.gz
rails-d3d8cfd5689188f48714f49ad000a1c1fbd9edcd.tar.bz2
rails-d3d8cfd5689188f48714f49ad000a1c1fbd9edcd.zip
Merge pull request #10678 from prathamesh-sonpatki/typos
Fixed some typos
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md2
-rw-r--r--railties/lib/rails/tasks.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 04cdbec428..d11b0b7e85 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -4,7 +4,7 @@
*Arun Agrawal*
* Rails::Railtie no longer forces the Rails::Configurable module on everything
- that subclassess it. Instead, the methods from Rails::Configurable have been
+ that subclasses it. Instead, the methods from Rails::Configurable have been
moved to class methods in Railtie and the Railtie has been made abstract.
*John Wang*
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb
index 9807000578..142af2d792 100644
--- a/railties/lib/rails/tasks.rb
+++ b/railties/lib/rails/tasks.rb
@@ -1,6 +1,6 @@
$VERBOSE = nil
-# Load Rails rakefile extensions
+# Load Rails Rakefile extensions
%w(
annotations
documentation