Tue Sep 28 12:10:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/Environment.h:
        * tao/Environment.cpp:
        * tao/Exception.h:
        * tao/Fault_Tolerance_Service.h:
        * tao/Flushing_Strategy.h:
        * tao/GIOP_Message_State.h:
        * tao/IIOP_Acceptor.h:
        * tao/IIOP_Connection_Handler.h:
        * tao/IIOP_Endpoint.h:
        * tao/Incoming_Message_Queue.h:
        * tao/Invocation_Adapter.h:
        * tao/Invocation_Base.h:
        * tao/Leader_Follower.h:
        * tests/Client_Leaks/Client_Task.h:
        * tests/MT_Timeout/Client_Task.h:
          Doxygen fixes

13 files changed, 19 insertions, 24 deletions

diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 421c9178ffe..a0dc085d790 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -100,7 +100,6 @@ CORBA::Environment::clear (void)
 CORBA::Environment&
 CORBA::Environment::default_environment ()
 {
-  //
   // If we are using native C++ exceptions the user is *not* supposed
   // to clear the environment every time she calls into TAO.  In fact
   // the user is not supposed to use the environment at all!
@@ -113,7 +112,6 @@ CORBA::Environment::default_environment ()
   // This is not an issue when using the alternative C++ mapping (with
   // the Environment argument) because then the user is supposed to
   // clear the environment before calling into the ORB.
-  //
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
 
   return TAO_default_environment ();;
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index d81a7fb5194..7e190d3fb3b 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -102,7 +102,7 @@ namespace CORBA
      */
     CORBA::Exception* exception (void) const;
 
-    /// Set the contained CORBA::Exception to <ex>
+    /// Set the contained CORBA::Exception to @a ex
     /**
      * CORBA::Environment assumes ownership of the exception, this is
      * contrary to the normal memory management rules in the C++
@@ -126,8 +126,7 @@ namespace CORBA
 
     /// Print the exception to output determined by f.  This function
     /// is not CORBA compliant.
-    void print_exception (const char *info,
-                          FILE *f=stdout) const;
+    void print_exception (const char *info, FILE *f=stdout) const;
 
     // = Obtain a default environment to use with TAO.
     static CORBA::Environment &default_environment (void);
@@ -140,7 +139,7 @@ namespace CORBA
   private:
 
     /// Initialize using a well known ORB Core; this is intended for
-    /// the bootstraping of the ORB_Core, not for general
+    /// the bootstrapping of the ORB_Core, not for general
     /// consumption.
     Environment (TAO_ORB_Core *orb_core);
 
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 2c47324aac2..1e4f6575d15 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -189,7 +189,7 @@ namespace CORBA
     /// Assignment operator.
     Exception & operator = (const Exception & src);
 
-    /// Construct from a respository id.
+    /// Construct from a repository id.
     Exception (const char *repository_id, const char *local_name);
 
   private:
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index db12a2286a3..6ec6d6ae123 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -49,7 +49,7 @@ public:
   /// Dtor
   ~TAO_Fault_Tolerance_Service (void);
 
-  /// Initialise the internal data structures
+  /// Initialize the internal data structures
   void init (TAO_ORB_Core *orb_core);
 
   /// Return the underlying callback object
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 4bcab3d5589..c9683cb5069 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -68,7 +68,7 @@ public:
   /// Cancel all scheduled output for the transport argument
   virtual int cancel_output (TAO_Transport *transport) = 0;
 
-  /// Wait until msg is sent out.  Potentially other messages are
+  /// Wait until @a msg is sent out.  Potentially other messages are
   /// flushed too, for example, because there are ahead in the queue.
   virtual int flush_message (TAO_Transport *transport,
                              TAO_Queued_Message *msg,
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index 5e631805c18..719aa0609be 100644
--- a/TAO/tao/GIOP_Message_State.h
+++ b/TAO/tao/GIOP_Message_State.h
@@ -79,7 +79,7 @@ private:
   /// Parse the message header.
   int parse_message_header_i (ACE_Message_Block &incoming);
 
-  /// Checks for the magic word 'GIOP' in the start of the incoing
+  /// Checks for the magic word 'GIOP' in the start of the incoming
   /// stream
   int parse_magic_bytes (char *buf);
 
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 2cdceb4f300..b92f1994bf3 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -108,8 +108,8 @@ public:
 
   //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
   /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
+   * Set the host name for the given @a addr.
+   * A hostname may be forced by using @a specified_hostname.  This
    * is useful if the given address corresponds to more than one
    * hostname and the desired one cannot be determined in any
    * other way.
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index a96bf0c8403..94d2dc69b0a 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -125,12 +125,11 @@ protected:
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
-  // helper function used by the set_dscp_codepoint () methods to
-  // set the TOS field in the IP packets.
+  /// helper function used by the set_dscp_codepoint () methods to
+  /// set the TOS field in the IP packets.
   int set_tos (int tos);
 
 private:
-
   /// Stores the type of service value.
   int dscp_codepoint_;
 };
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 155796a60c8..e1d443aaadc 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
-    IIOP implementation of PP Framework Endpoint interface.
+ *  IIOP implementation of PP Framework Endpoint interface.
  *
  *  @author  Marina Spivak <marina@cs.wustl.edu>
  */
@@ -130,7 +130,7 @@ public:
   /// ownership of this string.
   const char *host (void) const;
 
-  /// Copy the string <h> into <host_> and return the resulting pointer.
+  /// Copy the string @a h into <host_> and return the resulting pointer.
   /// This object maintains ownership of this string.
   const char *host (const char *h);
 
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index 91f257f823c..1226d63c2c5 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -50,7 +50,6 @@ class TAO_Transport;
  *   different.
  *
  */
-
 class TAO_Export TAO_Incoming_Message_Queue
 {
 public:
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index c638b74b1b0..844c446d424 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -63,7 +63,7 @@ namespace TAO
    *
    * This adapter class serves as the base class for various types of
    * invocations like AMI, DII, DSI etc. Adapter classes for AMI, DII,
-   * DSI inherit from this class and their local behavioural
+   * DSI inherit from this class and their local behavioral
    * information before kicking off an invocation.
    *
    * @@ More info..
@@ -90,7 +90,7 @@ namespace TAO
      *
      * @param operation The name of the operation being invoked.
      *
-     * @param op_len Number of charecters in the operation name. This
+     * @param op_len Number of characters in the operation name. This
      * is an optimization which helps us to avoid calling strlen ()
      * while creating a message format.
      *
@@ -142,7 +142,7 @@ namespace TAO
      *
      * These methods useful for various types of invocations like
      * SII, AMI, DII and DSI. All the subclasses implement these
-     * methods to get the right behaviour at their level.
+     * methods to get the right behavior at their level.
      */
     //@{
 
@@ -229,7 +229,7 @@ namespace TAO
                              TAO_Operation_Details &details);
 
   private:
-    /// Dont allow default initializations
+    /// Don't allow default initializations
     Invocation_Adapter (void);
 
     // Prevent copying
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 30994abd0ee..dda096d03bd 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -47,7 +47,7 @@ namespace TAO
    *
    * @brief The base class for the invocation object
    *
-   * This class is the base of the invocation object hiererachy. This
+   * This class is the base of the invocation object hierarchy. This
    * hierarchy is classified  based on the type of invocation and the
    * mode of invocation. One of the objects from the hierarchy is
    * created on the stack for every invocation.
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
index d1316cd0b27..9f2f7257c50 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -80,7 +80,7 @@ public:
   /// Wait on the Leader/Followers loop until one event happens.
   /**
    * @param event The event we wait for, the loop iterates until the
-   * event is sucessful, or it fails due to timeout, and error or a
+   * event is successful, or it fails due to timeout, and error or a
    * connection closed.
    * @param transport The transport attached to the event
    * @param max_wait_time Limit the time spent on the loop