Skip to content

Commit 0d3effc

Browse files
Replace "overwrite" with "override" [ci-skip]
"Overwrite" means "destructively replace", and is more suitable when, for example, talking about writing data to a location. "Override" means "supersede", and is more suitable when, for example, talking about redifining methods in a subclass.
1 parent 5fdbd21 commit 0d3effc

File tree

15 files changed

+18
-18
lines changed

15 files changed

+18
-18
lines changed

actioncable/lib/action_cable/channel/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def subscribe_to_channel
186186
end
187187

188188
# Called by the cable connection when it's cut, so the channel has a chance to cleanup with callbacks.
189-
# This method is not intended to be called directly by the user. Instead, overwrite the #unsubscribed callback.
189+
# This method is not intended to be called directly by the user. Instead, override the #unsubscribed callback.
190190
def unsubscribe_from_channel # :nodoc:
191191
run_callbacks :unsubscribe do
192192
unsubscribed

actionmailbox/lib/action_mailbox/base.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module ActionMailbox
2727
# routing :all => :backstop
2828
# end
2929
#
30-
# Application mailboxes need to overwrite the +#process+ method, which is invoked by the framework after
30+
# Application mailboxes need to override the +#process+ method, which is invoked by the framework after
3131
# callbacks have been run. The callbacks available are: +before_processing+, +after_processing+, and
3232
# +around_processing+. The primary use case is ensure certain preconditions to processing are fulfilled
3333
# using +before_processing+ callbacks.
@@ -89,7 +89,7 @@ def perform_processing # :nodoc:
8989
end
9090

9191
def process
92-
# Overwrite in subclasses
92+
# Override in subclasses
9393
end
9494

9595
def finished_processing? # :nodoc:

actionpack/lib/action_controller/metal/helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def helpers
9191
end
9292
end
9393

94-
# Overwrite modules_for_helpers to accept :all as argument, which loads
94+
# Override modules_for_helpers to accept :all as argument, which loads
9595
# all helpers in helpers_path.
9696
#
9797
# ==== Parameters

actionpack/lib/action_controller/metal/rendering.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def render(*args) # :nodoc:
3030
super
3131
end
3232

33-
# Overwrite render_to_string because body can now be set to a Rack body.
33+
# Override render_to_string because body can now be set to a Rack body.
3434
def render_to_string(*)
3535
result = super
3636
if result.respond_to?(:each)

actionview/lib/action_view/helpers/rendering_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def render(options = {}, locals = {}, &block)
4747
end
4848
end
4949

50-
# Overwrites _layout_for in the context object so it supports the case a block is
50+
# Overrides _layout_for in the context object so it supports the case a block is
5151
# passed to a partial. Returns the contents that are yielded to a layout, given a
5252
# name or a block.
5353
#

actionview/lib/action_view/record_identifier.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def dom_id(record, prefix = nil)
102102
# on the default implementation (which just joins all key attributes with '_') or on your own
103103
# overwritten version of the method. By default, this implementation passes the key string through a
104104
# method that replaces all characters that are invalid inside DOM ids, with valid ones. You need to
105-
# make sure yourself that your dom ids are valid, in case you overwrite this method.
105+
# make sure yourself that your dom ids are valid, in case you override this method.
106106
def record_key_for_dom_id(record) # :doc:
107107
key = convert_to_model(record).to_key
108108
key ? key.join(JOIN) : key

actionview/lib/action_view/rendering.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def initialize
3333
super
3434
end
3535

36-
# Overwrite process to set up I18n proxy.
36+
# Override process to set up I18n proxy.
3737
def process(*) # :nodoc:
3838
old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
3939
super

activemodel/lib/active_model/translation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module ActiveModel
2222
module Translation
2323
include ActiveModel::Naming
2424

25-
# Returns the +i18n_scope+ for the class. Overwrite if you want custom lookup.
25+
# Returns the +i18n_scope+ for the class. Override if you want custom lookup.
2626
def i18n_scope
2727
:activemodel
2828
end

activemodel/lib/active_model/validations/callbacks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def set_options_for_callback(options)
112112
end
113113

114114
private
115-
# Overwrite run_validations! to include callbacks.
115+
# Override run_validations! to include callbacks.
116116
def run_validations!
117117
_run_validation_callbacks { super }
118118
end

activerecord/lib/active_record/attribute_methods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def instance_method_already_implemented?(method_name)
9797
super
9898
else
9999
# If ThisClass < ... < SomeSuperClass < ... < Base and SomeSuperClass
100-
# defines its own attribute method, then we don't want to overwrite that.
100+
# defines its own attribute method, then we don't want to override that.
101101
defined = method_defined_within?(method_name, superclass, Base) &&
102102
! superclass.instance_method(method_name).owner.is_a?(GeneratedAttributeMethods)
103103
defined || super

0 commit comments

Comments
 (0)