From 476d0b41d27c48140ec2284a5a5f505e8423fe65 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 19 Feb 2024 11:45:37 +0100
Subject: Merging upstream version 2.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-discover.1 | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'Documentation/nvme-discover.1')

diff --git a/Documentation/nvme-discover.1 b/Documentation/nvme-discover.1
index 0a5f2bf..c099d1a 100644
--- a/Documentation/nvme-discover.1
+++ b/Documentation/nvme-discover.1
@@ -2,12 +2,12 @@
 .\"     Title: nvme-discover
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/21/2023
+.\"      Date: 02/14/2024
 .\"    Manual: NVMe Manual
 .\"    Source: NVMe
 .\"  Language: English
 .\"
-.TH "NVME\-DISCOVER" "1" "12/21/2023" "NVMe" "NVMe Manual"
+.TH "NVME\-DISCOVER" "1" "02/14/2024" "NVMe" "NVMe Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@ nvme-discover \- Send Get Log Page request to Discovery Controller\&.
                         [\-\-hostid=<hostid> | \-I <hostid>]
                         [\-\-raw=<filename> | \-r <filename>]
                         [\-\-device=<device> | \-d <device>]
-                        [\-\-cfg\-file=<cfg> | \-C <cfg>]
+                        [\-\-config=<filename> | \-J <filename>]
                         [\-\-keep\-alive\-tmo=<sec> | \-k <sec>]
                         [\-\-reconnect\-delay=<#> | \-c <#>]
                         [\-\-ctrl\-loss\-tmo=<#> | \-l <#>]
@@ -51,7 +51,7 @@ nvme-discover \- Send Get Log Page request to Discovery Controller\&.
                         [\-\-nr\-poll\-queues=<#> | \-P <#>]
                         [\-\-queue\-size=<#> | \-Q <#>] [\-\-keyring=<#>]
                         [\-\-tls_key=<#>] [\-\-hdr\-digest | \-g] [\-\-data\-digest | \-G]
-                        [\-\-persistent | \-p] [\-\-quiet | \-S] [\-\-tls]
+                        [\-\-persistent | \-p] [\-\-quiet | \-S] [\-\-tls] [\-\-concat]
                         [\-\-dump\-config | \-O] [\-\-output\-format=<fmt> | \-o <fmt>]
                         [\-\-force] [\-\-nbft] [\-\-no\-nbft] [\-\-nbft\-path=<STR>]
                         [\-\-context=<STR>]
@@ -162,12 +162,12 @@ will dump the output to stdout\&.
 This field takes a device as input\&. It must be a persistent device associated with a Discovery Controller previously created by the command "connect\-all" or "discover"\&. <device> follows the format nvme*, eg\&. nvme0, nvme1\&.
 .RE
 .PP
-\-C <cfg>, \-\-config\-file=<cfg>
+\-J <filename>, \-\-config=<filename>
 .RS 4
 Use the specified JSON configuration file instead of the default /usr/local/etc/nvme/config\&.json file or
 \fInone\fR
 to not read in an existing configuration file\&. The JSON configuration file format is documented in
-\m[blue]\fBhttps://github\&.com/linux\-nvme/libnvme/doc/config\-schema\&.json\fR\m[]
+\m[blue]\fBhttps://github\&.com/linux\-nvme/libnvme/blob/master/doc/config\-schema\&.json\fR\m[]
 .RE
 .PP
 \-k <#>, \-\-keep\-alive\-tmo=<#>
@@ -235,6 +235,11 @@ Don\(cqt remove the discovery controller after retrieving the discovery log page
 Enable TLS encryption (TCP)\&.
 .RE
 .PP
+\-\-concat
+.RS 4
+Enable secure concatenation (TCP)\&.
+.RE
+.PP
 \-S, \-\-quiet
 .RS 4
 Suppress already connected errors\&.
-- 
cgit v1.2.3