From 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:11:40 +0200 Subject: Merging upstream version 2.1~rc0 (Closes: #1015722). Signed-off-by: Daniel Baumann --- Documentation/nvme-discover.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/nvme-discover.txt') diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt index e27949b..53826d5 100644 --- a/Documentation/nvme-discover.txt +++ b/Documentation/nvme-discover.txt @@ -46,7 +46,7 @@ Discovery commands to run. If no @SYSCONFDIR@/nvme/discovery.conf file exists, the command will quit with an error. Otherwise, a specific Discovery Controller should be specified using the ---transport, --traddr, and if necessary the --trsvcid flags. A Diѕcovery +--transport, --traddr, and if necessary the --trsvcid flags. A Discovery request will then be sent to the specified Discovery Controller. BACKGROUND @@ -150,7 +150,7 @@ OPTIONS -k <#>:: --keep-alive-tmo=<#>:: - Overrides the default dealy (in seconds) for keep alive. + Overrides the default timeout (in seconds) for keep alive. This option will be ignored for the discovery, and it is only implemented for completeness. @@ -210,7 +210,7 @@ OPTIONS 'binary'. Only one output format can be used at a time. --force:: - Disable the built-in persitent discover connection rules. + Disable the built-in persistent discover connection rules. Combined with --persistent flag, always create new persistent discovery connection. -- cgit v1.2.3