Merge branch 'v3.11.x' into live

Conflicts:
	site/documentation.md
	site/ha.md
	site/oauth2.md
	site/quorum-queues.md

Author: michaelklishin

site/documentation.md

@@ -147,7 +147,7 @@ for the original RabbitMQ protocol.
 ### Replicated Queue Types, Streams, High Availability
 
  * [Quorum Queues](quorum-queues.html): a modern highly available replicated queue type
- * [Migrating RabbitMQ Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html)
+ * [Migrating Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html)
  * [Streams](streams.html): a messaging abstraction that allows for repeatable consumption
  * [RabbitMQ Stream plugin](stream.html): the plugin and binary protocol behind RabbitMQ streams
 

site/ha.md

@@ -21,7 +21,7 @@ limitations under the License.
 
 This guide covers a [**deprecated and scheduled for removal feature**](https://blog.rabbitmq.com/posts/2021/08/4.0-deprecation-announcements/): mirroring (queue contents replication) of classic queues.[Quorum queues](quorum-queues.html) are an alternative to mirrored classic queues. 
 
-Quorum queues are a more advanced queue type, which offers high availability using  replication and focuses on data safety. From RabbitMQ 3.10, quorum queues [support message TTL](https://blog.rabbitmq.com/posts/2022/05/rabbitmq-3.10-release-overview/) and provide [higher throughput and more stable latency](https://blog.rabbitmq.com/posts/2022/05/rabbitmq-3.10-performance-improvements/) compared to mirrored classic queues. Use the [Migrate your RabbitMQ Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html) information for options for your RabbitMQ installations that currently use classic mirrored queues and require an alternative.
+Quorum queues are a more advanced queue type, which offers high availability using  replication and focuses on data safety. From RabbitMQ 3.10, quorum queues [support message TTL](https://blog.rabbitmq.com/posts/2022/05/rabbitmq-3.10-release-overview/) and provide [higher throughput and more stable latency](https://blog.rabbitmq.com/posts/2022/05/rabbitmq-3.10-performance-improvements/) compared to mirrored classic queues. You can [Migrate your RabbitMQ Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html) now.
 
 [Streams](streams.html) is a messaging data structure available as of [RabbitMQ 3.9](changelog.html),
 and is also replicated.

site/quorum-queues.md

@@ -22,7 +22,9 @@ limitations under the License.
 The quorum queue is a modern queue type for RabbitMQ implementing a durable,
 replicated FIFO queue based on the [Raft consensus algorithm](https://raft.github.io/).
 
-Quorum queues and [streams](./streams.html) now replace the original, replicated [mirrored classic queue](ha.html). Mirrored classic queues are [now deprecated and scheduled for removal](https://blog.rabbitmq.com/posts/2021/08/4.0-deprecation-announcements/). Use the [Migrate your RabbitMQ Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html) information for options for your RabbitMQ installations that currently use classic mirrored queues and require an alternative.
+Quorum queues and [streams](./streams.html) now replace the original, replicated [mirrored classic queue](ha.html). Mirrored classic queues are [now deprecated and scheduled for removal](https://blog.rabbitmq.com/posts/2021/08/4.0-deprecation-announcements/).
+Use the [Migrate your RabbitMQ Mirrored Classic Queues to Quorum Queues](./migrate-mcq-to-qq.html) guide for migrating
+RabbitMQ installations that currently use classic mirrored queues.
 
 Quorum queues are optimized for [set of use cases](#use-cases) where [data safety](#data-safety) is
 a top priority. This is covered in [Motivation](#motivation).