doc/go1.15: consolidate notes regarding package testing
Fold the descriptions of testing.T.Deadline and TestMain related changes
into the existing section for package testing.
Also link T.Deadline to its godoc.
Change-Id: I732c45fb879305099cb8a51a77ef11fba1b2f1e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/234557
Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/doc/go1.15.html b/doc/go1.15.html
index 90baedd..79b18a3 100644
--- a/doc/go1.15.html
+++ b/doc/go1.15.html
@@ -228,22 +228,6 @@
TODO
</p>
-<dl id="testing"><dt><a href="/pkg/testing/">testing</a></dt>
- <dd>
- <p><!-- golang.org/issue/28135 -->
- The <code>testing.T</code> type now has a <code>Deadline</code> method
- that reports the time at which the test binary will have exceeded its
- timeout.
- </p>
- <p><!-- golang.org/issue/34129 -->
- A <code>TestMain</code> function is no longer required to call
- <code>os.Exit</code>. If a <code>TestMain</code> function returns,
- the test binary will call <code>os.Exit</code> with the value returned
- by <code>m.Run</code>.
- </p>
- </dd>
-</dl><!-- testing -->
-
<h3 id="minor_library_changes">Minor changes to the library</h3>
<p>
@@ -448,6 +432,20 @@
<dl id="testing"><dt><a href="/pkg/testing/">testing</a></dt>
<dd>
+ <p><!-- golang.org/issue/28135 -->
+ The <code>testing.T</code> type now has a
+ <a href="/pkg/testing/#T.Deadline"><code>Deadline</code></a> method
+ that reports the time at which the test binary will have exceeded its
+ timeout.
+ </p>
+
+ <p><!-- golang.org/issue/34129 -->
+ A <code>TestMain</code> function is no longer required to call
+ <code>os.Exit</code>. If a <code>TestMain</code> function returns,
+ the test binary will call <code>os.Exit</code> with the value returned
+ by <code>m.Run</code>.
+ </p>
+
<p><!-- CL 226877, golang.org/issue/35998 -->
The new methods
<a href="/pkg/testing/#T.TempDir"><code>T.TempDir</code></a> and
