DOC-7716 Merge branch 'vulcan' into alice

* vulcan:
  DOC-7716 Update master-password docs synopsis

Change-Id: I27261b10bdfc14adb62e815fb7833738516f6759

Author: Carlos Gonzalez Betancort

docs/generated/doc/couchbase-cli/couchbase-cli-master-password.html

@@ -450,7 +450,7 @@ <h2 id="_name">NAME</h2>
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>couchbase-cli master-password</em> [--new-password &lt;password&gt;]</pre>
+<pre class="content"><em>couchbase-cli master-password</em> [--new-password &lt;password&gt;] [--rotate-data-key]</pre>
 </div>
 </div>
 </div>
@@ -484,10 +484,15 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="dlist">
 <dl>
-<dt class="hdlist1">--send-password</dt>
+<dt class="hdlist1">--new-password</dt>
 <dd>
 <p>Sends the master password to the server that is waiting to start up.</p>
 </dd>
+<dt class="hdlist1">--rotate-data-key</dt>
+<dd>
+<p>If provided it will rotate the master password data key. This option cannot
+be provided together with <code>--new-password</code>.</p>
+</dd>
 </dl>
 </div>
 </div>

docs/generated/man/man1/couchbase-cli-master-password.1

@@ -7,7 +7,7 @@
 .\"    Source: Couchbase CLI 1.0.0
 .\"  Language: English
 .\"
-.TH "COUCHBASE\-CLI\-MASTER\-PASSWORD" "1" "2020-10-06" "Couchbase CLI 1.0.0" "Couchbase CLI Manual"
+.TH "COUCHBASE\-CLI\-MASTER\-PASSWORD" "1" "2021-01-29" "Couchbase CLI 1.0.0" "Couchbase CLI Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -33,7 +33,7 @@ couchbase\-cli\-master\-password \- Sends the Couchbase master password
 .sp
 .sp
 .nf
-\fIcouchbase\-cli master\-password\fP [\-\-new\-password <password>]
+\fIcouchbase\-cli master\-password\fP [\-\-new\-password <password>] [\-\-rotate\-data\-key]
 .fi
 .br
 .SH "DESCRIPTION"
@@ -57,10 +57,16 @@ couchbase\-cli master\-password command. This command must be run locally on the
 node that needs to be unlocked.
 .SH "OPTIONS"
 .sp
-\-\-send\-password
+\-\-new\-password
 .RS 4
 Sends the master password to the server that is waiting to start up.
 .RE
+.sp
+\-\-rotate\-data\-key
+.RS 4
+If provided it will rotate the master password data key. This option cannot
+be provided together with \f(CR\-\-new\-password\fP.
+.RE
 .SH "EXAMPLES"
 .sp
 To use the Secret Management feature, the first thing you need to do is set a
@@ -124,4 +130,4 @@ password are not cached in their command line history.
 Part of the \fBcouchbase\-cli\fP(1) suite
 .SH "AUTHOR"
 .sp
-Couchbase
+Couchbase

docs/modules/cli/pages/cbcli/couchbase-cli-master-password.adoc

@@ -11,7 +11,7 @@ Sends the Couchbase master password
 == SYNOPSIS
 
 [verse]
-_couchbase-cli master-password_ [--new-password <password>]
+_couchbase-cli master-password_ [--new-password <password>] [--rotate-data-key]
 
 == DESCRIPTION
 
@@ -36,9 +36,12 @@ node that needs to be unlocked.
 == OPTIONS
 
 
---send-password::
+--new-password::
   Sends the master password to the server that is waiting to start up.
 
+--rotate-data-key::
+  If provided it will rotate the master password data key. This option cannot
+  be provided together with `--new-password`.
 
 == EXAMPLES