diff --git a/doc/go1.7.html b/doc/go1.7.html index 2005ef422a..129d88c73c 100644 --- a/doc/go1.7.html +++ b/doc/go1.7.html @@ -33,7 +33,7 @@ Go 1.7 has NOT yet been released. By our regular schedule, it is expected some time in August 2016.
- +
@@ -664,23 +664,15 @@ maps using keys with string types.
Go 1.7 adds support for maps using keys with integer types:
the encoding uses a quoted decimal representation as the JSON key.
Go 1.7 also adds support for encoding maps using non-string keys that implement
-MarshalJSON
-(see
-Marshaler)
-or
-MarshalText
+the MarshalText
(see
encoding.TextMarshaler)
-methods,
+method,
as well as support for decoding maps using non-string keys that implement
-UnmarshalJSON
-(see
-Unmarshaler)
-or
-UnmarshalText
+the UnmarshalText
(see
encoding.TextUnmarshaler)
-methods.
+method.
These methods are ignored for keys with string types in order to preserve
the encoding and decoding used in earlier versions of Go.