Merge branch 'main' into stringallocations

Author: michaelklishin

projects/RabbitMQ.Client/client/api/IModel.cs

@@ -415,26 +415,28 @@ void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, r
         void TxSelect();
 
         /// <summary>
-        /// Wait until all published messages have been confirmed.
+        /// Wait until all published messages on this channel have been confirmed.
         /// </summary>
         /// <returns>True if no nacks were received within the timeout, otherwise false.</returns>
         /// <param name="token">The cancellation token.</param>
         /// <remarks>
-        /// Waits until all messages published since the last call have
-        /// been either ack'd or nack'd by the broker.  Returns whether
-        /// all the messages were ack'd (and none were nack'd). Note,
-        /// throws an exception when called on a non-Confirm channel.
+        /// Waits until all messages published on this channel since the last call have
+        /// been either ack'd or nack'd by the server. Returns whether
+        /// all the messages were ack'd (and none were nack'd).
+        /// Throws an exception when called on a channel
+        /// that does not have publisher confirms enabled.
         /// </remarks>
         Task<bool> WaitForConfirmsAsync(CancellationToken token = default);
 
         /// <summary>
-        /// Wait until all published messages have been confirmed.
+        /// Wait until all published messages on this channel have been confirmed.
         /// </summary>
         /// <param name="token">The cancellation token.</param>
         /// <remarks>
-        /// Waits until all messages published since the last call have
-        /// been ack'd by the broker.  If a nack is received or the timeout
-        /// elapses, throws an IOException exception immediately.
+        /// Waits until all messages published on this channel since the last call have
+        /// been ack'd by the server. If a nack is received or the timeout
+        /// elapses, throws an IOException exception immediately and closes
+        /// the channel.
         /// </remarks>
         Task WaitForConfirmsOrDieAsync(CancellationToken token = default);