aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-15 11:19:44 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-15 11:19:44 -0800
commit108171a44e7c4f762ec7a1db99b1e3e8b87744df (patch)
treeef423b43d2ba22f4a4999fda484386403e46c721
parent89c46aaaabc09610c440022ea625a0e05215d5ef (diff)
parentc758093eca303704f52b45fd0660e13600b9b315 (diff)
downloadrails-108171a44e7c4f762ec7a1db99b1e3e8b87744df.tar.gz
rails-108171a44e7c4f762ec7a1db99b1e3e8b87744df.tar.bz2
rails-108171a44e7c4f762ec7a1db99b1e3e8b87744df.zip
Merge pull request #13307 from akshay-vishnoi/typo
Spelling and Grammar check [ci skip]
-rw-r--r--actionpack/test/dispatch/url_generation_test.rb2
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb4
-rw-r--r--activesupport/lib/active_support/core_ext/module/attribute_accessors.rb4
-rw-r--r--guides/source/generators.md2
4 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index f919592d24..fdea27e2d2 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -66,7 +66,7 @@ module TestUrlGeneration
assert_equal "http://www.example.com:8080/foo", foo_url(host: "www.example.com:8080", protocol: "http://")
end
- test "port option overides the host" do
+ test "port option overrides the host" do
assert_equal "http://www.example.com:8080/foo", foo_url(host: "www.example.com:8443", protocol: "http://", port: 8080)
end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index cacc787eba..4f4961d273 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -427,7 +427,7 @@ module ActiveRecord
# === string
#
# A single string, without additional arguments, is passed to the query
- # constructor as a SQL fragment, and used in the where clause of the query.
+ # constructor as an SQL fragment, and used in the where clause of the query.
#
# Client.where("orders_count = '2'")
# # SELECT * from clients where orders_count = '2';
@@ -656,7 +656,7 @@ module ActiveRecord
# when 'Reviewer'
# Post.published
# when 'Bad User'
- # Post.none # => returning [] instead breaks the previous code
+ # Post.none # It can't be chained if [] is returned.
# end
# end
#
diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index f70a839074..d317df5079 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -49,7 +49,7 @@ class Module
# include HairColors
# end
#
- # Person.hair_colors # => [:brown, :black, :blonde, :red] + #
+ # Person.hair_colors # => [:brown, :black, :blonde, :red]
def mattr_reader(*syms)
options = syms.extract_options!
syms.each do |sym|
@@ -181,7 +181,7 @@ class Module
# Or pass <tt>instance_accessor: false</tt>, to opt out both instance methods.
#
# module HairColors
- # mattr_accessor :hair_colors, instance_acessor: false
+ # mattr_accessor :hair_colors, instance_accessor: false
# end
#
# class Person
diff --git a/guides/source/generators.md b/guides/source/generators.md
index e9c8ef0225..4a5377c206 100644
--- a/guides/source/generators.md
+++ b/guides/source/generators.md
@@ -560,7 +560,7 @@ This method also takes a block:
```ruby
vendor "seeds.rb" do
- "puts 'in ur app, seeding ur database'"
+ "puts 'in your app, seeding your database'"
end
```