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-format.txt | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'Documentation/nvme-format.txt')

diff --git a/Documentation/nvme-format.txt b/Documentation/nvme-format.txt
index cbadd1d..e4623f1 100644
--- a/Documentation/nvme-format.txt
+++ b/Documentation/nvme-format.txt
@@ -9,15 +9,13 @@ SYNOPSIS
 --------
 [verse]
 'nvme format' <device> [--namespace-id=<nsid> | -n <nsid>]
-		    [--lbaf=<lbaf> | -l <lbaf>]
-		    [--block-size=<block size | -b <block size>]
-		    [--ses=<ses> | -s <ses>]
-		    [--pil=<pil> | -p <pil>]
-		    [--pi=<pi> | -i <pi>]
-		    [--ms=<ms> | -m <ms>]
-		    [--reset | -r ]
-		    [--force ]
-		    [--timeout=<timeout> | -t <timeout> ]
+			[--lbaf=<lbaf> | -l <lbaf>]
+			[--block-size=<block size | -b <block size>]
+			[--ses=<ses> | -s <ses>] [--pil=<pil> | -p <pil>]
+			[--pi=<pi> | -i <pi>] [--ms=<ms> | -m <ms>]
+			[--reset | -r] [--force]
+			[--timeout=<timeout> | -t <timeout>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -135,6 +133,15 @@ cryptographically. This is accomplished by deleting the encryption key.
 --timeout=<timeout>::
 	Override default timeout value. In milliseconds.
 
+-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
 --------
 * Format the device using all defaults:
-- 
cgit v1.2.3