aboutsummaryrefslogtreecommitdiff
path: root/src/encoding/json/decode.go
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2015-09-01 17:51:39 +1000
committerAndrew Gerrand <adg@golang.org>2015-09-23 00:48:35 +0000
commit143f3fd0ee71e6b015029b6792bc873b1013a8d4 (patch)
tree818960b488d97c42a588fcbe1ba3cfe62181cec2 /src/encoding/json/decode.go
parent7b7f85534cc8ed04ec727199c25119e157b2a4bc (diff)
downloadgo-143f3fd0ee71e6b015029b6792bc873b1013a8d4.tar.xz
encoding/json: spell "marshaling" and "unmarshaling" consistently
Fixes #12431 Change-Id: I67c42bf2cd9285f471387248fd9c22a16b158349 Reviewed-on: https://go-review.googlesource.com/14150 Reviewed-by: Dmitri Shuralyov <shurcool@gmail.com> Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/encoding/json/decode.go')
-rw-r--r--src/encoding/json/decode.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go
index 0f5bb4d574..e7e8d0b997 100644
--- a/src/encoding/json/decode.go
+++ b/src/encoding/json/decode.go
@@ -57,7 +57,7 @@ import (
//
// If a JSON value is not appropriate for a given target type,
// or if a JSON number overflows the target type, Unmarshal
-// skips that field and completes the unmarshalling as best it can.
+// skips that field and completes the unmarshaling as best it can.
// If no more serious errors are encountered, Unmarshal returns
// an UnmarshalTypeError describing the earliest such error.
//