Adding upstream version 2.8.upstream/2.8

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/Documentation/nvme-discover.html b/Documentation/nvme-discover.html
index dc56c6b..0d5f6a9 100644
--- a/Documentation/nvme-discover.html
+++ b/Documentation/nvme-discover.html
@@ -759,7 +759,7 @@ nvme-discover(1) Manual Page
                         [--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 <#>]

@@ -768,7 +768,7 @@ nvme-discover(1) Manual Page
                         [--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>]

@@ -979,10 +979,10 @@ cellspacing="0" cellpadding="4">
 </p>

 </dd>

 <dt class="hdlist1">

--C &lt;cfg&gt;

+-J &lt;filename&gt;

 </dt>

 <dt class="hdlist1">

---config-file=&lt;cfg&gt;

+--config=&lt;filename&gt;

 </dt>

 <dd>

 <p>

@@ -990,7 +990,7 @@ cellspacing="0" cellpadding="4">
         default /usr/local/etc/nvme/config.json file or <em>none</em> to not read in

         an existing configuration file. The JSON configuration file

         format is documented in

-        <a href="https://github.com/linux-nvme/libnvme/doc/config-schema.json">https://github.com/linux-nvme/libnvme/doc/config-schema.json</a>

+        <a href="https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json">https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json</a>

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1137,6 +1137,14 @@ cellspacing="0" cellpadding="4">
 </p>

 </dd>

 <dt class="hdlist1">

+--concat

+</dt>

+<dd>

+<p>

+        Enable secure concatenation (TCP).

+</p>

+</dd>

+<dt class="hdlist1">

 -S

 </dt>

 <dt class="hdlist1">

@@ -1317,7 +1325,7 @@ nvme-connect-all(1)</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-12-21 15:49:29 CET

+ 2024-02-14 10:43:42 CET

 </div>

 </div>

 </body>