diff options
| author | Dmitri Shuralyov <shurcooL@gmail.com> | 2016-11-09 14:49:12 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-11-12 00:13:35 +0000 |
| commit | d8264de8683dac99ffbbbc1f46415e627b73c9ed (patch) | |
| tree | 460f3e9951e9a2192114c06438d113b01209ba7c /src/html | |
| parent | 9a78eadeb636689f79dbf6bd3c0a35d830678097 (diff) | |
| download | go-d8264de8683dac99ffbbbc1f46415e627b73c9ed.tar.xz | |
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/html')
| -rw-r--r-- | src/html/template/doc.go | 2 | ||||
| -rw-r--r-- | src/html/template/js.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/html/template/doc.go b/src/html/template/doc.go index e1e9cad0af..cb89812743 100644 --- a/src/html/template/doc.go +++ b/src/html/template/doc.go @@ -129,7 +129,7 @@ then the template output is <script>var pair = {"A": "foo", "B": "bar"};</script> -See package json to understand how non-string content is marshalled for +See package json to understand how non-string content is marshaled for embedding in JavaScript contexts. diff --git a/src/html/template/js.go b/src/html/template/js.go index 8e58f463ee..8f1185c81e 100644 --- a/src/html/template/js.go +++ b/src/html/template/js.go @@ -162,14 +162,14 @@ func jsValEscaper(args ...interface{}) string { // a division operator it is not turned into a line comment: // x/{{y}} // turning into - // x//* error marshalling y: + // x//* error marshaling y: // second line of error message */null return fmt.Sprintf(" /* %s */null ", strings.Replace(err.Error(), "*/", "* /", -1)) } // TODO: maybe post-process output to prevent it from containing // "<!--", "-->", "<![CDATA[", "]]>", or "</script" - // in case custom marshallers produce output containing those. + // in case custom marshalers produce output containing those. // TODO: Maybe abbreviate \u00ab to \xab to produce more compact output. if len(b) == 0 { |