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-get-property.txt | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'Documentation/nvme-get-property.txt')

diff --git a/Documentation/nvme-get-property.txt b/Documentation/nvme-get-property.txt
index b2b7d29..601b8a4 100644
--- a/Documentation/nvme-get-property.txt
+++ b/Documentation/nvme-get-property.txt
@@ -9,25 +9,32 @@ for NVMe over Fabric
 SYNOPSIS
 --------
 [verse]
-'nvme get-property' <device> [--offset=<offset> | -o <offset>]
-				[--human-readable | -H ]
-
+'nvme get-property' <device> [--offset=<offset> | -O <offset>]
+			[--human-readable | -H]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
 Reads and shows the defined NVMe controller property for NVMe over Fabric.
 
-
 OPTIONS
 -------
--o::
+-O::
 --offset::
-        The offset of the property. One of CAP=0x0, VS=0x8, CC=0x14, CSTS=0x1c, NSSR=0x20
+	The offset of the property. One of CAP=0x0, VS=0x8, CC=0x14, CSTS=0x1c, NSSR=0x20
 
 -H::
 --human-readable:
 	Show the fields packed in the property
 
+-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
 --------
@@ -37,7 +44,6 @@ EXAMPLES
 # nvme get-property /dev/nvme0 --offset=0x0 --human-readable
 ------------
 
-
 BUGS
 ----
 Currently the CAP value is truncated to 32 bits due to a limitation in
-- 
cgit v1.2.3