Fri Jun 22 13:20:19 2001 Paul Calabrese <calabrese_p@ociweb.com>

7 files changed, 30 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index c7389c87f2a..477f65adcb3 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Fri Jun 22 13:20:19 2001  Paul Calabrese <calabrese_p@ociweb.com>
+
+        * tao/Acceptor_Registry.cpp:
+        * tao/Connection_Handler.h:
+        * tao/Pluggable.h:
+        * tao/Profile.h:
+        * tao/Transport.h:
+        * tao/Strategies/UIOP_Connector.cpp:
+
+          Fix some pluggable protocol-related comments.  Most of the
+          changes were trivial typo or grammar fixes but the
+          TAO_Transport::send_i() Doxygen documentation was fixed to
+          reflect the current reality.
+
 Fri Jun 22 09:24:54 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
 
 	* tao/Protocols_Hooks.cpp:
@@ -53,7 +67,7 @@ Thu Jun 21 20:38:47 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
           Forgot to add changed DSP file from previous Explicit_Binding
           checkin.
 
-Wed Jun 21 13:00:31 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+Thu Jun 21 13:00:31 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* tao/PortableServer/POA.cpp:
 	* tao/PortableServer/PAO.h:
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index b8e23fbc3e4..10c21c531e2 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -54,7 +54,7 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
 {
   // Allocate space for storing the profiles.  There can never be more
   // profiles than there are endpoints.  In some cases, there can be
-  // less profiles than endpoints.
+  // fewer profiles than endpoints.
   size_t pfile_count = this->endpoint_count ();
   if (mprofile.set (pfile_count) < 0)
     return -1;
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 14aa7830597..7caeccecd4b 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -44,7 +44,7 @@ class ACE_Event_Handler;
  * connections handler in every protocol can derive from this
  * class as well as the ACE_Svc_Handler specialised for the
  * right protocol. This way, most of the common code for the
- * different protocls would be in this implementation. Further,
+ * different protocols would be in this implementation. Further,
  * this class wold be of immense use in storing the handlers in
  * the Cache for TAO. This would help in purging entries which
  * is generally accompanied by closing the open handles and
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index daf51356c5d..7e741f086af 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -57,7 +57,7 @@ class TAO_Transport;
  *
  * @brief Abstract Acceptor class used for pluggable protocols.
  *
- * Base class for the Acceptor bridge calss.
+ * Base class for the Acceptor bridge class.
  */
 class TAO_Export TAO_Acceptor
 {
@@ -171,7 +171,7 @@ public:
   ///  Initialize object and register with reactor.
   virtual int open (TAO_ORB_Core *orb_core) = 0;
 
-  /// Shutdown Connector bridge and concreate Connector.
+  /// Shutdown Connector bridge and concrete Connector.
   virtual int close (void) = 0;
 
   /**
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 22afbde113d..2a17c887dba 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -136,7 +136,7 @@ public:
                              CORBA::Environment &ACE_TRY_ENV) = 0;
 
   /**
-   * This method is used to get the IOP::taggedProfile. The profile
+   * This method is used to get the IOP::TaggedProfile. The profile
    * information that is received from the server side would have
    * already been decoded. So this method will just make a
    * IOP::TaggedProfile struct from the existing information and
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index a515cf02514..23483cb8422 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -396,11 +396,6 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 TAO_Profile *
 TAO_UIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
 {
-  // The endpoint should be of the form:
-  //    N.n@rendezvous_point|object_key
-  // or:
-  //    rendezvous_point|object_key
-
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
                     TAO_UIOP_Profile (this->orb_core ()),
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 2c848b93b50..54f8539ae1d 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -382,7 +382,7 @@ protected:
   /// needs to be sent.
   virtual TAO_Pluggable_Messaging * messaging_object (void) = 0;
 
-  /// Write the complete Message_Block chain to the connection.
+  /// Write the complete iovec chain to the connection.
   /**
    * Often the implementation simply forwards the arguments to the
    * underlying ACE_Svc_Handler class. Using the code factored out
@@ -392,15 +392,10 @@ protected:
    * transformations of the data, such as SSLIOP or protocols that
    * compress the stream.
    *
-   * @param mblk contains the data that must be sent.  For each
-   * message block in the cont() chain all the data between rd_ptr()
-   * and wr_ptr() should be delivered to the remote peer.
+   * @param iov contains the data that must be sent.
    *
-   * @param timeout is the maximum time that the application is
-   * willing to wait for the data to be sent, useful in platforms that
-   * implement timed writes.
-   * The timeout value is obtained from the policies set by the
-   * application.
+   * @param iovcnt is the number of iovec structures in the list
+   * where iov points.
    *
    * @param bytes_transferred should return the total number of bytes
    * successfully transferred before the connection blocked.  This is
@@ -412,6 +407,12 @@ protected:
    * be appropriately set and this argument to return the number of
    * bytes already on the OS I/O subsystem.
    *
+   * @param timeout is the maximum time that the application is
+   * willing to wait for the data to be sent, useful in platforms that
+   * implement timed writes.
+   * The timeout value is obtained from the policies set by the
+   * application.
+   *
    */
   virtual ssize_t send_i (iovec *iov, int iovcnt,
                           size_t &bytes_transferred,