Merging upstream version 2.7.1.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/Documentation/nvme-wdc-vs-fw-activate-history.html b/Documentation/nvme-wdc-vs-fw-activate-history.html
index 53d3478..f1842a8 100644
--- a/Documentation/nvme-wdc-vs-fw-activate-history.html
+++ b/Documentation/nvme-wdc-vs-fw-activate-history.html
@@ -770,10 +770,10 @@ Results for any other device are undefined.</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>

@@ -805,7 +805,7 @@ cellspacing="0" cellpadding="4">
 <tbody>

 <tr>

 <td align="left" valign="top"><p class="table"><strong>Entry Number</strong></p></td>

-<td align="left" valign="top"><p class="table">The number of fw activate entry.  The most recent 20 entries will be displayed.</p></td>

+<td align="left" valign="top"><p class="table">The number of fw activate entry. The most recent 20 entries will be displayed.</p></td>

 </tr>

 <tr>

 <td align="left" valign="top"><p class="table"><strong>Power on Hour</strong></p></td>

@@ -833,7 +833,7 @@ cellspacing="0" cellpadding="4">
 </tr>

 <tr>

 <td align="left" valign="top"><p class="table"><strong>Result</strong></p></td>

-<td align="left" valign="top"><p class="table">The result of the firmware activation event.  The output shall be in the format:

+<td align="left" valign="top"><p class="table">The result of the firmware activation event. The output shall be in the format:

 Pass or Failed + error code</p></td>

 </tr>

 </tbody>

@@ -868,7 +868,7 @@ Has the program issue WDC vs-fw-activate-history Vendor Unique 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>