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.txt | 17 -----------------
 1 file changed, 17 deletions(-)

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

diff --git a/Documentation/nvme-connect.txt b/Documentation/nvme-connect.txt
index 0e8856c..f57b34d 100644
--- a/Documentation/nvme-connect.txt
+++ b/Documentation/nvme-connect.txt
@@ -27,14 +27,10 @@ SYNOPSIS
 		[--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>]
 
@@ -154,16 +150,6 @@ OPTIONS
 --ctrl-loss-tmo=<#>::
 	Overrides the default controller loss timeout period (in seconds).
 
--T <#>::
---tos=<#>::
-	Type of service for the connection (TCP)
-
---keyring=<#>::
-	Keyring for TLS key lookup.
-
---tls_key=<#>::
-	TLS key for the connection (TCP).
-
 -D::
 --duplicate-connect::
 	Allows duplicated connections between same transport host and subsystem
@@ -182,9 +168,6 @@ OPTIONS
 --data-digest::
 	Generates/verifies data digest (TCP).
 
---tls::
-	Enable TLS encryption (TCP).
-
 -O::
 --dump-config::
 	Print out resulting JSON configuration file to stdout.
-- 
cgit v1.2.3