aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2021-08-06 13:21:25 -0400
committerDmitri Shuralyov <dmitshur@golang.org>2021-08-13 16:26:40 +0000
commit4397d66bdd98a243f0e1a501d92bc9484660ec41 (patch)
treefe989006b8c158c3b155f11aee45d5b2550a7e09
parenteb5a7b505029efce0259aa0615d13b00c2475b43 (diff)
downloadgo-4397d66bdd98a243f0e1a501d92bc9484660ec41.tar.gz
go-4397d66bdd98a243f0e1a501d92bc9484660ec41.zip
[release-branch.go1.17] time: fix docs for new comma layouts
The current text is slightly inaccurate. Make it more correct. Change-Id: Iebe0051b74649d13982d7eefe3697f9e69c9b75d Reviewed-on: https://go-review.googlesource.com/c/go/+/340449 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com> Reviewed-by: Damien Neil <dneil@google.com> Reviewed-by: Ian Lance Taylor <iant@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-on: https://go-review.googlesource.com/c/go/+/341949 Trust: Dmitri Shuralyov <dmitshur@golang.org> Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r--doc/go1.17.html14
-rw-r--r--src/time/format.go6
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/go1.17.html b/doc/go1.17.html
index b65d13a0403..c1b5ab3f6fb 100644
--- a/doc/go1.17.html
+++ b/doc/go1.17.html
@@ -753,9 +753,9 @@ func Foo() bool {
<p><!-- CL 311572 -->
The new
- <a href="/pkg/database/sql/#NullInt16"><code>NullInt16</code></a>
- and
- <a href="/pkg/database/sql/#NullByte"><code>NullByte</code></a>
+ <a href="/pkg/database/sql/#NullInt16"><code>NullInt16</code></a>
+ and
+ <a href="/pkg/database/sql/#NullByte"><code>NullByte</code></a>
structs represent the int16 and byte values that may be null. These can be used as
destinations of the <a href="/pkg/database/sql/#Scan"><code>Scan</code></a> method,
similar to NullString.
@@ -1205,11 +1205,11 @@ func Foo() bool {
<p><!-- CL 300996 -->
The package now accepts comma "," as a separator for fractional seconds when parsing and formatting time.
- The following time formats are now accepted:
+ For example, the following time layouts are now accepted:
<ul>
- <li>2006-01-02 14:06:03,999999999 -0700 MST</li>
- <li>Mon Jan _2 14:06:03,120007 2006</li>
- <li>Mon Jan 2 14:06:03,120007 2006</li>
+ <li>2006-01-02 15:04:05,999999999 -0700 MST</li>
+ <li>Mon Jan _2 15:04:05,000000 2006</li>
+ <li>Monday, January 2 15:04:05,000 2006</li>
</ul>
</p>
diff --git a/src/time/format.go b/src/time/format.go
index bb173a21c2d..f4b4f48142f 100644
--- a/src/time/format.go
+++ b/src/time/format.go
@@ -77,9 +77,9 @@ import "errors"
// The formats and 002 are space-padded and zero-padded
// three-character day of year; there is no unpadded day of year format.
//
-// A decimal point followed by one or more zeros represents a fractional
-// second, printed to the given number of decimal places.
-// Either a comma or decimal point followed by one or more nines represents
+// A comma or decimal point followed by one or more zeros represents
+// a fractional second, printed to the given number of decimal places.
+// A comma or decimal point followed by one or more nines represents
// a fractional second, printed to the given number of decimal places, with
// trailing zeros removed.
// For example "15:04:05,000" or "15:04:05.000" formats or parses with