Rollup merge of #33200 - sfackler:nonblocking-docs, r=alexcrichton

Manishearth · Manishearth · commit 3dc0b55a470e · 2016-04-26T01:44:52.000+05:30
Fix reference to TCP in UDP docs Closees #33195
diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs
@@ -324,7 +324,7 @@ impl UdpSocket {
         self.0.recv(buf)
     }
 
-    /// Moves this TCP stream into or out of nonblocking mode.
+    /// Moves this UDP socket into or out of nonblocking mode.
     ///
     /// On Unix this corresponds to calling fcntl, and on Windows this
     /// corresponds to calling ioctlsocket.

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ impl UdpSocket {`
`324`	`324`	`self.0.recv(buf)`
`325`	`325`	`}`
`326`	`326`
`327`		`- /// Moves this TCP stream into or out of nonblocking mode.`
	`327`	`+ /// Moves this UDP socket into or out of nonblocking mode.`
`328`	`328`	`///`
`329`	`329`	`/// On Unix this corresponds to calling fcntl, and on Windows this`
`330`	`330`	`/// corresponds to calling ioctlsocket.`