diff --git a/ChangeLog b/ChangeLog index 212cd69bb0..9ff0601f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 7 20:29:31 2013 Zachary Scott + + * lib/time.rb: [DOC] typo in Time.rb overview by @srt32 [Fixes GH-416] + https://github.com/ruby/ruby/pull/416 + Mon Oct 7 20:07:20 2013 Tanaka Akira * lib/time.rb (Time.strptime): Use :offset. diff --git a/lib/time.rb b/lib/time.rb index 4474f275be..2b3ebd1b40 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -80,7 +80,7 @@ require 'date' # # #strptime works similar to +parse+ except that instead of using a heuristic # to detect the format of the input string, you provide a second argument that -# is describes the format of the string. For example: +# describes the format of the string. For example: # # Time.strptime("2000-10-31", "%Y-%m-%d") #=> 2000-10-31 00:00:00 -0500