Merging upstream version 2.7.1.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/Documentation/nvme-wdc-get-dev-capabilities-log.html b/Documentation/nvme-wdc-get-dev-capabilities-log.html
index d2627dd..424d77d 100644
--- a/Documentation/nvme-wdc-get-dev-capabilities-log.html
+++ b/Documentation/nvme-wdc-get-dev-capabilities-log.html
@@ -740,7 +740,7 @@ nvme-wdc-get-dev-capabilities-log(1) Manual Page
 <h2>NAME</h2>

 <div class="sectionbody">

 <p>nvme-wdc-get-dev-capabilities-log -

-   Send NVMe WDC get-dev-capabilities-log                                                                         plugin command, return parsed log output

+   Send NVMe WDC get-dev-capabilities-log plugin command, return parsed log output

 </p>

 </div>

 </div>

@@ -749,8 +749,7 @@ nvme-wdc-get-dev-capabilities-log(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<pre class="content"><em>nvme wdc get-dev-capabilities-log</em> &lt;device&gt; [--output-format=&lt;normal|json&gt;

--o &lt;normal|json&gt;]</pre>

+<pre class="content"><em>nvme wdc get-dev-capabilities-log</em> &lt;device&gt; [--output-format=&lt;fmt&gt; | -o &lt;fmt&gt;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -774,10 +773,10 @@ code otherwise.</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>

@@ -816,7 +815,7 @@ Has the program issue WDC get-dev-capabilities-log plugin command :
 <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>