From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Mon, 25 Mar 2013 17:31:19 +0000 (-0700)
Subject: doc: add DialOpt and friends to go1.1.html
X-Git-Tag: go1.1rc2~349
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fc4c5b14ef6906f981bf199a78c08942388fc03c;p=gostls13.git

doc: add DialOpt and friends to go1.1.html

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/7725048
---

diff --git a/doc/go1.1.html b/doc/go1.1.html
index 88fd818f60..81ecdca45e 100644
--- a/doc/go1.1.html
+++ b/doc/go1.1.html
@@ -707,6 +707,19 @@ clearly a mistake in Go 1.0.
 Since this API change fixes a bug, it is permitted by the Go 1 compatibility rules.
 </li>
 
+<li>
+The <a href="/pkg/net/"><code>net</code></a> package includes a new function,
+<a href="/pkg/net/#DialOpt"><code>DialOpt</code></a>, to supply options to
+<a href="/pkg/net/#Dial"><code>Dial</code></a>.
+Each option is represented by a new
+<a href="/pkg/net/#DialOption"><code>DialOption</code></a> interface.
+The new functions
+<a href="/pkg/net/#Deadline"><code>Deadline</code></a>,
+<a href="/pkg/net/#Timeout"><code>Timeout</code></a>,
+<a href="/pkg/net/#Network"><code>Network</code></a>, and
+<a href="/pkg/net/#LocalAddress"><code>LocalAddress</code></a> return a <code>DialOption</code>.
+</li>
+
 <li>
 The new <a href="/pkg/net/http/cookiejar/">net/http/cookiejar</a> package provides the basics for managing HTTP cookies.
 </li>
@@ -732,7 +745,7 @@ which do ASCII-only trimming of leading and trailing spaces.
 </li>
 
 <li> TODO:
-<code>net</code>: DialOption, DialOpt, ListenUnixgram, LookupNS, IPConn.ReadMsgIP, IPConn.WriteMsgIP, UDPConn.ReadMsgUDP, UDPConn.WriteMsgUDP, UnixConn.CloseRead, UnixConn.CloseWrite
+<code>net</code>: ListenUnixgram, LookupNS, IPConn.ReadMsgIP, IPConn.WriteMsgIP, UDPConn.ReadMsgUDP, UDPConn.WriteMsgUDP, UnixConn.CloseRead, UnixConn.CloseWrite
 </li>
 
 <li>