aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb2
-rw-r--r--activemodel/lib/active_model/validations.rb2
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb6
-rw-r--r--activesupport/lib/active_support/deprecation/reporting.rb2
-rw-r--r--activesupport/lib/active_support/testing/assertions.rb2
6 files changed, 7 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 7b1bb48718..ba2a26fd09 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -979,7 +979,7 @@ module ActionView
def telephone_field(object_name, method, options = {})
Tags::TelField.new(object_name, method, self, options).render
end
- # alias of telephone_field
+ # aliases telephone_field
alias phone_field telephone_field
# Returns a text_field of type "date".
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 0b701e89dd..671c743b77 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -187,7 +187,7 @@ module ActiveModel
#
# private
#
- # def attribute_short?(attr)
+ # def attribute_short?(attr)
# send(attr).length < 5
# end
# end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 93b830dd9c..7b980d43e6 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -162,7 +162,7 @@ module ActiveModel
# validates_with StrictValidator, strict: true
# end
#
- # User.validators
+ # Person.validators
# # => [
# # #<MyValidator:0x007fbff403e808 @options={}>,
# # #<OtherValidator:0x007fbff403d930 @options={:on=>:create}>,
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 08803552ff..6fa64b39c3 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -213,12 +213,10 @@ module ActiveRecord
self
end
- # Specifies a limit of records.
+ # Specifies a limit for the number of records to retrieve.
#
# User.limit(10) # generated SQL has 'LIMIT 10'
#
- # Replaces any existing previous limit.
- #
# User.limit(10).limit(20) # generated SQL has 'LIMIT 20'
def limit(value)
spawn.limit!(value)
@@ -233,7 +231,7 @@ module ActiveRecord
#
# User.offset(10) # generated SQL has "OFFSET 10"
#
- # Should be used with order.
+ # Should be used with order.
#
# User.offset(10).order("name ASC")
def offset(value)
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb
index 0529da342f..a1e9618084 100644
--- a/activesupport/lib/active_support/deprecation/reporting.rb
+++ b/activesupport/lib/active_support/deprecation/reporting.rb
@@ -20,7 +20,7 @@ module ActiveSupport
# ActiveSupport::Deprecation.warn("something broke!")
# # => "DEPRECATION WARNING: something broke! (called from your_code.rb:1)"
#
- # Activesupport::Deprecation.silence do
+ # ActiveSupport::Deprecation.silence do
# ActiveSupport::Deprecation.warn("something broke!")
# end
# # => nil
diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index 411bb76a42..ee1a647ed8 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -90,7 +90,7 @@ module ActiveSupport
assert object.blank?, message
end
- # Test if an expression is not blank. Passes <tt>if object.present?</tt> is +true+.
+ # Test if an expression is not blank. Passes if <tt>object.present?</tt> is +true+.
#
# assert_present({ data: 'x' }) # => true
# assert_present({}) # => {} is blank