aboutsummaryrefslogtreecommitdiff
path: root/src/encoding/xml/read.go
diff options
context:
space:
mode:
authorDmitri Shuralyov <shurcooL@gmail.com>2016-11-09 14:49:12 -0800
committerBrad Fitzpatrick <bradfitz@golang.org>2016-11-12 00:13:35 +0000
commitd8264de8683dac99ffbbbc1f46415e627b73c9ed (patch)
tree460f3e9951e9a2192114c06438d113b01209ba7c /src/encoding/xml/read.go
parent9a78eadeb636689f79dbf6bd3c0a35d830678097 (diff)
downloadgo-d8264de8683dac99ffbbbc1f46415e627b73c9ed.tar.gz
go-d8264de8683dac99ffbbbc1f46415e627b73c9ed.zip
all: spell "marshal" and "unmarshal" consistently
The tree is inconsistent about single l vs double l in those words in documentation, test messages, and one error value text. $ git grep -E '[Mm]arshall(|s|er|ers|ed|ing)' | wc -l 42 $ git grep -E '[Mm]arshal(|s|er|ers|ed|ing)' | wc -l 1694 Make it consistently a single l, per earlier decisions. This means contributors won't be confused by misleading precedence, and it helps consistency. Change the spelling in one error value text in newRawAttributes of crypto/x509 package to be consistent. This change was generated with: perl -i -npe 's,([Mm]arshal)l(|s|er|ers|ed|ing),$1$2,' $(git grep -l -E '[Mm]arshall' | grep -v AUTHORS | grep -v CONTRIBUTORS) Updates #12431. Follows https://golang.org/cl/14150. Change-Id: I85d28a2d7692862ccb02d6a09f5d18538b6049a2 Reviewed-on: https://go-review.googlesource.com/33017 Run-TryBot: Minux Ma <minux@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/encoding/xml/read.go')
-rw-r--r--src/encoding/xml/read.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoding/xml/read.go b/src/encoding/xml/read.go
index ed4470f3eb..5a89d5f504 100644
--- a/src/encoding/xml/read.go
+++ b/src/encoding/xml/read.go
@@ -90,7 +90,7 @@ import (
// * An anonymous struct field is handled as if the fields of its
// value were part of the outer struct.
//
-// * A struct field with tag "-" is never unmarshalled into.
+// * A struct field with tag "-" is never unmarshaled into.
//
// Unmarshal maps an XML element to a string or []byte by saving the
// concatenation of that element's character data in the string or
@@ -142,7 +142,7 @@ func (d *Decoder) DecodeElement(v interface{}, start *StartElement) error {
return d.unmarshal(val.Elem(), start)
}
-// An UnmarshalError represents an error in the unmarshalling process.
+// An UnmarshalError represents an error in the unmarshaling process.
type UnmarshalError string
func (e UnmarshalError) Error() string { return string(e) }