From dce7f335c5f9373dc1b56d7165f1a722e9240c61 Mon Sep 17 00:00:00 2001
From: Damien Neil <dneil@google.com>
Date: Tue, 12 Dec 2023 11:10:35 -0800
Subject: [PATCH] doc/go1.22: document zero-copy to net.UnixConn

For #58808

Change-Id: Id73b9e4b5fb96426a01b76ce7a1053a6ad61a58e
Reviewed-on: https://go-review.googlesource.com/c/go/+/549197
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Auto-Submit: Damien Neil <dneil@google.com>
---
 doc/go1.22.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/go1.22.html b/doc/go1.22.html
index 8bcaeedc00584f..31218beba64641 100644
--- a/doc/go1.22.html
+++ b/doc/go1.22.html
@@ -602,7 +602,10 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
 <dl id="net"><dt><a href="/pkg/net/">net</a></dt>
   <dd>
     <p><!-- https://go.dev/issue/58808 -->
-      TODO: <a href="https://go.dev/issue/58808">https://go.dev/issue/58808</a>: arrange zero-copy of os.File and TCPConn to UnixConn
+      When <a href="/pkg/io#Copy"><code>io.Copy</code></a> copies
+      from a <code>TCPConn</code> to a <code>UnixConn</code>,
+      it will now use Linux's <code>sendfile(2)</code> system call if possible,
+      using the new method <a href="/pkg/net#TCPConn.WriteTo"><code>TCPConn.WriteTo</code></a>.
     </p>
 
     <p><!-- CL 467335 -->
@@ -672,7 +675,10 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
     </p>
 
     <p><!-- https://go.dev/issue/58808 -->
-      TODO: <a href="https://go.dev/issue/58808">https://go.dev/issue/58808</a>: arrange zero-copy of os.File and TCPConn to UnixConn
+      When <a href="/pkg/io#Copy"><code>io.Copy</code></a> copies
+      from a <code>File</code> to a <code>net.UnixConn</code>,
+      it will now use Linux's <code>sendfile(2)</code> system call if possible,
+      using the new method <a href="/pkg/os#File.WriteTo"><code>File.WriteTo</code></a>.
     </p>
   </dd>
 </dl><!-- os -->