From 152cdcc9bf46f8b479729385c8d38a2e580cb30a Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Wed, 5 Oct 2011 22:06:29 -0400 Subject: [PATCH 2/4] Standardize on time zone vs timezone --- lib/time.rb | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/time.rb b/lib/time.rb index 9b18d83..6b1e9e5 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -241,14 +241,14 @@ class Time # values (1 or 0) are assumed if broken or missing. For example: # # # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and - # # your timezone is GMT: + # # your time zone is GMT: # now = Time.parse("Thu Nov 29 14:33:20 GMT 2001") # Time.parse("16:30", now) #=> 2001-11-29 16:30:00 +0900 # Time.parse("7/23", now) #=> 2001-07-23 00:00:00 +0900 # Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 +0900 # Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 +0900 # - # Since there are numerous conflicts among locally defined timezone + # Since there are numerous conflicts among locally defined time zone # abbreviations all over the world, this method is not made to # understand all of them. For example, the abbreviation "CST" is # used variously as: @@ -260,13 +260,13 @@ class Time # +10:30 in Australia/Adelaide, # etc. # - # Based on the fact, this method only understands the timezone - # abbreviations described in RFC 822 and the system timezone, in the + # Based on the fact, this method only understands the time zone + # abbreviations described in RFC 822 and the system time zone, in the # order named. (i.e. a definition in RFC 822 overrides the system - # timezone definition.) The system timezone is taken from + # time zone definition.) The system time zone is taken from # Time.local(year, 1, 1).zone and # Time.local(year, 7, 1).zone. - # If the extracted timezone abbreviation does not match any of them, + # If the extracted time zone abbreviation does not match any of them, # it is ignored and the given time is regarded as a local time. # # ArgumentError is raised if Date._parse cannot extract information from -- 1.7.7