From: Rob Pike <r@golang.org>
Date: Mon, 12 Aug 2013 01:28:25 +0000 (+1000)
Subject: doc/go1.2.txt: json and ampersands
X-Git-Tag: go1.2rc2~665
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9baac2bf157b61e47a4ab446bf1960f98f9847b5;p=gostls13.git

doc/go1.2.txt: json and ampersands

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/12698047
---

diff --git a/doc/go1.2.txt b/doc/go1.2.txt
index 477ffaab4d..919be5fef7 100644
--- a/doc/go1.2.txt
+++ b/doc/go1.2.txt
@@ -25,6 +25,7 @@ crypto/sha512: Sum512 and Sum384 functions to simplify hashing (CL 10630043).
 crypto/tls: add support for TLS 1.1. (CL 7872043).
 encoding/csv: always allow trailing commas (CL 12294043)
 encoding/json: accept but correct invalid UTF-8 in Marshal (CL 11211045).
+encoding/json: always escape ampersands (CL 12708044).
 encoding/xml: allow attributes stored in pointers to be marshaled (CL 8653047).
 flag: add Getter interface (CL 10472043).
 flag: export commandLine (now CommandLine) (CL 12587043).