summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17a3d83e87..bb2be8655b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 6 22:38:15 2013 Zachary Scott <e@zzak.io>
+
+ * time.c: [DOC] Typo in Time overview by @sparr [Fixes GH-374]
+ https://github.com/ruby/ruby/pull/374
+
Tue Aug 6 22:35:32 2013 Zachary Scott <e@zzak.io>
* lib/rss/1.0.rb: [DOC] Document RSS110 by Steve Klabnik [Bug #8740]
diff --git a/time.c b/time.c
index c0fca66a29..211fcead07 100644
--- a/time.c
+++ b/time.c
@@ -4839,7 +4839,7 @@ time_load(VALUE klass, VALUE str)
* Time.new(2002) #=> 2002-01-01 00:00:00 -0500
* Time.new(2002, 10) #=> 2002-10-01 00:00:00 -0500
* Time.new(2002, 10, 31) #=> 2002-10-31 00:00:00 -0500
- * Time.new(2002, 10, 31, 2, 2, 2, "+02:00") #=> 2002-10-31 02:02:02 -0200
+ * Time.new(2002, 10, 31, 2, 2, 2, "+02:00") #=> 2002-10-31 02:02:02 +0200
*
* You can also use #gm, #local and
* #utc to infer GMT, local and UTC timezones instead of using