diff --git a/doc/go1.7.html b/doc/go1.7.html
index a49ea833004ec..7945622f6b8ca 100644
--- a/doc/go1.7.html
+++ b/doc/go1.7.html
@@ -26,10 +26,11 @@
 </style>
 
 <p>
+<!-- TODO: REMOVE THIS COMMENT -->
+<!-- TODO: Also remove "DRAFT" in the "Title" at the top of this file. -->
 <i>NOTE: This is a DRAFT of the Go 1.7 release notes, prepared for the Go 1.7 beta.
 Go 1.7 has NOT yet been released.
 By our regular schedule, it is expected some time in August 2016.
-<!-- NOTE: WHEN REMOVING THIS COMMENT FIX THE TITLE AT THE TOP OF THE FILE TOO! -->
 </i>
 </p>
  
@@ -48,12 +49,11 @@ <h2 id="introduction">Introduction to Go 1.7</h2>
 <a href="#compiler">updates the x86-64 compiler back end</a> to generate more efficient code;
 includes the <a href="#context">context package</a>, promoted from the
 <a href="https://golang.org/x/net/context">x/net subrepository</a>
-and now used throughout the standard library;
+and now used in the standard library;
 and <a href="#testing">adds support in the testing package</a> for
 creating hierarchies of tests and benchmarks.
-The release also removes the ability to disable
-the <a href="https://golang.org/s/go15vendor">vendoring changes</a> started in Go 1.5:
-vendoring is now an official part of the Go toolchain.
+The release also <a href="#cmd/go">finalizes the vendoring support</a>
+started in Go 1.5, making it a standard feature.
 </p>
 
 <h2 id="language">Changes to the language</h2>
@@ -69,6 +69,7 @@ <h2 id="language">Changes to the language</h2>
 The <a href="/pkg/go/types/"><code>go/types</code></a>
 package has been updated to match the gc and gccgo compiler toolchains
 in this respect.
+This change has no effect on the correctness of existing programs.
 </p>
 
 <h2 id="ports">Ports</h2>
@@ -86,7 +87,6 @@ <h2 id="ports">Ports</h2>
 <p>
 The experimental port to Linux on big-endian 64-bit PowerPC (<code>linux/ppc64</code>)
 now requires the POWER8 architecture or later.
-TODO: Pending ppc64le change for cgo.
 </p>
 
 <p>
@@ -138,7 +138,8 @@ <h3 id="compiler">Compiler Toolchain</h3>
 generates more compact, more efficient code
 and provides a better platform for optimizations
 such as bounds check elimination.
-The new back end reduces the CPU time required by <a href="https://golang.org/test/bench/go1/">our benchmark programs</a> by 5-35%.
+The new back end reduces the CPU time required by
+<a href="https://golang.org/test/bench/go1/">our benchmark programs</a> by 5-35%.
 </p>
 
 <p>
@@ -229,7 +230,7 @@ <h3 id="cmd/go">Go command</h3>
 This release removes support for the <code>GO15VENDOREXPERIMENT</code> environment variable,
 as <a href="/doc/go1.6#go_command">announced</a> in the Go 1.6 release.
 <a href="https://golang.org/s/go15vendor">Vendoring support</a>
-is now a standard feature of the go command and toolchain.
+is now a standard feature of the <code>go</code> command and toolchain.
 </p>
 
 <p>
@@ -360,10 +361,6 @@ <h3 id="context">Context</h3>
 as noted below.
 </p>
 
-<p>
-TODO: Example here.
-</p>
-
 <p>
 For more information about contexts, see the
 <a href="/pkg/context/">package documentation</a>
@@ -376,14 +373,10 @@ <h3 id="testing">Testing</h3>
 <p>
 The <code>testing</code> package now supports the definition
 of tests with subtests and benchmarks with sub-benchmarks.
-</p>
-
-<p>
-TODO: Where is the documentation for this?
-</p>
-
-<p>
-TODO: Example here.
+This support makes it easy to write table-driven benchmarks
+and to create hierarchical tests.
+It also provides a way to share common setup and tear-down code.
+See the <a href="/pkg/testing/#hdr-Subtests_and_Sub_benchmarks">package documentation</a> for details.
 </p>
 
 <h3 id="runtime">Runtime</h3>
@@ -406,7 +399,8 @@ <h3 id="runtime">Runtime</h3>
 The new function
 <a href="/pkg/runtime/#KeepAlive"><code>KeepAlive</code></a>
 provides an explicit mechanism for declaring
-that an allocated object is currently reachable,
+that an allocated object must be considered reachable
+at a particular point in a program,
 typically to delay the execution of an associated finalizer.
 </p>
 
@@ -533,14 +527,20 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
 
 <dd>
 <p>
-TODO: Describe Config.DynamicRecordSizingDisabled or whatever replaces it.
+The TLS implementation sends the first few data packets on each connection
+using small record sizes, gradually increasing to the TLS maximum record size.
+This heuristic reduces the amount of data that must be received before
+the first packet can be decrypted, improving communication latency over
+low-bandwidth networks.
+<a href="/pkg/crypto/tls/#Config"><code>Config</code></a>'s
+<code>DynamicRecordSizingDisabled</code> field to true.
 </p>
 
 <p>
 The TLS client now has optional, limited support for server-initiated renegotiation,
 enabled by setting the
 <a href="/pkg/crypto/tls/#Config"><code>Config</code></a>'s
-Renegotiation field.
+<code>Renegotiation</code> field.
 This is needed for connecting to many Microsoft Azure servers.
 </p>
 
@@ -815,8 +815,8 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
 <a href="/pkg/net/http/#Transport"><code>Transport</code></a> implementation passes the request context
 to any dial operation connecting to the remote server.
 If a custom dialer is needed, the new <code>Transport</code> field
-<code>Dialer</code> is preferred over the existing <code>Dial</code> field,
-because the former can accept a context.
+<code>DialContext</code> is preferred over the existing <code>Dial</code> field,
+to allow the transport to supply a context.
 </p>
 
 <p>
@@ -1086,14 +1086,6 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
 </p>
 </dd>
 
-<dl id="text/scanner"><a href="/pkg/text/scanner/">text/scanner</a></dl>
-
-<dd>
-<p>
-TODO: Describe whatever the final state is after golang.org/issue/15813 is resolved.
-</p>
-</dd>
-
 <dl id="time"><a href="/pkg/time/">time</a></dl>
 
 <dd>