Update documentation for discover

Previous commit mistakenly added the host-traddr option to
connect-all. This is for discover.

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/Documentation/nvme-connect-all.1 b/Documentation/nvme-connect-all.1
index 79a42139993b7876600f11ef6278918b94074eba..030a011789cd5bb5e0132710224cc2fbb0810c27 100644 (file)
--- a/Documentation/nvme-connect-all.1
+++ b/Documentation/nvme-connect-all.1
@@ -35,7 +35,6 @@ nvme-connect-all \- Discover and Connect to Fabrics controllers\&.
 \fInvme connect\-all\fR
                 [\-\-transport=<trtype> | \-t <trtype>]
                 [\-\-traddr=<traddr>    | \-a <traddr>]
-                [\-\-host\-traddr=<traddr>| \-w <host\-traddr>]
                 [\-\-trsvcid=<trsvcid>  | \-s <trsvcid>]
                 [\-\-hostnqn=<hostnqn>  | \-q <hostnqn>]
                 [\-\-raw=<filename>     | \-r <filename>]
@@ -90,11 +89,6 @@ T}
 This field specifies the network address of the Discovery Controller\&. For transports using IP addressing (e\&.g\&. rdma) this should be an IP\-based address (ex\&. IPv4)\&.
 .RE
 .PP
-\-w <traddr>, \-\-host\-traddr=<traddr>
-.RS 4
-This field specificies the host traddr\&. Eg\&.: FC WWN\(cqs\&.
-.RE
-.PP
 \-s <trsvcid>, \-\-trsvcid=<trsvcid>
 .RS 4
 This field specifies the transport service id\&. For transports using IP addressing (e\&.g\&. rdma) this field is the port number\&. By default, the IP port number for the RDMA transport is 4420\&.

diff --git a/Documentation/nvme-connect-all.html b/Documentation/nvme-connect-all.html
index b20ce04751406984ce67e670722cad631ad13310..7d0c28b2199e7fd5c733678033c3b48ea575ae0d 100644 (file)
--- a/Documentation/nvme-connect-all.html
+++ b/Documentation/nvme-connect-all.html
@@ -749,7 +749,6 @@ nvme-connect-all(1) Manual Page
 <pre class="content"><em>nvme connect-all</em>\r
                 [--transport=&lt;trtype&gt; | -t &lt;trtype&gt;]\r
                 [--traddr=&lt;traddr&gt;    | -a &lt;traddr&gt;]\r
-                [--host-traddr=&lt;traddr&gt;| -w &lt;host-traddr&gt;]\r
                 [--trsvcid=&lt;trsvcid&gt;  | -s &lt;trsvcid&gt;]\r
                 [--hostnqn=&lt;hostnqn&gt;  | -q &lt;hostnqn&gt;]\r
                 [--raw=&lt;filename&gt;     | -r &lt;filename&gt;]</pre>\r
@@ -830,17 +829,6 @@ cellspacing="0" cellpadding="4">
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
--w &lt;traddr&gt;\r
-</dt>\r
-<dt class="hdlist1">\r
---host-traddr=&lt;traddr&gt;\r
-</dt>\r
-<dd>\r
-<p>\r
-        This field specificies the host traddr. Eg.: FC WWN&#8217;s.\r
-</p>\r
-</dd>\r
-<dt class="hdlist1">\r
 -s &lt;trsvcid&gt;\r
 </dt>\r
 <dt class="hdlist1">\r
@@ -926,7 +914,7 @@ nvme-connect(1)</p></div>
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2016-10-27 11:59:50 EDT\r
+Last updated 2016-10-27 12:19:12 EDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index 40d0913ba5a00f3454b3f669c3b4fd6d3154d5a0..1dc17826105ea5166b5fb77c65853a3e607539c7 100644 (file)
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -11,7 +11,6 @@ SYNOPSIS
 'nvme connect-all'
                [--transport=<trtype> | -t <trtype>]
                [--traddr=<traddr>    | -a <traddr>]
-               [--host-traddr=<traddr>| -w <host-traddr>]
                [--trsvcid=<trsvcid>  | -s <trsvcid>]
                [--hostnqn=<hostnqn>  | -q <hostnqn>]
                [--raw=<filename>     | -r <filename>]
@@ -54,10 +53,6 @@ OPTIONS
        For transports using IP addressing (e.g. rdma) this should be an
        IP-based address (ex. IPv4).
 
--w <traddr>::
---host-traddr=<traddr>::
-       This field specificies the host traddr. Eg.: FC WWN's.
-
 -s <trsvcid>::
 --trsvcid=<trsvcid>::
        This field specifies the transport service id.  For transports using IP

diff --git a/Documentation/nvme-discover.1 b/Documentation/nvme-discover.1
index dc6311c8d5c354313bb4ac4aea6edfc4cff8594e..6c69f7f4bd2fc15e7636092eeb999486f0d045ed 100644 (file)
--- a/Documentation/nvme-discover.1
+++ b/Documentation/nvme-discover.1
@@ -2,12 +2,12 @@
 .\"     Title: nvme-discover
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/21/2016
+.\"      Date: 10/27/2016
 .\"    Manual: NVMe Manual
 .\"    Source: NVMe
 .\"  Language: English
 .\"
-.TH "NVME\-DISCOVER" "1" "10/21/2016" "NVMe" "NVMe Manual"
+.TH "NVME\-DISCOVER" "1" "10/27/2016" "NVMe" "NVMe Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -35,6 +35,7 @@ nvme-discover \- Send Get Log Page request to Discovery Controller\&.
 \fInvme discover\fR
                 [\-\-transport=<trtype> | \-t <trtype>]
                 [\-\-traddr=<traddr>    | \-a <traddr>]
+                [\-\-host\-traddr=<traddr>| \-w <host\-traddr>]
                 [\-\-trsvcid=<trsvcid>  | \-s <trsvcid>]
                 [\-\-hostnqn=<hostnqn>  | \-q <hostnqn>]
                 [\-\-raw=<filename>     | \-r <filename>]
@@ -94,6 +95,11 @@ T}
 This field specifies the network address of the Discovery Controller\&. For transports using IP addressing (e\&.g\&. rdma) this should be an IP\-based (ex\&. IPv4) address\&.
 .RE
 .PP
+\-w <traddr>, \-\-host\-traddr=<traddr>
+.RS 4
+This field specificies the host traddr\&. Eg\&.: FC WWN\(cqs\&.
+.RE
+.PP
 \-s <trsvcid>, \-\-trsvcid=<trsvcid>
 .RS 4
 This field specifies the transport service id\&. For transports using IP addressing (e\&.g\&. rdma) this field is the port number\&. By default, the IP port number for the RDMA transport is 4420\&.

diff --git a/Documentation/nvme-discover.html b/Documentation/nvme-discover.html
index 4839d850ab24520a651bbe4594e6df35e01ab796..e93408181a5e3d0f642b09751830d89b89fb0591 100644 (file)
--- a/Documentation/nvme-discover.html
+++ b/Documentation/nvme-discover.html
@@ -749,6 +749,7 @@ nvme-discover(1) Manual Page
 <pre class="content"><em>nvme discover</em>\r
                 [--transport=&lt;trtype&gt; | -t &lt;trtype&gt;]\r
                 [--traddr=&lt;traddr&gt;    | -a &lt;traddr&gt;]\r
+                [--host-traddr=&lt;traddr&gt;| -w &lt;host-traddr&gt;]\r
                 [--trsvcid=&lt;trsvcid&gt;  | -s &lt;trsvcid&gt;]\r
                 [--hostnqn=&lt;hostnqn&gt;  | -q &lt;hostnqn&gt;]\r
                 [--raw=&lt;filename&gt;     | -r &lt;filename&gt;]</pre>\r
@@ -851,6 +852,17 @@ cellspacing="0" cellpadding="4">
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
+-w &lt;traddr&gt;\r
+</dt>\r
+<dt class="hdlist1">\r
+--host-traddr=&lt;traddr&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        This field specificies the host traddr. Eg.: FC WWN&#8217;s.\r
+</p>\r
+</dd>\r
+<dt class="hdlist1">\r
 -s &lt;trsvcid&gt;\r
 </dt>\r
 <dt class="hdlist1">\r
@@ -953,7 +965,7 @@ for <a href="mailto:keith.busch@intel.com">Keith Busch</a>.</p></div>
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2016-10-21 12:02:50 EDT\r
+Last updated 2016-10-27 12:19:10 EDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
index e9f04b2bde107a064b885bbda197e34f03d947b8..aba71c475a360e0d1754accc86b9d27be7859b20 100644 (file)
--- a/Documentation/nvme-discover.txt
+++ b/Documentation/nvme-discover.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 'nvme discover'
                [--transport=<trtype> | -t <trtype>]
                [--traddr=<traddr>    | -a <traddr>]
+               [--host-traddr=<traddr>| -w <host-traddr>]
                [--trsvcid=<trsvcid>  | -s <trsvcid>]
                [--hostnqn=<hostnqn>  | -q <hostnqn>]
                [--raw=<filename>     | -r <filename>]
@@ -74,6 +75,10 @@ OPTIONS
        For transports using IP addressing (e.g. rdma) this should be an
        IP-based (ex. IPv4) address.
 
+-w <traddr>::
+--host-traddr=<traddr>::
+       This field specificies the host traddr. Eg.: FC WWN's.
+
 -s <trsvcid>::
 --trsvcid=<trsvcid>::
        This field specifies the transport service id.  For transports using IP