diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
| commit | c924cab2fd8932bdfb107c4ca7d26128ba56f19e (patch) | |
| tree | 0eea6430e211564fc331f66625373ec761837982 /libgo/go/encoding/json/encode.go | |
| parent | 4c15f6d5728cb694d7d954b2c20409fdc0400b9e (diff) | |
| parent | 3cef948a814542119083003a3c35a24e036230b6 (diff) | |
| download | gcc-hjl/x32/addr32.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/addr32hjl/x32/addr32
Diffstat (limited to 'libgo/go/encoding/json/encode.go')
| -rw-r--r-- | libgo/go/encoding/json/encode.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/encoding/json/encode.go b/libgo/go/encoding/json/encode.go index 5425a3a90a1..14957b8487b 100644 --- a/libgo/go/encoding/json/encode.go +++ b/libgo/go/encoding/json/encode.go @@ -6,7 +6,7 @@ // RFC 4627. // // See "JSON and Go" for an introduction to this package: -// http://blog.golang.org/2011/01/json-and-go.html +// http://golang.org/doc/articles/json_and_go.html package json import ( @@ -43,7 +43,8 @@ import ( // to keep some browsers from misinterpreting JSON output as HTML. // // Array and slice values encode as JSON arrays, except that -// []byte encodes as a base64-encoded string. +// []byte encodes as a base64-encoded string, and a nil slice +// encodes as the null JSON object. // // Struct values encode as JSON objects. Each exported struct field // becomes a member of the object unless |