MB-35130 Merge branch 'vulcan' into alice

* vulcan:
  MB-35130 Correct query_manage_index RBAC role in doc

Change-Id: I2efbe3f12dae6ffa8e7398f0da8173638280246c

Author: mcpaddy

docs/generated/doc/couchbase-cli/couchbase-cli-user-manage.html

@@ -712,15 +712,15 @@ <h3 id="_roles">ROLES</h3>
 <div class="dlist">
 <div class="title">Query Service Roles:</div>
 <dl>
-<dt class="hdlist1">manage_index[&#8230;&#8203;]</dt>
+<dt class="hdlist1">query_manage_index[&#8230;&#8203;]</dt>
 <dd>
 <p>Allows the user to create and delete indexes on the specified buckets. To
 give a user the ability to create and delete indexes on all buckets set
-their role to manage_index[*]. To give the user permission to create and
-delete indexes on a single bucket named <em>default</em> then specify their role
-as manage_index[default]. If the user needs to be create and delete indexes
-for multiple buckets, for example <em>default</em> and <em>app</em>, then set their role
-as manage_index[default],manage_index[app].</p>
+their role to query_manage_index[*]. To give the user permission to create
+and delete indexes on a single bucket named <em>default</em> then specify their
+role as query_manage_index[default]. If the user needs to be create and
+delete indexes for multiple buckets, for example <em>default</em> and <em>app</em>, then
+set their role as query_manage_index[default],query_manage_index[app].</p>
 </dd>
 <dt class="hdlist1">query_delete[&#8230;&#8203;]</dt>
 <dd>

docs/generated/man/man1/couchbase-cli-user-manage.1

@@ -2,12 +2,12 @@
 .\"     Title: couchbase-cli-user-manage
 .\"    Author: Couchbase
 .\" Generator: Asciidoctor 2.0.10
-.\"      Date: 2019-07-16
+.\"      Date: 2019-07-25
 .\"    Manual: Couchbase CLI Manual
 .\"    Source: Couchbase CLI 1.0.0
 .\"  Language: English
 .\"
-.TH "COUCHBASE\-CLI\-USER\-MANAGE" "1" "2019-07-16" "Couchbase CLI 1.0.0" "Couchbase CLI Manual"
+.TH "COUCHBASE\-CLI\-USER\-MANAGE" "1" "2019-07-25" "Couchbase CLI 1.0.0" "Couchbase CLI Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -313,15 +313,15 @@ fts_searcher[default],fts_searcher[app].
 .B Query Service Roles:
 .br
 .sp
-manage_index[...]
+query_manage_index[...]
 .RS 4
 Allows the user to create and delete indexes on the specified buckets. To
 give a user the ability to create and delete indexes on all buckets set
-their role to manage_index[*]. To give the user permission to create and
-delete indexes on a single bucket named \fIdefault\fP then specify their role
-as manage_index[default]. If the user needs to be create and delete indexes
-for multiple buckets, for example \fIdefault\fP and \fIapp\fP, then set their role
-as manage_index[default],manage_index[app].
+their role to query_manage_index[*]. To give the user permission to create
+and delete indexes on a single bucket named \fIdefault\fP then specify their
+role as query_manage_index[default]. If the user needs to be create and
+delete indexes for multiple buckets, for example \fIdefault\fP and \fIapp\fP, then
+set their role as query_manage_index[default],query_manage_index[app].
 .RE
 .sp
 query_delete[...]

docs/modules/cli/pages/cbcli/couchbase-cli-user-manage.adoc

@@ -184,14 +184,14 @@ fts_searcher[...]::
 
 .Query Service Roles:
 
-manage_index[...]::
+query_manage_index[...]::
   Allows the user to create and delete indexes on the specified buckets. To
   give a user the ability to create and delete indexes on all buckets set
-  their role to manage_index[*]. To give the user permission to create and
-  delete indexes on a single bucket named _default_ then specify their role
-  as manage_index[default]. If the user needs to be create and delete indexes
-  for multiple buckets, for example _default_ and _app_, then set their role
-  as manage_index[default],manage_index[app].
+  their role to query_manage_index[*]. To give the user permission to create
+  and delete indexes on a single bucket named _default_ then specify their
+  role as query_manage_index[default]. If the user needs to be create and
+  delete indexes for multiple buckets, for example _default_ and _app_, then
+  set their role as query_manage_index[default],query_manage_index[app].
 
 query_delete[...]::
   Allows the user to execute DELETE query statements on the specified buckets.