diff --git a/command.md b/command.md
index 263c2ac..3d92c20 100644
--- a/command.md
+++ b/command.md
@@ -1859,20 +1859,21 @@ supported size.
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
 If the port is zero, the socket will be bound to a random free port.</p>
-<p>Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.</p>
-<h1>Typical <code>start</code> errors</h1>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>local-address</code> has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)</li>
 <li><code>invalid-state</code>:             The socket is already bound. (EINVAL)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
 <li><code>address-in-use</code>:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)</li>
 <li><code>address-in-use</code>:            Address is already in use. (EADDRINUSE)</li>
 <li><code>address-not-bindable</code>:      <code>local-address</code> is not an address that the <a href="#network"><code>network</code></a> can bind to. (EADDRNOTAVAIL)</li>
 <li><code>not-in-progress</code>:           A <code>bind</code> operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>Unlike in POSIX, in WASI the bind operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>bind</code> as part of either <code>start-bind</code> or <code>finish-bind</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html</a></li>
@@ -2297,23 +2298,42 @@ the socket is effectively an in-memory configuration object, unable to communica
 </li>
 </ul>
 <h4><a name="tcp_socket"><code>resource tcp-socket</code></a></h4>
-<h2>A TCP socket handle.</h2>
+<p>A TCP socket resource.</p>
+<p>The socket can be in one of the following states:</p>
+<ul>
+<li><code>unbound</code></li>
+<li><code>bind-in-progress</code></li>
+<li><code>bound</code> (See note below)</li>
+<li><code>listen-in-progress</code></li>
+<li><code>listening</code></li>
+<li><code>connect-in-progress</code></li>
+<li><code>connected</code></li>
+<li><code>closed</code>
+See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md</a>
+for a more information.</li>
+</ul>
+<p>Note: Except where explicitly mentioned, whenever this documentation uses
+the term &quot;bound&quot; without backticks it actually means: in the <code>bound</code> state <em>or higher</em>.
+(i.e. <code>bound</code>, <code>listen-in-progress</code>, <code>listening</code>, <code>connect-in-progress</code> or <code>connected</code>)</p>
+<h2>In addition to the general error codes documented on the
+<code>network::error-code</code> type, TCP socket methods may always return
+<code>error(invalid-state)</code> when in the <code>closed</code> state.</h2>
 <h3>Functions</h3>
 <h4><a name="method_tcp_socket.start_bind"><code>[method]tcp-socket.start-bind: func</code></a></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
 If the TCP/UDP port is zero, the socket will be bound to a random free port.</p>
-<p>Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.</p>
-<h1>Typical <code>start</code> errors</h1>
+<p>Bind can be attempted multiple times on the same socket, even with
+different arguments on each iteration. But never concurrently and
+only as long as the previous bind failed. Once a bind succeeds, the
+binding can't be changed anymore.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>local-address</code> has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)</li>
 <li><code>invalid-argument</code>:          <code>local-address</code> is not a unicast address. (EINVAL)</li>
 <li><code>invalid-argument</code>:          <code>local-address</code> is an IPv4-mapped IPv6 address. (EINVAL)</li>
 <li><code>invalid-state</code>:             The socket is already bound. (EINVAL)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
 <li><code>address-in-use</code>:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)</li>
 <li><code>address-in-use</code>:            Address is already in use. (EADDRINUSE)</li>
 <li><code>address-not-bindable</code>:      <code>local-address</code> is not an address that the <a href="#network"><code>network</code></a> can bind to. (EADDRNOTAVAIL)</li>
@@ -2325,6 +2345,10 @@ If the TCP/UDP port is zero, the socket will be bound to a random free port.</p>
 state of a recently closed socket on the same local address. In practice this means that the SO_REUSEADDR
 socket option should be set implicitly on all platforms, except on Windows where this is the default behavior
 and SO_REUSEADDR performs something different entirely.</p>
+<p>Unlike in POSIX, in WASI the bind operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>bind</code> as part of either <code>start-bind</code> or <code>finish-bind</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html</a></li>
@@ -2355,12 +2379,13 @@ and SO_REUSEADDR performs something different entirely.</p>
 <p>Connect to a remote endpoint.</p>
 <p>On success:</p>
 <ul>
-<li>the socket is transitioned into the Connection state</li>
+<li>the socket is transitioned into the <code>connection</code> state.</li>
 <li>a pair of streams is returned that can be used to read &amp; write to the connection</li>
 </ul>
-<p>After a failed connection attempt, the only valid action left is to
-<code>drop</code> the socket. A single socket can not be used to connect more than once.</p>
-<h1>Typical <code>start</code> errors</h1>
+<p>After a failed connection attempt, the socket will be in the <code>closed</code>
+state and the only valid action left is to <code>drop</code> the socket. A single
+socket can not be used to connect more than once.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>remote-address</code> has the wrong address family. (EAFNOSUPPORT)</li>
 <li><code>invalid-argument</code>:          <code>remote-address</code> is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)</li>
@@ -2368,20 +2393,24 @@ and SO_REUSEADDR performs something different entirely.</p>
 <li><code>invalid-argument</code>:          The IP address in <code>remote-address</code> is set to INADDR_ANY (<code>0.0.0.0</code> / <code>::</code>). (EADDRNOTAVAIL on Windows)</li>
 <li><code>invalid-argument</code>:          The port in <code>remote-address</code> is set to 0. (EADDRNOTAVAIL on Windows)</li>
 <li><code>invalid-argument</code>:          The socket is already attached to a different network. The <a href="#network"><code>network</code></a> passed to <code>connect</code> must be identical to the one passed to <code>bind</code>.</li>
-<li><code>invalid-state</code>:             The socket is already in the Connection state. (EISCONN)</li>
-<li><code>invalid-state</code>:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
+<li><code>invalid-state</code>:             The socket is already in the <code>connected</code> state. (EISCONN)</li>
+<li><code>invalid-state</code>:             The socket is already in the <code>listening</code> state. (EOPNOTSUPP, EINVAL on Windows)</li>
 <li><code>timeout</code>:                   Connection timed out. (ETIMEDOUT)</li>
 <li><code>connection-refused</code>:        The connection was forcefully rejected. (ECONNREFUSED)</li>
 <li><code>connection-reset</code>:          The connection was reset. (ECONNRESET)</li>
 <li><code>connection-aborted</code>:        The connection was aborted. (ECONNABORTED)</li>
 <li><code>remote-unreachable</code>:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET)</li>
 <li><code>address-in-use</code>:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)</li>
-<li><code>not-in-progress</code>:           A <code>connect</code> operation is not in progress.</li>
+<li><code>not-in-progress</code>:           A connect operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>The POSIX equivalent of <code>start-connect</code> is the regular <code>connect</code> syscall.
+Because all WASI sockets are non-blocking this is expected to return
+EINPROGRESS, which should be translated to <code>ok()</code> in WASI.</p>
+<p>The POSIX equivalent of <code>finish-connect</code> is a <a href="#poll"><code>poll</code></a> for event <code>POLLOUT</code>
+with a timeout of 0 on the socket descriptor. Followed by a check for
+the <code>SO_ERROR</code> socket option, in case the poll signaled readiness.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html</a></li>
@@ -2410,24 +2439,22 @@ and SO_REUSEADDR performs something different entirely.</p>
 </ul>
 <h4><a name="method_tcp_socket.start_listen"><code>[method]tcp-socket.start-listen: func</code></a></h4>
 <p>Start listening for new connections.</p>
-<p>Transitions the socket into the Listener state.</p>
-<p>Unlike POSIX:</p>
-<ul>
-<li>this function is async. This enables interactive WASI hosts to inject permission prompts.</li>
-<li>the socket must already be explicitly bound.</li>
-</ul>
-<h1>Typical <code>start</code> errors</h1>
+<p>Transitions the socket into the <code>listening</code> state.</p>
+<p>Unlike POSIX, the socket must already be explicitly bound.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-state</code>:             The socket is not bound to any local address. (EDESTADDRREQ)</li>
-<li><code>invalid-state</code>:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)</li>
-<li><code>invalid-state</code>:             The socket is already in the Listener state.</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
+<li><code>invalid-state</code>:             The socket is already in the <code>connected</code> state. (EISCONN, EINVAL on BSD)</li>
+<li><code>invalid-state</code>:             The socket is already in the <code>listening</code> state.</li>
 <li><code>address-in-use</code>:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)</li>
-<li><code>not-in-progress</code>:           A <code>listen</code> operation is not in progress.</li>
+<li><code>not-in-progress</code>:           A listen operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>Unlike in POSIX, in WASI the listen operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>listen</code> as part of either <code>start-listen</code> or <code>finish-listen</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html</a></li>
@@ -2454,7 +2481,7 @@ and SO_REUSEADDR performs something different entirely.</p>
 </ul>
 <h4><a name="method_tcp_socket.accept"><code>[method]tcp-socket.accept: func</code></a></h4>
 <p>Accept a new client socket.</p>
-<p>The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:</p>
+<p>The returned socket is bound and in the <code>connected</code> state. The following properties are inherited from the listener socket:</p>
 <ul>
 <li><code>address-family</code></li>
 <li><code>keep-alive-enabled</code></li>
@@ -2469,7 +2496,7 @@ and SO_REUSEADDR performs something different entirely.</p>
 a pair of streams that can be used to read &amp; write to the connection.</p>
 <h1>Typical errors</h1>
 <ul>
-<li><code>invalid-state</code>:      Socket is not in the Listener state. (EINVAL)</li>
+<li><code>invalid-state</code>:      Socket is not in the <code>listening</code> state. (EINVAL)</li>
 <li><code>would-block</code>:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)</li>
 <li><code>connection-aborted</code>: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)</li>
 <li><code>new-socket-limit</code>:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)</li>
@@ -2538,7 +2565,7 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 <li><a name="method_tcp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
 <h4><a name="method_tcp_socket.is_listening"><code>[method]tcp-socket.is-listening: func</code></a></h4>
-<p>Whether the socket is listening for new connections.</p>
+<p>Whether the socket is in the <code>listening</code> state.</p>
 <p>Equivalent to the SO_ACCEPTCONN socket option.</p>
 <h5>Params</h5>
 <ul>
@@ -2567,7 +2594,7 @@ Any other value will never cause an error, but it might be silently clamped and/
 <ul>
 <li><code>not-supported</code>:        (set) The platform does not support changing the backlog size after the initial listen.</li>
 <li><code>invalid-argument</code>:     (set) The provided value was 0.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
+<li><code>invalid-state</code>:        (set) The socket is in the <code>connect-in-progress</code> or <code>connected</code> state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2696,8 +2723,6 @@ I.e. after setting a value, reading the same setting back may return a different
 <h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:     (set) The TTL value must be 1 or higher.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Listener state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2726,8 +2751,6 @@ I.e. after setting a value, reading the same setting back may return a different
 <h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:     (set) The provided value was 0.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Listener state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2767,7 +2790,17 @@ I.e. after setting a value, reading the same setting back may return a different
 <li><a name="method_tcp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
 <h4><a name="method_tcp_socket.subscribe"><code>[method]tcp-socket.subscribe: func</code></a></h4>
-<p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the socket is ready for I/O.</p>
+<p>Create a <a href="#pollable"><code>pollable</code></a> which can be used to poll for, or block on,
+completion of any of the asynchronous operations of this socket.</p>
+<p>When <code>finish-bind</code>, <code>finish-listen</code>, <code>finish-connect</code> or <code>accept</code>
+return <code>error(would-block)</code>, this pollable can be used to wait for
+their success or failure, after which the method can be retried.</p>
+<p>The pollable is not limited to the async operation that happens to be
+in progress at the time of calling <code>subscribe</code> (if any). Theoretically,
+<code>subscribe</code> only has to be called once per socket and can then be
+(re)used for the remainder of the socket's lifetime.</p>
+<p>See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness</a>
+for a more information.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
@@ -2794,7 +2827,7 @@ has no effect and returns <code>ok</code>.</p>
 <p>The shutdown function does not close (drop) the socket.</p>
 <h1>Typical errors</h1>
 <ul>
-<li><code>invalid-state</code>: The socket is not in the Connection state. (ENOTCONN)</li>
+<li><code>invalid-state</code>: The socket is not in the <code>connected</code> state. (ENOTCONN)</li>
 </ul>
 <h1>References</h1>
 <ul>
diff --git a/imports.md b/imports.md
index 0e264c0..48cd5a0 100644
--- a/imports.md
+++ b/imports.md
@@ -1854,20 +1854,21 @@ supported size.
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
 If the port is zero, the socket will be bound to a random free port.</p>
-<p>Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.</p>
-<h1>Typical <code>start</code> errors</h1>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>local-address</code> has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)</li>
 <li><code>invalid-state</code>:             The socket is already bound. (EINVAL)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
 <li><code>address-in-use</code>:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)</li>
 <li><code>address-in-use</code>:            Address is already in use. (EADDRINUSE)</li>
 <li><code>address-not-bindable</code>:      <code>local-address</code> is not an address that the <a href="#network"><code>network</code></a> can bind to. (EADDRNOTAVAIL)</li>
 <li><code>not-in-progress</code>:           A <code>bind</code> operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>Unlike in POSIX, in WASI the bind operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>bind</code> as part of either <code>start-bind</code> or <code>finish-bind</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html</a></li>
@@ -2292,23 +2293,42 @@ the socket is effectively an in-memory configuration object, unable to communica
 </li>
 </ul>
 <h4><a name="tcp_socket"><code>resource tcp-socket</code></a></h4>
-<h2>A TCP socket handle.</h2>
+<p>A TCP socket resource.</p>
+<p>The socket can be in one of the following states:</p>
+<ul>
+<li><code>unbound</code></li>
+<li><code>bind-in-progress</code></li>
+<li><code>bound</code> (See note below)</li>
+<li><code>listen-in-progress</code></li>
+<li><code>listening</code></li>
+<li><code>connect-in-progress</code></li>
+<li><code>connected</code></li>
+<li><code>closed</code>
+See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md</a>
+for a more information.</li>
+</ul>
+<p>Note: Except where explicitly mentioned, whenever this documentation uses
+the term &quot;bound&quot; without backticks it actually means: in the <code>bound</code> state <em>or higher</em>.
+(i.e. <code>bound</code>, <code>listen-in-progress</code>, <code>listening</code>, <code>connect-in-progress</code> or <code>connected</code>)</p>
+<h2>In addition to the general error codes documented on the
+<code>network::error-code</code> type, TCP socket methods may always return
+<code>error(invalid-state)</code> when in the <code>closed</code> state.</h2>
 <h3>Functions</h3>
 <h4><a name="method_tcp_socket.start_bind"><code>[method]tcp-socket.start-bind: func</code></a></h4>
 <p>Bind the socket to a specific network on the provided IP address and port.</p>
 <p>If the IP address is zero (<code>0.0.0.0</code> in IPv4, <code>::</code> in IPv6), it is left to the implementation to decide which
 network interface(s) to bind to.
 If the TCP/UDP port is zero, the socket will be bound to a random free port.</p>
-<p>Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.</p>
-<h1>Typical <code>start</code> errors</h1>
+<p>Bind can be attempted multiple times on the same socket, even with
+different arguments on each iteration. But never concurrently and
+only as long as the previous bind failed. Once a bind succeeds, the
+binding can't be changed anymore.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>local-address</code> has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)</li>
 <li><code>invalid-argument</code>:          <code>local-address</code> is not a unicast address. (EINVAL)</li>
 <li><code>invalid-argument</code>:          <code>local-address</code> is an IPv4-mapped IPv6 address. (EINVAL)</li>
 <li><code>invalid-state</code>:             The socket is already bound. (EINVAL)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
 <li><code>address-in-use</code>:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)</li>
 <li><code>address-in-use</code>:            Address is already in use. (EADDRINUSE)</li>
 <li><code>address-not-bindable</code>:      <code>local-address</code> is not an address that the <a href="#network"><code>network</code></a> can bind to. (EADDRNOTAVAIL)</li>
@@ -2320,6 +2340,10 @@ If the TCP/UDP port is zero, the socket will be bound to a random free port.</p>
 state of a recently closed socket on the same local address. In practice this means that the SO_REUSEADDR
 socket option should be set implicitly on all platforms, except on Windows where this is the default behavior
 and SO_REUSEADDR performs something different entirely.</p>
+<p>Unlike in POSIX, in WASI the bind operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>bind</code> as part of either <code>start-bind</code> or <code>finish-bind</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html</a></li>
@@ -2350,12 +2374,13 @@ and SO_REUSEADDR performs something different entirely.</p>
 <p>Connect to a remote endpoint.</p>
 <p>On success:</p>
 <ul>
-<li>the socket is transitioned into the Connection state</li>
+<li>the socket is transitioned into the <code>connection</code> state.</li>
 <li>a pair of streams is returned that can be used to read &amp; write to the connection</li>
 </ul>
-<p>After a failed connection attempt, the only valid action left is to
-<code>drop</code> the socket. A single socket can not be used to connect more than once.</p>
-<h1>Typical <code>start</code> errors</h1>
+<p>After a failed connection attempt, the socket will be in the <code>closed</code>
+state and the only valid action left is to <code>drop</code> the socket. A single
+socket can not be used to connect more than once.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:          The <code>remote-address</code> has the wrong address family. (EAFNOSUPPORT)</li>
 <li><code>invalid-argument</code>:          <code>remote-address</code> is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)</li>
@@ -2363,20 +2388,24 @@ and SO_REUSEADDR performs something different entirely.</p>
 <li><code>invalid-argument</code>:          The IP address in <code>remote-address</code> is set to INADDR_ANY (<code>0.0.0.0</code> / <code>::</code>). (EADDRNOTAVAIL on Windows)</li>
 <li><code>invalid-argument</code>:          The port in <code>remote-address</code> is set to 0. (EADDRNOTAVAIL on Windows)</li>
 <li><code>invalid-argument</code>:          The socket is already attached to a different network. The <a href="#network"><code>network</code></a> passed to <code>connect</code> must be identical to the one passed to <code>bind</code>.</li>
-<li><code>invalid-state</code>:             The socket is already in the Connection state. (EISCONN)</li>
-<li><code>invalid-state</code>:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
+<li><code>invalid-state</code>:             The socket is already in the <code>connected</code> state. (EISCONN)</li>
+<li><code>invalid-state</code>:             The socket is already in the <code>listening</code> state. (EOPNOTSUPP, EINVAL on Windows)</li>
 <li><code>timeout</code>:                   Connection timed out. (ETIMEDOUT)</li>
 <li><code>connection-refused</code>:        The connection was forcefully rejected. (ECONNREFUSED)</li>
 <li><code>connection-reset</code>:          The connection was reset. (ECONNRESET)</li>
 <li><code>connection-aborted</code>:        The connection was aborted. (ECONNABORTED)</li>
 <li><code>remote-unreachable</code>:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET)</li>
 <li><code>address-in-use</code>:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)</li>
-<li><code>not-in-progress</code>:           A <code>connect</code> operation is not in progress.</li>
+<li><code>not-in-progress</code>:           A connect operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>The POSIX equivalent of <code>start-connect</code> is the regular <code>connect</code> syscall.
+Because all WASI sockets are non-blocking this is expected to return
+EINPROGRESS, which should be translated to <code>ok()</code> in WASI.</p>
+<p>The POSIX equivalent of <code>finish-connect</code> is a <a href="#poll"><code>poll</code></a> for event <code>POLLOUT</code>
+with a timeout of 0 on the socket descriptor. Followed by a check for
+the <code>SO_ERROR</code> socket option, in case the poll signaled readiness.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html</a></li>
@@ -2405,24 +2434,22 @@ and SO_REUSEADDR performs something different entirely.</p>
 </ul>
 <h4><a name="method_tcp_socket.start_listen"><code>[method]tcp-socket.start-listen: func</code></a></h4>
 <p>Start listening for new connections.</p>
-<p>Transitions the socket into the Listener state.</p>
-<p>Unlike POSIX:</p>
-<ul>
-<li>this function is async. This enables interactive WASI hosts to inject permission prompts.</li>
-<li>the socket must already be explicitly bound.</li>
-</ul>
-<h1>Typical <code>start</code> errors</h1>
+<p>Transitions the socket into the <code>listening</code> state.</p>
+<p>Unlike POSIX, the socket must already be explicitly bound.</p>
+<h1>Typical errors</h1>
 <ul>
 <li><code>invalid-state</code>:             The socket is not bound to any local address. (EDESTADDRREQ)</li>
-<li><code>invalid-state</code>:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)</li>
-<li><code>invalid-state</code>:             The socket is already in the Listener state.</li>
-</ul>
-<h1>Typical <code>finish</code> errors</h1>
-<ul>
+<li><code>invalid-state</code>:             The socket is already in the <code>connected</code> state. (EISCONN, EINVAL on BSD)</li>
+<li><code>invalid-state</code>:             The socket is already in the <code>listening</code> state.</li>
 <li><code>address-in-use</code>:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)</li>
-<li><code>not-in-progress</code>:           A <code>listen</code> operation is not in progress.</li>
+<li><code>not-in-progress</code>:           A listen operation is not in progress.</li>
 <li><code>would-block</code>:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)</li>
 </ul>
+<h1>Implementors note</h1>
+<p>Unlike in POSIX, in WASI the listen operation is async. This enables
+interactive WASI hosts to inject permission prompts. Runtimes that
+don't want to make use of this ability can simply call the native
+<code>listen</code> as part of either <code>start-listen</code> or <code>finish-listen</code>.</p>
 <h1>References</h1>
 <ul>
 <li><a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html">https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html</a></li>
@@ -2449,7 +2476,7 @@ and SO_REUSEADDR performs something different entirely.</p>
 </ul>
 <h4><a name="method_tcp_socket.accept"><code>[method]tcp-socket.accept: func</code></a></h4>
 <p>Accept a new client socket.</p>
-<p>The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:</p>
+<p>The returned socket is bound and in the <code>connected</code> state. The following properties are inherited from the listener socket:</p>
 <ul>
 <li><code>address-family</code></li>
 <li><code>keep-alive-enabled</code></li>
@@ -2464,7 +2491,7 @@ and SO_REUSEADDR performs something different entirely.</p>
 a pair of streams that can be used to read &amp; write to the connection.</p>
 <h1>Typical errors</h1>
 <ul>
-<li><code>invalid-state</code>:      Socket is not in the Listener state. (EINVAL)</li>
+<li><code>invalid-state</code>:      Socket is not in the <code>listening</code> state. (EINVAL)</li>
 <li><code>would-block</code>:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)</li>
 <li><code>connection-aborted</code>: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)</li>
 <li><code>new-socket-limit</code>:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)</li>
@@ -2533,7 +2560,7 @@ stored in the object pointed to by <code>address</code> is unspecified.</p>
 <li><a name="method_tcp_socket.remote_address.0"></a> result&lt;<a href="#ip_socket_address"><a href="#ip_socket_address"><code>ip-socket-address</code></a></a>, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
 <h4><a name="method_tcp_socket.is_listening"><code>[method]tcp-socket.is-listening: func</code></a></h4>
-<p>Whether the socket is listening for new connections.</p>
+<p>Whether the socket is in the <code>listening</code> state.</p>
 <p>Equivalent to the SO_ACCEPTCONN socket option.</p>
 <h5>Params</h5>
 <ul>
@@ -2562,7 +2589,7 @@ Any other value will never cause an error, but it might be silently clamped and/
 <ul>
 <li><code>not-supported</code>:        (set) The platform does not support changing the backlog size after the initial listen.</li>
 <li><code>invalid-argument</code>:     (set) The provided value was 0.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
+<li><code>invalid-state</code>:        (set) The socket is in the <code>connect-in-progress</code> or <code>connected</code> state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2691,8 +2718,6 @@ I.e. after setting a value, reading the same setting back may return a different
 <h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:     (set) The TTL value must be 1 or higher.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Listener state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2721,8 +2746,6 @@ I.e. after setting a value, reading the same setting back may return a different
 <h1>Typical errors</h1>
 <ul>
 <li><code>invalid-argument</code>:     (set) The provided value was 0.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Connection state.</li>
-<li><code>invalid-state</code>:        (set) The socket is already in the Listener state.</li>
 </ul>
 <h5>Params</h5>
 <ul>
@@ -2762,7 +2785,17 @@ I.e. after setting a value, reading the same setting back may return a different
 <li><a name="method_tcp_socket.set_send_buffer_size.0"></a> result&lt;_, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;</li>
 </ul>
 <h4><a name="method_tcp_socket.subscribe"><code>[method]tcp-socket.subscribe: func</code></a></h4>
-<p>Create a <a href="#pollable"><code>pollable</code></a> which will resolve once the socket is ready for I/O.</p>
+<p>Create a <a href="#pollable"><code>pollable</code></a> which can be used to poll for, or block on,
+completion of any of the asynchronous operations of this socket.</p>
+<p>When <code>finish-bind</code>, <code>finish-listen</code>, <code>finish-connect</code> or <code>accept</code>
+return <code>error(would-block)</code>, this pollable can be used to wait for
+their success or failure, after which the method can be retried.</p>
+<p>The pollable is not limited to the async operation that happens to be
+in progress at the time of calling <code>subscribe</code> (if any). Theoretically,
+<code>subscribe</code> only has to be called once per socket and can then be
+(re)used for the remainder of the socket's lifetime.</p>
+<p>See <a href="https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness">https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness</a>
+for a more information.</p>
 <p>Note: this function is here for WASI Preview2 only.
 It's planned to be removed when <code>future</code> is natively supported in Preview3.</p>
 <h5>Params</h5>
@@ -2789,7 +2822,7 @@ has no effect and returns <code>ok</code>.</p>
 <p>The shutdown function does not close (drop) the socket.</p>
 <h1>Typical errors</h1>
 <ul>
-<li><code>invalid-state</code>: The socket is not in the Connection state. (ENOTCONN)</li>
+<li><code>invalid-state</code>: The socket is not in the <code>connected</code> state. (ENOTCONN)</li>
 </ul>
 <h1>References</h1>
 <ul>
diff --git a/wit/deps.lock b/wit/deps.lock
index c891d86..24b86d9 100644
--- a/wit/deps.lock
+++ b/wit/deps.lock
@@ -20,5 +20,5 @@ sha512 = "cc4fa3d178559a89d9d6a376e3359b892158d1e73317c5db1f797ebc6b0b57abf24227
 
 [sockets]
 url = "https://github.com/WebAssembly/wasi-sockets/archive/main.tar.gz"
-sha256 = "40863017f355ac90c57630cc00b94518804e8e2c5694a7870b7a54dbdcda0e08"
-sha512 = "2d6a919247430e869bf85a06a6a1d198f04368951e76c1fec7961b2b07af381c58c8e8b9079c91925dfbf80976971213329be57d59a90bae6e4e6460b073dc88"
+sha256 = "9a3816bfa5a8b0673e5651024d8f9a1540f169f6d70f2bde6ee0e8240cd177ee"
+sha512 = "bfcce89127510e16e9e7d7ac058ba3108953067e2d53f05cb1020dadf552738753b7fc9d10797236f2ced089063de7ac853fd9526079758fab1419d9b58a5212"
diff --git a/wit/deps/sockets/tcp.wit b/wit/deps/sockets/tcp.wit
index e045a43..9f12b82 100644
--- a/wit/deps/sockets/tcp.wit
+++ b/wit/deps/sockets/tcp.wit
@@ -15,9 +15,28 @@ interface tcp {
         /// Similar to `SHUT_RDWR` in POSIX.
         both,
     }
-
-
-    /// A TCP socket handle.
+    
+    /// A TCP socket resource.
+    ///
+    /// The socket can be in one of the following states:
+    /// - `unbound`
+    /// - `bind-in-progress`
+    /// - `bound` (See note below)
+    /// - `listen-in-progress`
+    /// - `listening`
+    /// - `connect-in-progress`
+    /// - `connected`
+    /// - `closed`
+    /// See <https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md>
+    /// for a more information.
+    ///
+    /// Note: Except where explicitly mentioned, whenever this documentation uses
+    /// the term "bound" without backticks it actually means: in the `bound` state *or higher*.
+    /// (i.e. `bound`, `listen-in-progress`, `listening`, `connect-in-progress` or `connected`)
+    ///
+    /// In addition to the general error codes documented on the
+    /// `network::error-code` type, TCP socket methods may always return
+    /// `error(invalid-state)` when in the `closed` state.
     resource tcp-socket {
         /// Bind the socket to a specific network on the provided IP address and port.
         ///
@@ -25,15 +44,16 @@ interface tcp {
         /// network interface(s) to bind to.
         /// If the TCP/UDP port is zero, the socket will be bound to a random free port.
         ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+        /// Bind can be attempted multiple times on the same socket, even with
+        /// different arguments on each iteration. But never concurrently and
+        /// only as long as the previous bind failed. Once a bind succeeds, the
+        /// binding can't be changed anymore.
         ///
-        /// # Typical `start` errors
+        /// # Typical errors
         /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
         /// - `invalid-argument`:          `local-address` is not a unicast address. (EINVAL)
         /// - `invalid-argument`:          `local-address` is an IPv4-mapped IPv6 address. (EINVAL)
         /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
         /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
         /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
         /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
@@ -46,6 +66,11 @@ interface tcp {
         /// socket option should be set implicitly on all platforms, except on Windows where this is the default behavior
         /// and SO_REUSEADDR performs something different entirely.
         ///
+        /// Unlike in POSIX, in WASI the bind operation is async. This enables
+        /// interactive WASI hosts to inject permission prompts. Runtimes that
+        /// don't want to make use of this ability can simply call the native
+        /// `bind` as part of either `start-bind` or `finish-bind`.
+        ///
         /// # References
         /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
         /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
@@ -57,32 +82,40 @@ interface tcp {
         /// Connect to a remote endpoint.
         ///
         /// On success:
-        /// - the socket is transitioned into the Connection state
+        /// - the socket is transitioned into the `connection` state.
         /// - a pair of streams is returned that can be used to read & write to the connection
         ///
-        /// After a failed connection attempt, the only valid action left is to
-        /// `drop` the socket. A single socket can not be used to connect more than once.
+        /// After a failed connection attempt, the socket will be in the `closed`
+        /// state and the only valid action left is to `drop` the socket. A single
+        /// socket can not be used to connect more than once.
         ///
-        /// # Typical `start` errors
+        /// # Typical errors
         /// - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
         /// - `invalid-argument`:          `remote-address` is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)
         /// - `invalid-argument`:          `remote-address` is an IPv4-mapped IPv6 address. (EINVAL, EADDRNOTAVAIL on Illumos)
         /// - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
         /// - `invalid-argument`:          The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
         /// - `invalid-argument`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN)
-        /// - `invalid-state`:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
-        ///
-        /// # Typical `finish` errors
+        /// - `invalid-state`:             The socket is already in the `connected` state. (EISCONN)
+        /// - `invalid-state`:             The socket is already in the `listening` state. (EOPNOTSUPP, EINVAL on Windows)
         /// - `timeout`:                   Connection timed out. (ETIMEDOUT)
         /// - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
         /// - `connection-reset`:          The connection was reset. (ECONNRESET)
         /// - `connection-aborted`:        The connection was aborted. (ECONNABORTED)
         /// - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET)
         /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
-        /// - `not-in-progress`:           A `connect` operation is not in progress.
+        /// - `not-in-progress`:           A connect operation is not in progress.
         /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
         ///
+        /// # Implementors note
+        /// The POSIX equivalent of `start-connect` is the regular `connect` syscall.
+        /// Because all WASI sockets are non-blocking this is expected to return
+        /// EINPROGRESS, which should be translated to `ok()` in WASI.
+        ///
+        /// The POSIX equivalent of `finish-connect` is a `poll` for event `POLLOUT`
+        /// with a timeout of 0 on the socket descriptor. Followed by a check for
+        /// the `SO_ERROR` socket option, in case the poll signaled readiness.
+        ///
         /// # References
         /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
         /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
@@ -93,22 +126,24 @@ interface tcp {
 
         /// Start listening for new connections.
         ///
-        /// Transitions the socket into the Listener state.
+        /// Transitions the socket into the `listening` state.
         ///
-        /// Unlike POSIX:
-        /// - this function is async. This enables interactive WASI hosts to inject permission prompts.
-        /// - the socket must already be explicitly bound.
+        /// Unlike POSIX, the socket must already be explicitly bound.
         ///
-        /// # Typical `start` errors
+        /// # Typical errors
         /// - `invalid-state`:             The socket is not bound to any local address. (EDESTADDRREQ)
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
-        /// - `invalid-state`:             The socket is already in the Listener state.
-        ///
-        /// # Typical `finish` errors
+        /// - `invalid-state`:             The socket is already in the `connected` state. (EISCONN, EINVAL on BSD)
+        /// - `invalid-state`:             The socket is already in the `listening` state.
         /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
-        /// - `not-in-progress`:           A `listen` operation is not in progress.
+        /// - `not-in-progress`:           A listen operation is not in progress.
         /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
         ///
+        /// # Implementors note
+        /// Unlike in POSIX, in WASI the listen operation is async. This enables
+        /// interactive WASI hosts to inject permission prompts. Runtimes that
+        /// don't want to make use of this ability can simply call the native
+        /// `listen` as part of either `start-listen` or `finish-listen`.
+        ///
         /// # References
         /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>
         /// - <https://man7.org/linux/man-pages/man2/listen.2.html>
@@ -119,7 +154,7 @@ interface tcp {
 
         /// Accept a new client socket.
         ///
-        /// The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:
+        /// The returned socket is bound and in the `connected` state. The following properties are inherited from the listener socket:
         /// - `address-family`
         /// - `keep-alive-enabled`
         /// - `keep-alive-idle-time`
@@ -133,7 +168,7 @@ interface tcp {
         /// a pair of streams that can be used to read & write to the connection.
         ///
         /// # Typical errors
-        /// - `invalid-state`:      Socket is not in the Listener state. (EINVAL)
+        /// - `invalid-state`:      Socket is not in the `listening` state. (EINVAL)
         /// - `would-block`:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
         /// - `connection-aborted`: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)
         /// - `new-socket-limit`:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
@@ -175,7 +210,7 @@ interface tcp {
         /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
         remote-address: func() -> result<ip-socket-address, error-code>;
 
-        /// Whether the socket is listening for new connections.
+        /// Whether the socket is in the `listening` state.
         ///
         /// Equivalent to the SO_ACCEPTCONN socket option.
         is-listening: func() -> bool;
@@ -193,7 +228,7 @@ interface tcp {
         /// # Typical errors
         /// - `not-supported`:        (set) The platform does not support changing the backlog size after the initial listen.
         /// - `invalid-argument`:     (set) The provided value was 0.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
+        /// - `invalid-state`:        (set) The socket is in the `connect-in-progress` or `connected` state.
         set-listen-backlog-size: func(value: u64) -> result<_, error-code>;
 
         /// Enables or disables keepalive.
@@ -253,8 +288,6 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The TTL value must be 1 or higher.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
         hop-limit: func() -> result<u8, error-code>;
         set-hop-limit: func(value: u8) -> result<_, error-code>;
 
@@ -268,14 +301,25 @@ interface tcp {
         ///
         /// # Typical errors
         /// - `invalid-argument`:     (set) The provided value was 0.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
         receive-buffer-size: func() -> result<u64, error-code>;
         set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
         send-buffer-size: func() -> result<u64, error-code>;
         set-send-buffer-size: func(value: u64) -> result<_, error-code>;
 
-        /// Create a `pollable` which will resolve once the socket is ready for I/O.
+        /// Create a `pollable` which can be used to poll for, or block on,
+        /// completion of any of the asynchronous operations of this socket.
+        ///
+        /// When `finish-bind`, `finish-listen`, `finish-connect` or `accept`
+        /// return `error(would-block)`, this pollable can be used to wait for
+        /// their success or failure, after which the method can be retried.
+        ///
+        /// The pollable is not limited to the async operation that happens to be
+        /// in progress at the time of calling `subscribe` (if any). Theoretically,
+        /// `subscribe` only has to be called once per socket and can then be
+        /// (re)used for the remainder of the socket's lifetime.
+        ///
+        /// See <https://github.com/WebAssembly/wasi-sockets/TcpSocketOperationalSemantics.md#Pollable-readiness>
+        /// for a more information.
         ///
         /// Note: this function is here for WASI Preview2 only.
         /// It's planned to be removed when `future` is natively supported in Preview3.
@@ -297,7 +341,7 @@ interface tcp {
         /// The shutdown function does not close (drop) the socket.
         ///
         /// # Typical errors
-        /// - `invalid-state`: The socket is not in the Connection state. (ENOTCONN)
+        /// - `invalid-state`: The socket is not in the `connected` state. (ENOTCONN)
         ///
         /// # References
         /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
diff --git a/wit/deps/sockets/udp.wit b/wit/deps/sockets/udp.wit
index ae82b97..6ba380f 100644
--- a/wit/deps/sockets/udp.wit
+++ b/wit/deps/sockets/udp.wit
@@ -43,19 +43,21 @@ interface udp {
         /// network interface(s) to bind to.
         /// If the port is zero, the socket will be bound to a random free port.
         ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
-        ///
-        /// # Typical `start` errors
+        /// # Typical errors
         /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
         /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
         /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
         /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
         /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
         /// - `not-in-progress`:           A `bind` operation is not in progress.
         /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
         ///
+        /// # Implementors note
+        /// Unlike in POSIX, in WASI the bind operation is async. This enables
+        /// interactive WASI hosts to inject permission prompts. Runtimes that
+        /// don't want to make use of this ability can simply call the native
+        /// `bind` as part of either `start-bind` or `finish-bind`.
+        ///
         /// # References
         /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
         /// - <https://man7.org/linux/man-pages/man2/bind.2.html>