From 8b6e5f4d48bbb955ab0b110fcb88e5186728f6ac Mon Sep 17 00:00:00 2001
From: Iliia Khaprov - VMware <ikhaprov@vmware.com>
Date: Tue, 2 Aug 2022 10:35:55 +0200
Subject: [PATCH 1/2] Follow-up for #5399. Add new vhost information items to
 the list

(cherry picked from commit 6aff83c834aea5fdb44370ebf2ec7b0321c1cc37)
---
 deps/rabbit/docs/rabbitmqctl.8 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deps/rabbit/docs/rabbitmqctl.8 b/deps/rabbit/docs/rabbitmqctl.8
index 4832948ea18a..752b9d0dd404 100644
--- a/deps/rabbit/docs/rabbitmqctl.8
+++ b/deps/rabbit/docs/rabbitmqctl.8
@@ -864,6 +864,14 @@ can take any value from the list that follows:
 The name of the virtual host with non-ASCII characters escaped as in C.
 .It Cm tracing
 Whether tracing is enabled for this virtual host.
+.It Cm default_queue_type
+Default queue type for this vhost.
+.It Cm description
+Virtual host description.
+.It Cm tags
+Virtual host tags.
+.It Cm cluster_state
+Virtual host state: nodedown, running, stopped.
 .El
 .Pp
 If no

From 8645ed5e98f26e92f3f9b8bfc14e31b4a3cea469 Mon Sep 17 00:00:00 2001
From: Michael Klishin <klishinm@vmware.com>
Date: Tue, 2 Aug 2022 14:46:53 +0400
Subject: [PATCH 2/2] rabbitmqctl(8): document optional args supported by
 add_vhost

(cherry picked from commit abc1dcc5e6bd10554d1a408994dbaee551bf524b)
---
 deps/rabbit/docs/rabbitmqctl.8 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/deps/rabbit/docs/rabbitmqctl.8 b/deps/rabbit/docs/rabbitmqctl.8
index 752b9d0dd404..4d0959d187fc 100644
--- a/deps/rabbit/docs/rabbitmqctl.8
+++ b/deps/rabbit/docs/rabbitmqctl.8
@@ -1703,19 +1703,25 @@ not be visible to
 .Nm .
 .Bl -tag -width Ds
 .\" ------------------------------------------------------------------
-.It Cm add_vhost Ar vhost
+.It Cm add_vhost Ar vhost Op Fl description Ar desc Fl tags Ar tags Fl default-queue-type Ar default-q-type
 .Bl -tag -width Ds
 .It Ar vhost
 The name of the virtual host entry to create.
+.It Ar desc
+Arbitrary virtual host description, e.g. its purpose, for operator's convenience.
+.It Ar tags
+A comma-separated list of virtual host tags for operator's convenient
+.It Ar default-q-type
+If clients do not specify queue type explicitly, this type will be used. One of: quorum, stream.
 .El
 .Pp
 Creates a virtual host.
 .Pp
 For example, this command instructs the RabbitMQ broker to create a new
 virtual host called
-.Qq test :
+.Qq project9_dev_18 :
 .Pp
-.Dl rabbitmqctl add_vhost test
+.Dl rabbitmqctl add_vhost project9_dev_18 --description 'Dev environment no. 18' --tags "dev,project9"
 .\" ------------------------------------------------------------------
 .It Cm clear_vhost_limits Op Fl p Ar vhost
 .Pp