From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Apr 2023 10:17:38 +0200
Subject: Merging upstream version 2.4+really2.3.

This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.
---
 Documentation/nvme-connect.1 | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

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

diff --git a/Documentation/nvme-connect.1 b/Documentation/nvme-connect.1
index 324bc45..f657eb1 100644
--- a/Documentation/nvme-connect.1
+++ b/Documentation/nvme-connect.1
@@ -2,12 +2,12 @@
 .\"     Title: nvme-connect
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/31/2023
+.\"      Date: 01/30/2023
 .\"    Manual: NVMe Manual
 .\"    Source: NVMe
 .\"  Language: English
 .\"
-.TH "NVME\-CONNECT" "1" "03/31/2023" "NVMe" "NVMe Manual"
+.TH "NVME\-CONNECT" "1" "01/30/2023" "NVMe" "NVMe Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -51,14 +51,10 @@ nvme-connect \- Connect to a Fabrics controller\&.
                 [\-\-keep\-alive\-tmo=<#>     | \-k <#>]
                 [\-\-reconnect\-delay=<#>    | \-c <#>]
                 [\-\-ctrl\-loss\-tmo=<#>      | \-l <#>]
-                [\-\-tos=<#>                | \-T <#>]
-                [\-\-keyring=<#>                    ]
-                [\-\-tls_key=<#>                    ]
                 [\-\-duplicate\-connect      | \-D]
                 [\-\-disable\-sqflow         | \-d]
                 [\-\-hdr\-digest             | \-g]
                 [\-\-data\-digest            | \-G]
-                [\-\-tls                        ]
                 [\-\-dump\-config            | \-O]
                 [\-\-output\-format=<fmt>    | \-o <fmt>]
 .fi
@@ -197,21 +193,6 @@ Overrides the default delay (in seconds) before reconnect is attempted after a c
 Overrides the default controller loss timeout period (in seconds)\&.
 .RE
 .PP
-\-T <#>, \-\-tos=<#>
-.RS 4
-Type of service for the connection (TCP)
-.RE
-.PP
-\-\-keyring=<#>
-.RS 4
-Keyring for TLS key lookup\&.
-.RE
-.PP
-\-\-tls_key=<#>
-.RS 4
-TLS key for the connection (TCP)\&.
-.RE
-.PP
 \-D, \-\-duplicate\-connect
 .RS 4
 Allows duplicated connections between same transport host and subsystem port\&.
@@ -232,11 +213,6 @@ Generates/verifies header digest (TCP)\&.
 Generates/verifies data digest (TCP)\&.
 .RE
 .PP
-\-\-tls
-.RS 4
-Enable TLS encryption (TCP)\&.
-.RE
-.PP
 \-O, \-\-dump\-config
 .RS 4
 Print out resulting JSON configuration file to stdout\&.
-- 
cgit v1.2.3