From 66e4b69042cd3b44acd42f1fad2109180c1bc48b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 24 Dec 2023 08:57:54 +0100
Subject: Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-set-feature.txt | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'Documentation/nvme-set-feature.txt')

diff --git a/Documentation/nvme-set-feature.txt b/Documentation/nvme-set-feature.txt
index 08b38f4..05c2210 100644
--- a/Documentation/nvme-set-feature.txt
+++ b/Documentation/nvme-set-feature.txt
@@ -9,11 +9,11 @@ SYNOPSIS
 --------
 [verse]
 'nvme set-feature' <device> [--namespace-id=<nsid> | -n <nsid>]
-			  [--feature-id=<fid> | -f <fid>] [--value=<value> | -v <value>]
-			  [--uuid-index=<uuid-index> | -U <uuid_index>]
-			  [--data-len=<data-len> | -l <data-len>]
-			  [--data=<data-file> | -d <data-file>]
-			  [--save | -s]
+			[--feature-id=<fid> | -f <fid>] [--value=<value> | -V <value>]
+			[--uuid-index=<uuid-index> | -U <uuid_index>]
+			[--data-len=<data-len> | -l <data-len>]
+			[--data=<data-file> | -d <data-file>] [--save | -s]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -51,7 +51,7 @@ OPTIONS
 	Range Type and host identifier. This defaults to STDIN so files
 	and echo can be piped.
 
--v <value>::
+-V <value>::
 --value=<value>::
 	The value for command dword 11, the value you want to set the
 	feature to.
@@ -64,12 +64,21 @@ OPTIONS
 --uuid-index=<uuid-index>::
 	UUID Index of the feature
 
+-o <fmt>::
+--output-format=<fmt>::
+	Set the reporting format to 'normal', 'json' or 'binary'. Only one
+	output format can be used at a time.
+
+-v::
+--verbose::
+	Increase the information detail in the output.
+
 EXAMPLES
 --------
-* Sets the Power State (PS) to 1  in feature id 2:
+* Sets the Power State (PS) to 1 in feature id 2:
 +
 ------------
-# nvme set-feature /dev/nvme0 -f 2 /dev/nvme0n1 -v 0x1
+# nvme set-feature /dev/nvme0 -f 2 /dev/nvme0n1 -V 0x1
 ------------
 +
 
-- 
cgit v1.2.3