aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2016-10-20 14:51:58 -0400
committerRuss Cox <rsc@golang.org>2016-10-24 20:37:52 +0000
commitaeb8b9591c254560c1ecc4eafbc38b31d632da64 (patch)
tree0b27ed6bacf6bcd4fdcaa9be6239255991f69ce8 /src
parenta7cad4110ac229ecf5b0fcf0a035c5a03c699415 (diff)
downloadgo-aeb8b9591c254560c1ecc4eafbc38b31d632da64.tar.xz
encoding/json: fix bad formatting introduced in CL 20356
Change-Id: I39a8b543e472e5ec5d4807a9b7f61657465c5ce5 Reviewed-on: https://go-review.googlesource.com/31816 Run-TryBot: Russ Cox <rsc@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/encoding/json/decode.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go
index 4a40752dc2..77fc4607db 100644
--- a/src/encoding/json/decode.go
+++ b/src/encoding/json/decode.go
@@ -70,8 +70,8 @@ import (
//
// To unmarshal a JSON object into a map, Unmarshal first establishes a map to
// use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal
-// reuses the existing map, keeping existing entries. Unmarshal then stores key-
-// value pairs from the JSON object into the map. The map's key type must
+// reuses the existing map, keeping existing entries. Unmarshal then stores
+// key-value pairs from the JSON object into the map. The map's key type must
// either be a string, an integer, or implement encoding.TextUnmarshaler.
//
// If a JSON value is not appropriate for a given target type,