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-nvm-id-ns.txt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Documentation/nvme-nvm-id-ns.txt')

diff --git a/Documentation/nvme-nvm-id-ns.txt b/Documentation/nvme-nvm-id-ns.txt
index dfbbfaa..5a8cb09 100644
--- a/Documentation/nvme-nvm-id-ns.txt
+++ b/Documentation/nvme-nvm-id-ns.txt
@@ -10,8 +10,7 @@ SYNOPSIS
 [verse]
 'nvme nvm-id-ns' <device> [--uuid-index=<uuid-index> | -U <uuid_index>]
 			[--namespace-id=<NUM> | -n <NUM>]
-			[-v | --verbose]
-			[--output-format=<fmt> | -o <fmt>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -37,15 +36,15 @@ 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.
 
--o <format>::
---output-format=<format>::
-              Set the reporting format to 'normal', 'json', or
-              'binary'. Only one output format can be used at a time.
-
 EXAMPLES
 --------
 * Has the program interpret the returned buffer and display the known
-- 
cgit v1.2.3