From ea418dda412c454e5247c698ef2382f2b8a2a6ea Mon Sep 17 00:00:00 2001 From: zzak Date: Sun, 27 Jul 2014 20:58:05 +0000 Subject: [PATCH] * time.c: [DOC] Clarify %Y in strftime, which can accept any digits and will output at least 4 digits as the year. Reported by Yury Trofimenko [Bug #8941] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/time.rb | 2 +- time.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cb9bb45b9..2790f6dc20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jul 28 05:55:56 2014 Zachary Scott + + * time.c: [DOC] Clarify %Y in strftime, which can accept any digits + and will output at least 4 digits as the year. Reported by Yury + Trofimenko [Bug #8941] + + * lib/time.rb: ditto + Mon Jul 28 05:32:06 2014 Zachary Scott * lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments diff --git a/lib/time.rb b/lib/time.rb index 2225f68abb..d39c4f6515 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -417,7 +417,7 @@ class Time # %x :: Preferred representation for the date alone, no time # %X :: Preferred representation for the time alone, no date # %y :: Year without a century (00..99) - # %Y :: Year with century + # %Y :: Year which may include century, if provided # %z :: Time zone as hour offset from UTC (e.g. +0900) # %Z :: Time zone name # %% :: Literal "%" character diff --git a/time.c b/time.c index 3aaa1c8334..db2a537b09 100644 --- a/time.c +++ b/time.c @@ -4399,7 +4399,7 @@ strftimev(const char *fmt, VALUE time, rb_encoding *enc) * Format directives: * * Date (Year, Month, Day): - * %Y - Year with century (can be negative, 4 digits at least) + * %Y - Year with century if provided, will pad result at least 4 digits. * -0001, 0000, 1995, 2009, 14292, etc. * %C - year / 100 (rounded down such as 20 in 2009) * %y - year % 100 (00..99)