From 928fecd134d9e328a3d4e7f91797b11503e8a70a Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan@huawei.com>
Date: Fri, 14 Oct 2016 15:37:52 +0800
Subject: [PATCH] Update the doc for Zaqar v2
Zaqar v1 and v1.1 is deprecated now, and the V2 is the default API
version. Update the plugin doc for it.
Change-Id: I26db823852ba543607b250a09aae63bb439a8959
---
doc/source/commands.rst | 5 ++++-
doc/source/plugin-commands.rst | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 53272f68ea..de473a063d 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -159,6 +159,7 @@ list check out :doc:`plugin-commands`.
* ``action definition``: (**Workflow Engine (Mistral)**)
* ``action execution``: (**Workflow Engine (Mistral)**)
* ``baremetal``: (**Baremetal (Ironic)**)
+* ``claim``: (**Messaging (Zaqar)**)
* ``cluster``: (**Clustering (Senlin)**)
* ``cluster action``: (**Clustering (Senlin)**)
* ``cluster event``: (**Clustering (Senlin)**)
@@ -180,7 +181,8 @@ list check out :doc:`plugin-commands`.
* ``dataprocessing image tags``: (**Data Processing (Sahara)**)
* ``dataprocessing plugin``: (**Data Processing (Sahara)**)
* ``message-broker cluster``: (**Message Broker (Cue)**)
-* ``message flavor``: (**Messaging (Zaqar)**)
+* ``messaging``: (**Messaging (Zaqar)**)
+* ``messaging flavor``: (**Messaging (Zaqar)**)
* ``network subport``: (**Networking (Neutron)**)
* ``network trunk``: (**Networking (Neutron)**)
* ``orchestration resource``: (**Orchestration (Heat)**)
@@ -200,6 +202,7 @@ list check out :doc:`plugin-commands`.
* ``stack resource``: (**Orchestration (Heat)**)
* ``stack snapshot``: (**Orchestration (Heat)**)
* ``stack template``: (**Orchestration (Heat)**)
+* ``subscription``: (**Messaging (Zaqar)**)
* ``task execution``: (**Workflow Engine (Mistral)**)
* ``tld``: (**DNS (Designate)**)
* ``workbook``: (**Workflow Engine (Mistral)**)
diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst
index 616d2f0f62..7428b34d01 100644
--- a/doc/source/plugin-commands.rst
+++ b/doc/source/plugin-commands.rst
@@ -105,5 +105,5 @@ senlin
zaqar
-----
-.. list-plugins:: openstack.messaging.v1
+.. list-plugins:: openstack.messaging.v2
:detailed: