Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 5 deletions

diff --git a/Documentation/nvme-dim.html b/Documentation/nvme-dim.html
index f5eb82c..d88df34 100644
--- a/Documentation/nvme-dim.html
+++ b/Documentation/nvme-dim.html
@@ -749,10 +749,9 @@ nvme-dim(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<pre class="content"><em>nvme dim</em>

-                [--task=&lt;task&gt;     | -t &lt;task&gt;]

-                [--nqn=&lt;nqn&gt;       | -n &lt;nqn&gt;]

-                [--device=&lt;device&gt; | -d &lt;device&gt;]</pre>

+<pre class="content"><em>nvme dim</em> [--task=&lt;task&gt; | -t &lt;task&gt;] [--nqn=&lt;nqn&gt; | -n &lt;nqn&gt;]

+                        [--device=&lt;device&gt; | -d &lt;device&gt;]

+                        [--output-format=&lt;fmt&gt; | -o &lt;fmt&gt;] [--verbose | -v]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -817,6 +816,29 @@ with the nvme-discover(1) command using the --persistent option.</p></div>
         be supplied to apply the command to more than one DC.

 </p>

 </dd>

+<dt class="hdlist1">

+-o &lt;fmt&gt;

+</dt>

+<dt class="hdlist1">

+--output-format=&lt;fmt&gt;

+</dt>

+<dd>

+<p>

+        Set the reporting format to <em>normal</em>, <em>json</em> or <em>binary</em>. Only one

+        output format can be used at a time.

+</p>

+</dd>

+<dt class="hdlist1">

+-v

+</dt>

+<dt class="hdlist1">

+--verbose

+</dt>

+<dd>

+<p>

+        Increase the information detail in the output.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -863,7 +885,7 @@ Deregister from Central Discovery Controller (CDC) associated with nvme4
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-06-30 15:20:22 CEST

+ 2023-12-21 15:49:29 CET

 </div>

 </div>

 </body>