From 9f487e7aace496d06094985066ef937baef76c1e Mon Sep 17 00:00:00 2001 From: Jakob Waller Date: Thu, 10 Jan 2013 12:13:54 +0100 Subject: Clarified the minute option on DateTime#change --- activesupport/lib/active_support/core_ext/date_time/calculations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index 4e4852a5e6..1d3682eaf2 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -43,7 +43,7 @@ class DateTime # Returns a new DateTime where one or more of the elements have been changed # according to the +options+ parameter. The time options (:hour, - # :minute, :sec) reset cascadingly, so if only the hour is + # :min, :sec) reset cascadingly, so if only the hour is # passed, then minute and sec is set to 0. If the hour and minute is passed, # then sec is set to 0. The +options+ parameter takes a hash with any of these # keys: :year, :month, :day, :hour, -- cgit v1.2.3 From bc9433f49598d9af163756f465ab76cb658a6dd0 Mon Sep 17 00:00:00 2001 From: Matt Bridges Date: Sun, 13 Jan 2013 23:59:14 -0600 Subject: fix reference to ActiveSupport::ProxyObject --- activesupport/lib/active_support/proxy_object.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/proxy_object.rb b/activesupport/lib/active_support/proxy_object.rb index a2bdf1d790..20a0fd8e62 100644 --- a/activesupport/lib/active_support/proxy_object.rb +++ b/activesupport/lib/active_support/proxy_object.rb @@ -5,7 +5,7 @@ module ActiveSupport undef_method :== undef_method :equal? - # Let ActiveSupport::BasicObject at least raise exceptions. + # Let ActiveSupport::ProxyObject at least raise exceptions. def raise(*args) ::Object.send(:raise, *args) end -- cgit v1.2.3