Adding upstream version 2.8.

Signed-off-by: Daniel Baumann <daniel@debian.org>

Documentation/nvme-discover.txt

@@ -18,7 +18,7 @@ SYNOPSIS
 			[--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 <#>]
@@ -27,7 +27,7 @@ SYNOPSIS
 			[--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>]
@@ -140,13 +140,13 @@ OPTIONS
 	command "connect-all" or "discover". <device> follows the format
 	nvme*, eg. nvme0, nvme1.
 
--C <cfg>::
---config-file=<cfg>::
+-J <filename>::
+--config=<filename>::
 	Use the specified JSON configuration file instead of the
 	default @SYSCONFDIR@/nvme/config.json file or 'none' to not read in
 	an existing configuration file. The JSON configuration file
 	format is documented in
-	https://github.com/linux-nvme/libnvme/doc/config-schema.json
+	https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json
 
 -k <#>::
 --keep-alive-tmo=<#>::
@@ -206,6 +206,9 @@ OPTIONS
 --tls::
 	Enable TLS encryption (TCP).
 
+--concat::
+	Enable secure concatenation (TCP).
+
 -S::
 --quiet::
 	Suppress already connected errors.