Merging upstream version 2.1~rc0 (Closes: #1015722).

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.1 b/Documentation/nvme-wdc-vs-fw-activate-history.1
index 97ad8ec..33719a7 100644
--- a/Documentation/nvme-wdc-vs-fw-activate-history.1
+++ b/Documentation/nvme-wdc-vs-fw-activate-history.1
@@ -2,12 +2,12 @@
 .\"     Title: nvme-wdc-vs-fw-activate-history
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 04/08/2022
+.\"      Date: 07/14/2022
 .\"    Manual: NVMe Manual
 .\"    Source: NVMe
 .\"  Language: English
 .\"
-.TH "NVME\-WDC\-VS\-FW\-A" "1" "04/08/2022" "NVMe" "NVMe Manual"
+.TH "NVME\-WDC\-VS\-FW\-A" "1" "07/14/2022" "NVMe" "NVMe Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -36,7 +36,7 @@ nvme-wdc-vs-fw-activate-history \- Execute NVMe WDC vs\-fw\-activate\-history Ve
 .fi
 .SH "DESCRIPTION"
 .sp
-For the NVMe device given, read a Vendor Unique WDC log page that returns the firmware actiation history\&.
+For the NVMe device given, read a Vendor Unique WDC log page that returns the firmware activation history\&.
 .sp
 The <device> parameter is mandatory and must be the NVMe character device (ex: /dev/nvme0)\&.
 .sp
@@ -109,7 +109,7 @@ T{
 \fBSlot Number\fR
 T}:T{
 .sp
-The slot tht the firmware is being activated from\&.
+The slot that the firmware is being activated from\&.
 T}
 T{
 .sp
@@ -123,7 +123,7 @@ T{
 \fBResult\fR
 T}:T{
 .sp
-The result of the firmware activation event\&. The ouput shall be in the format: Pass or Failed + error code
+The result of the firmware activation event\&. The output shall be in the format: Pass or Failed + error code
 T}
 .TE
 .sp 1