[DOCS] Update DAPL provider text w.r.t. names in DAT.conf file.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2367 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WOF2-1/docs/Manual.htm b/branches/WOF2-1/docs/Manual.htm
index 69bb6de48caa08a53ab6644d54760a2f145b1644..122faa6c705474b4ea5f444f593d1f52cd23f777 100644 (file)
--- a/branches/WOF2-1/docs/Manual.htm
+++ b/branches/WOF2-1/docs/Manual.htm
@@ -15,7 +15,7 @@ div.Section1
 <h1 align="center">User's Manual</h1>\r
 <h2 align="center">Release 2.1</h2>\r
 <h3 align="center">\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->07/20/2009<!--webbot bot="Timestamp" endspan i-checksum="12524" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->08/18/2009<!--webbot bot="Timestamp" endspan i-checksum="12646" --></h3>\r
 <h2 align="left"><u>Overview</u></h2>\r
 <p align="left"><span style="FONT-SIZE: 12pt; FONT-FAMILY: 'Times New Roman'">\r
 The Windows OpenFabrics (WinOF) package is composed of software modules intended \r
@@ -3314,14 +3314,13 @@ include</font></p>
        <p align="left"><font face="Courier New" size="2">DAT 2.0 (free-build) \r
        libraries utilize the following user application selectable DAPL providers. \r
        Each DAPL provider represents an RDMA hardware interface device type and \r
-       it's Connection Manager.<br>\r
-       DAPL providers are listed in the file '%SystemDrive%\DAT\dat.conf'.<br>\r
-       The dat.conf InfiniBand DAPL provider names are formatted 'ibnic-HCA#-DAPL_Version-CM_type'.<br>\r
-       Example:<br>\r
-&nbsp;&nbsp;&nbsp; ibnic0v2 - InfiniBand HCA #zero, DAPL version 2.0, (default \r
-       CM is IBAL).<br>\r
-&nbsp;&nbsp;&nbsp; ibnic1v2-scm - InfiniBand HCA #one, DAPL version 2.0, CM is \r
-       'socket-CM'</font></p>\r
+       it's Connection Manager.<br>DAPL providers are listed in the file '%SystemDrive%\DAT\dat.conf'.<br>The dat.conf InfiniBand DAPL provider names are formatted 'ibnic-HCA#-DAPL_Version-CM_type'.<br>Example:<br>&nbsp;&nbsp;&nbsp; ibnic0v2 - InfiniBand HCA #zero, DAPL version 2.0, (default \r
+       CM is IBAL).<br>&nbsp;&nbsp;&nbsp; ibnic1v2-scm - InfiniBand HCA #one, DAPL version 2.0, CM is \r
+       'socket-CM'<br>\r
+&nbsp;&nbsp;&nbsp; ibnic0v2-cma - InfiniBand HCA #zero, DAPL version 2.0, CM is \r
+       'rdma-CM'<br>\r
+&nbsp;&nbsp;&nbsp; ibnic0-scm&nbsp;&nbsp; - InfiniBand HCA #zero, DAPL version 1.1, CM is \r
+       'IBAL'</font></p>\r
        <p align="left"><font face="Courier New" size="2">Each non-comment line in \r
        the dat.conf file describes a DAPL provider interface.<br>\r
        The 2nd to the last field on the right (7th from the left) describes the \r
@@ -3341,10 +3340,12 @@ include</font></p>
                        name: ibnic0v2</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       'IbalHcaX Y' where 'X' is the IB HCA device instance (0 == 1st HCA), \r
+                       'IbalHcaX Y'<br>\r
+                       where 'X' is the IB HCA device instance (0 == 1st HCA), \r
                        Y is the port number (1 == 1st port).</font></p></li>\r
                </ul>\r
-               <p align="left"><font face="Courier New" size="2">Use the InfiniBand Access Layer Connection \r
+               <p align="left"><font face="Courier New" size="2">Use the InfiniBand Access Layer \r
+               (IBAL) Connection \r
        Manager (CM) to establish InfiniBand reliable connections to Windows based system. \r
                IBAL is the original DAPL provider.<br>\r
 &nbsp;</font></p></li>\r
@@ -3359,17 +3360,18 @@ include</font></p>
                        Provider name: ibnic0v2-scm</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       &quot;ibv_deviceX Y&quot; where 'X' is the IB HCA device instance (0 == 1st \r
+                       &quot;ibv_deviceX Y&quot;<br>\r
+                       where 'X' is the IB HCA device instance (0 == 1st \r
                        HCA), Y is the port number (1 == 1st port). Socket-CM uses Winverbs \r
                        hence the ibv_deviceX nomenclature; see ibstat command.</font></p></li>\r
                </ul>\r
                <p align="left"><font face="Courier New" size="2">To facilitate DAT v2.0 \r
-               Windows to Linux DAT v2.0 InfiniBand communications, a BSD socket based Connection Manager (sock-cm) is \r
+               Windows to Linux DAT v2.0 InfiniBand communications, a BSD socket based Connection Manager (socket-cm) is \r
                supported. Both \r
        nodes must use the same Connection Manager IBAL-CM[ibnic0v2] or \r
        Socket-CM[ibnicv2-scm] in order for connections to be \r
        established. For Linux &lt;==&gt; Windows DAT connections, the DAPL provider must \r
-               be socket-cm or rdma-cm; IBAL DAPL provider is not supported for Linux.<br>\r
+               be socket-cm or rdma-cm; IBAL DAPL provider is not supported on Linux.<br>\r
 &nbsp;</font></p></li>\r
                <li>\r
                <p align="left"><font face="Times New Roman">RDMA-CM Provider</font></p>\r
@@ -3382,7 +3384,8 @@ include</font></p>
                        name: ibnic0v2-cma</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       &quot;rdma_devX Y&quot; where 'X' is the RDMA device instance (future iWARP \r
+                       &quot;rdma_devX Y&quot;<br>\r
+                       where 'X' is the RDMA device instance (future iWARP \r
                        support, today InfiniBand) with assigned IPv4 address (0 == 1st \r
                        IPoIB device with an assigned IPv4 address); Y is ignored although \r
                        there must be a digit present.<br>\r
@@ -3390,7 +3393,7 @@ include</font></p>
                        assigned to an IPoIB device instance. The 'rdma_dev0' is used to \r
                        instruct the rdma-cm provider to use the 1st RDMA device (IPoIB) \r
                        with an assigned IP4v address such that the dat.conf file does not \r
-                       have to be tailored for each WinOF installation.</font></p></li>\r
+                       have to be specifically tailored for each WinOF installation.</font></p></li>\r
                </ul>\r
                <p align="left"><font face="Courier New" size="2">OFED RDMA CM manager \r
                can be used to establish connections between Windows and/or Linux systems.</font></p></li>\r

diff --git a/trunk/docs/Manual.htm b/trunk/docs/Manual.htm
index 69bb6de48caa08a53ab6644d54760a2f145b1644..122faa6c705474b4ea5f444f593d1f52cd23f777 100644 (file)
--- a/trunk/docs/Manual.htm
+++ b/trunk/docs/Manual.htm
@@ -15,7 +15,7 @@ div.Section1
 <h1 align="center">User's Manual</h1>\r
 <h2 align="center">Release 2.1</h2>\r
 <h3 align="center">\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->07/20/2009<!--webbot bot="Timestamp" endspan i-checksum="12524" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->08/18/2009<!--webbot bot="Timestamp" endspan i-checksum="12646" --></h3>\r
 <h2 align="left"><u>Overview</u></h2>\r
 <p align="left"><span style="FONT-SIZE: 12pt; FONT-FAMILY: 'Times New Roman'">\r
 The Windows OpenFabrics (WinOF) package is composed of software modules intended \r
@@ -3314,14 +3314,13 @@ include</font></p>
        <p align="left"><font face="Courier New" size="2">DAT 2.0 (free-build) \r
        libraries utilize the following user application selectable DAPL providers. \r
        Each DAPL provider represents an RDMA hardware interface device type and \r
-       it's Connection Manager.<br>\r
-       DAPL providers are listed in the file '%SystemDrive%\DAT\dat.conf'.<br>\r
-       The dat.conf InfiniBand DAPL provider names are formatted 'ibnic-HCA#-DAPL_Version-CM_type'.<br>\r
-       Example:<br>\r
-&nbsp;&nbsp;&nbsp; ibnic0v2 - InfiniBand HCA #zero, DAPL version 2.0, (default \r
-       CM is IBAL).<br>\r
-&nbsp;&nbsp;&nbsp; ibnic1v2-scm - InfiniBand HCA #one, DAPL version 2.0, CM is \r
-       'socket-CM'</font></p>\r
+       it's Connection Manager.<br>DAPL providers are listed in the file '%SystemDrive%\DAT\dat.conf'.<br>The dat.conf InfiniBand DAPL provider names are formatted 'ibnic-HCA#-DAPL_Version-CM_type'.<br>Example:<br>&nbsp;&nbsp;&nbsp; ibnic0v2 - InfiniBand HCA #zero, DAPL version 2.0, (default \r
+       CM is IBAL).<br>&nbsp;&nbsp;&nbsp; ibnic1v2-scm - InfiniBand HCA #one, DAPL version 2.0, CM is \r
+       'socket-CM'<br>\r
+&nbsp;&nbsp;&nbsp; ibnic0v2-cma - InfiniBand HCA #zero, DAPL version 2.0, CM is \r
+       'rdma-CM'<br>\r
+&nbsp;&nbsp;&nbsp; ibnic0-scm&nbsp;&nbsp; - InfiniBand HCA #zero, DAPL version 1.1, CM is \r
+       'IBAL'</font></p>\r
        <p align="left"><font face="Courier New" size="2">Each non-comment line in \r
        the dat.conf file describes a DAPL provider interface.<br>\r
        The 2nd to the last field on the right (7th from the left) describes the \r
@@ -3341,10 +3340,12 @@ include</font></p>
                        name: ibnic0v2</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       'IbalHcaX Y' where 'X' is the IB HCA device instance (0 == 1st HCA), \r
+                       'IbalHcaX Y'<br>\r
+                       where 'X' is the IB HCA device instance (0 == 1st HCA), \r
                        Y is the port number (1 == 1st port).</font></p></li>\r
                </ul>\r
-               <p align="left"><font face="Courier New" size="2">Use the InfiniBand Access Layer Connection \r
+               <p align="left"><font face="Courier New" size="2">Use the InfiniBand Access Layer \r
+               (IBAL) Connection \r
        Manager (CM) to establish InfiniBand reliable connections to Windows based system. \r
                IBAL is the original DAPL provider.<br>\r
 &nbsp;</font></p></li>\r
@@ -3359,17 +3360,18 @@ include</font></p>
                        Provider name: ibnic0v2-scm</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       &quot;ibv_deviceX Y&quot; where 'X' is the IB HCA device instance (0 == 1st \r
+                       &quot;ibv_deviceX Y&quot;<br>\r
+                       where 'X' is the IB HCA device instance (0 == 1st \r
                        HCA), Y is the port number (1 == 1st port). Socket-CM uses Winverbs \r
                        hence the ibv_deviceX nomenclature; see ibstat command.</font></p></li>\r
                </ul>\r
                <p align="left"><font face="Courier New" size="2">To facilitate DAT v2.0 \r
-               Windows to Linux DAT v2.0 InfiniBand communications, a BSD socket based Connection Manager (sock-cm) is \r
+               Windows to Linux DAT v2.0 InfiniBand communications, a BSD socket based Connection Manager (socket-cm) is \r
                supported. Both \r
        nodes must use the same Connection Manager IBAL-CM[ibnic0v2] or \r
        Socket-CM[ibnicv2-scm] in order for connections to be \r
        established. For Linux &lt;==&gt; Windows DAT connections, the DAPL provider must \r
-               be socket-cm or rdma-cm; IBAL DAPL provider is not supported for Linux.<br>\r
+               be socket-cm or rdma-cm; IBAL DAPL provider is not supported on Linux.<br>\r
 &nbsp;</font></p></li>\r
                <li>\r
                <p align="left"><font face="Times New Roman">RDMA-CM Provider</font></p>\r
@@ -3382,7 +3384,8 @@ include</font></p>
                        name: ibnic0v2-cma</font></p></li>\r
                        <li>\r
                        <p align="left"><font face="Courier New" size="2">ia_device_params - \r
-                       &quot;rdma_devX Y&quot; where 'X' is the RDMA device instance (future iWARP \r
+                       &quot;rdma_devX Y&quot;<br>\r
+                       where 'X' is the RDMA device instance (future iWARP \r
                        support, today InfiniBand) with assigned IPv4 address (0 == 1st \r
                        IPoIB device with an assigned IPv4 address); Y is ignored although \r
                        there must be a digit present.<br>\r
@@ -3390,7 +3393,7 @@ include</font></p>
                        assigned to an IPoIB device instance. The 'rdma_dev0' is used to \r
                        instruct the rdma-cm provider to use the 1st RDMA device (IPoIB) \r
                        with an assigned IP4v address such that the dat.conf file does not \r
-                       have to be tailored for each WinOF installation.</font></p></li>\r
+                       have to be specifically tailored for each WinOF installation.</font></p></li>\r
                </ul>\r
                <p align="left"><font face="Courier New" size="2">OFED RDMA CM manager \r
                can be used to establish connections between Windows and/or Linux systems.</font></p></li>\r