Auto merge of #33204 - Manishearth:rollup, r=Manishearth

Rollup of 7 pull requests

- Successful merges: #33107, #33133, #33160, #33167, #33194, #33196, #33200
- Failed merges:

2 files changed, 3 insertions, 1 deletions

diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index a7738e31700..5ab0d5a0877 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -86,6 +86,8 @@ impl TcpStream {
     /// `addr` is an address of the remote host. Anything which implements
     /// `ToSocketAddrs` trait can be supplied for the address; see this trait
     /// documentation for concrete examples.
+    /// In case `ToSocketAddrs::to_socket_addrs()` returns more than one entry,
+    /// then the first valid and reachable address is used.
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn connect<A: ToSocketAddrs>(addr: A) -> io::Result<TcpStream> {
         super::each_addr(addr, net_imp::TcpStream::connect).map(TcpStream)
diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs
index 4683c7061c3..9d0279deb1b 100644
--- 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.