From: Jeremy Faller <jeremy@golang.org>
Date: Wed, 1 Dec 2021 18:48:22 +0000 (-0500)
Subject: doc/go1.18: add Conn.NetConn documentation to crypto/tls section
X-Git-Tag: go1.18beta1~120
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=94e22fa03eb5eb678689e05b8e309cd23f874698;p=gostls13.git

doc/go1.18: add Conn.NetConn documentation to crypto/tls section

Updates #47694

Change-Id: Iead44baa8b2a06ecf7b92d343ed9117f0fc0793e
Reviewed-on: https://go-review.googlesource.com/c/go/+/368315
Trust: Jeremy Faller <jeremy@golang.org>
Trust: Katie Hockman <katie@golang.org>
Run-TryBot: Jeremy Faller <jeremy@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Agniva De Sarker <agniva.quicksilver@gmail.com>
---

diff --git a/doc/go1.18.html b/doc/go1.18.html
index 6c246b8b7b..31aa17209f 100644
--- a/doc/go1.18.html
+++ b/doc/go1.18.html
@@ -341,7 +341,9 @@ proposal</a>.
 <dl id="crypto/tls"><dt><a href="/pkg/crypto/tls/">crypto/tls</a></dt>
   <dd>
     <p><!-- CL 325250 -->
-      TODO: <a href="https://golang.org/cl/325250">https://golang.org/cl/325250</a>: add Conn.NetConn method
+      The new <a href="/pkg/crypto/tls/#Conn.NetConn"><code>Conn.NetConn</code></a>
+      method allows access to the underlying
+      <a href="/pkg/net#Conn"><code>net.Conn</code></a>.
     </p>
   </dd>
 </dl><!-- crypto/tls -->