Merging upstream version 2.7.1.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/Documentation/nvme-list.html b/Documentation/nvme-list.html
index 976c90d..9d09113 100644
--- a/Documentation/nvme-list.html
+++ b/Documentation/nvme-list.html
@@ -749,7 +749,7 @@ nvme-list(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<pre class="content"><em>nvme list</em> [-o &lt;fmt&gt; | --output-format=&lt;fmt&gt;]</pre>

+<pre class="content"><em>nvme list</em> [--output-format=&lt;fmt&gt; | -o &lt;fmt&gt;] [--verbose | -v]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -766,15 +766,15 @@ for those devices as well as some pertinent information about them.</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

--o &lt;format&gt;

+-o &lt;fmt&gt;

 </dt>

 <dt class="hdlist1">

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

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

 </dt>

 <dd>

 <p>

-        Set the reporting format to <em>normal</em> or <em>json</em>. Only one output

-        format can be used at a time.

+        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">

@@ -816,7 +816,7 @@ for those devices as well as some pertinent information about them.</p></div>
 <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>