Wed Oct 3 19:31:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

60 files changed, 405 insertions, 353 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 72a2f66db7d..7659d511aab 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,66 @@
+Wed Oct  3 19:31:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Acceptor.cpp
+        * ace/Acceptor.h
+        * ace/ATM_Connector.h
+        * ace/Cached_Connect_Strategy_T.h
+        * ace/Caching_Strategies_T.h
+        * ace/Caching_Strategies_T.inl
+        * ace/Connector.cpp
+        * ace/Connector.h
+        * ace/Countdown_Time.h
+        * ace/DEV_Connector.h
+        * ace/Dev_Poll_Reactor.cpp
+        * ace/Dev_Poll_Reactor.h
+        * ace/Dirent.h
+        * ace/Event_Handler.h
+        * ace/FILE_Connector.h
+        * ace/Future.h
+        * ace/Future_Set.cpp
+        * ace/Future_Set.h
+        * ace/Handle_Set.h
+        * ace/Hash_Map_Manager_T.h
+        * ace/Local_Name_Space.cpp
+        * ace/Local_Name_Space.h
+        * ace/Lock_Adapter_T.cpp
+        * ace/Lock_Adapter_T.h
+        * ace/Lock_Adapter_T.inl
+        * ace/Message_Queue_T.h
+        * ace/NT_Service.h
+        * ace/OS_NS_sys_socket.h
+        * ace/Proactor.cpp
+        * ace/Proactor.h
+        * ace/RB_Tree.h
+        * ace/Service_Repository.cpp
+        * ace/Service_Repository.h
+        * ace/SOCK_Acceptor.h
+        * ace/SOCK_Dgram.h
+        * ace/SOCK_Dgram_Mcast.h
+        * ace/SOCK_SEQPACK_Acceptor.h
+        * ace/SPIPE_Connector.h
+        * ace/Strategies_T.cpp
+        * ace/Strategies_T.h
+        * ace/Svc_Handler.h
+        * ace/Task_Ex_T.cpp
+        * ace/Task_Ex_T.h
+        * ace/Task_Ex_T.inl
+        * ace/Task_T.cpp
+        * ace/Task_T.h
+        * ace/Task_T.inl
+        * ace/Thread_Control.h
+        * ace/Thread_Manager.cpp
+        * ace/Thread_Manager.h
+        * ace/Thread_Mutex.h
+        * ace/Timeprobe_T.h
+        * ace/Timer_Hash_T.h
+        * ace/Timer_Queue_T.h
+        * ace/TLI_Connector.h
+        * ace/WFMO_Reactor.cpp
+        * ace/WFMO_Reactor.h
+        * ace/WFMO_Reactor.inl
+        * ace/XTI_ATM_Mcast.h
+          Doxygen improvements, small cleanups and bool changes
+
 Tue Oct  2 17:06:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Asynch_IO_Impl.h
diff --git a/ACE/ace/ATM_Connector.h b/ACE/ace/ATM_Connector.h
index a4b71ed4cd4..090dd5bc88a 100644
--- a/ACE/ace/ATM_Connector.h
+++ b/ACE/ace/ATM_Connector.h
@@ -56,7 +56,7 @@ public:
   ACE_ATM_Connector (void);
 
   /**
-   * Actively connect and produce a <new_stream> if things go well.
+   * Actively connect and produce a @a new_stream if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The <params> are the parameters needed for either socket
    * or XTI/ATM connections.  The @a timeout is the amount of time to
@@ -68,7 +68,7 @@ public:
    * timing out.  If the time expires before the connection is made
    * <errno == ETIME>.  The <local_sap> is the value of local address
    * to bind to.  If it's the default value of <ACE_ATM_Addr::sap_any> then
-   * the user is letting the OS do the binding.  If <reuse_addr> == 1
+   * the user is letting the OS do the binding.  If @a reuse_addr == 1
    * then the <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   ACE_ATM_Connector (ACE_ATM_Stream &new_stream,
@@ -86,7 +86,7 @@ public:
                      int perms = 0);
 
   /**
-   * Actively connect and produce a <new_stream> if things go well.
+   * Actively connect and produce a @a new_stream if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The <params> are the parameters needed for either socket
    * or XTI/ATM connections.  The @a timeout is the amount of time to
@@ -98,7 +98,7 @@ public:
    * timing out.  If the time expires before the connection is made
    * <errno == ETIME>.  The <local_sap> is the value of local address
    * to bind to.  If it's the default value of <ACE_ATM_Addr::sap_any> then
-   * the user is letting the OS do the binding.  If <reuse_addr> == 1
+   * the user is letting the OS do the binding.  If @a reuse_addr == 1
    * then the <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   int connect (ACE_ATM_Stream &new_stream,
@@ -118,7 +118,7 @@ public:
 
   /**
    * Try to complete a non-blocking connection.
-   * If connection completion is successful then <new_stream> contains
+   * If connection completion is successful then @a new_stream contains
    * the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
    * will contain the address of the connected peer.
    */
diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp
index d43e3a55bae..2dd5b52d926 100644
--- a/ACE/ace/Acceptor.cpp
+++ b/ACE/ace/Acceptor.cpp
@@ -560,7 +560,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       ACE_NEW_RETURN (cre_s,
                       CREATION_STRATEGY,
                       -1);
-      this->delete_creation_strategy_ = 1;
+      this->delete_creation_strategy_ = true;
     }
   this->creation_strategy_ = cre_s;
 
@@ -571,7 +571,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       ACE_NEW_RETURN (acc_s,
                       ACCEPT_STRATEGY (this->reactor ()),
                       -1);
-      this->delete_accept_strategy_ = 1;
+      this->delete_accept_strategy_ = true;
     }
   this->accept_strategy_ = acc_s;
 
@@ -594,7 +594,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       ACE_NEW_RETURN (con_s,
                       CONCURRENCY_STRATEGY,
                       -1);
-      this->delete_concurrency_strategy_ = 1;
+      this->delete_concurrency_strategy_ = true;
     }
   this->concurrency_strategy_ = con_s;
 
@@ -605,7 +605,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       ACE_NEW_RETURN (sch_s,
                       SCHEDULING_STRATEGY,
                       -1);
-      this->delete_scheduling_strategy_ = 1;
+      this->delete_scheduling_strategy_ = true;
     }
   this->scheduling_strategy_ = sch_s;
 
@@ -625,13 +625,13 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
    int use_select,
    int reuse_addr)
     : creation_strategy_ (0),
-      delete_creation_strategy_ (0),
+      delete_creation_strategy_ (false),
       accept_strategy_ (0),
-      delete_accept_strategy_ (0),
+      delete_accept_strategy_ (false),
       concurrency_strategy_ (0),
-      delete_concurrency_strategy_ (0),
+      delete_concurrency_strategy_ (false),
       scheduling_strategy_ (0),
-      delete_scheduling_strategy_ (0),
+      delete_scheduling_strategy_ (false),
       service_name_ (0),
       service_description_ (0)
 {
@@ -660,13 +660,13 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
    int use_select,
    int reuse_addr)
     : creation_strategy_ (0),
-      delete_creation_strategy_ (0),
+      delete_creation_strategy_ (false),
       accept_strategy_ (0),
-      delete_accept_strategy_ (0),
+      delete_accept_strategy_ (false),
       concurrency_strategy_ (0),
-      delete_concurrency_strategy_ (0),
+      delete_concurrency_strategy_ (false),
       scheduling_strategy_ (0),
-      delete_scheduling_strategy_ (0),
+      delete_scheduling_strategy_ (false),
       service_name_ (0),
       service_description_ (0)
 {
@@ -702,22 +702,22 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDL
 
       if (this->delete_creation_strategy_)
         delete this->creation_strategy_;
-      this->delete_creation_strategy_ = 0;
+      this->delete_creation_strategy_ = false;
       this->creation_strategy_ = 0;
 
       if (this->delete_accept_strategy_)
         delete this->accept_strategy_;
-      this->delete_accept_strategy_ = 0;
+      this->delete_accept_strategy_ = false;
       this->accept_strategy_ = 0;
 
       if (this->delete_concurrency_strategy_)
         delete this->concurrency_strategy_;
-      this->delete_concurrency_strategy_ = 0;
+      this->delete_concurrency_strategy_ = false;
       this->concurrency_strategy_ = 0;
 
       if (this->delete_scheduling_strategy_)
         delete this->scheduling_strategy_;
-      this->delete_scheduling_strategy_ = 0;
+      this->delete_scheduling_strategy_ = false;
       this->scheduling_strategy_ = 0;
 
       // We must use the <handle> obtained *before* we deleted the
@@ -873,7 +873,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       ACE_NEW_RETURN (con_s,
                       ACE_Concurrency_Strategy<SVC_HANDLER>,
                       -1);
-      this->delete_concurrency_strategy_ = 1;
+      this->delete_concurrency_strategy_ = true;
     }
   this->concurrency_strategy_ = con_s;
 
@@ -883,7 +883,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor (void)
-  : delete_concurrency_strategy_ (0)
+  : delete_concurrency_strategy_ (false)
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor");
   this->reactor (0);
@@ -894,7 +894,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor
   (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
    ACE_Reactor *reactor,
    ACE_Concurrency_Strategy<SVC_HANDLER> *cs)
-    : delete_concurrency_strategy_ (0)
+    : delete_concurrency_strategy_ (false)
 {
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor");
   if (this->open (local_addr, reactor, cs) == -1)
@@ -927,7 +927,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE
   if (this->delete_concurrency_strategy_)
     {
       delete this->concurrency_strategy_;
-      this->delete_concurrency_strategy_ = 0;
+      this->delete_concurrency_strategy_ = false;
       this->concurrency_strategy_ = 0;
     }
   // Note that if we aren't actually registered with the
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index a33c99f87aa..741dca098e1 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -459,30 +459,30 @@ protected:
   /// Creation strategy for an Acceptor.
   CREATION_STRATEGY *creation_strategy_;
 
-  /// 1 if {Acceptor} created the creation strategy and thus should
-  /// delete it, else 0.
-  int delete_creation_strategy_;
+  /// true if {Acceptor} created the creation strategy and thus should
+  /// delete it, else false.
+  bool delete_creation_strategy_;
 
   /// Accept strategy for an {Acceptor}.
   ACCEPT_STRATEGY *accept_strategy_;
 
-  /// 1 if {Acceptor} created the accept strategy and thus should delete
-  /// it, else 0.
-  int delete_accept_strategy_;
+  /// true if {Acceptor} created the accept strategy and thus should delete
+  /// it, else false.
+  bool delete_accept_strategy_;
 
   /// Concurrency strategy for an {Acceptor}.
   CONCURRENCY_STRATEGY *concurrency_strategy_;
 
-  /// 1 if {Acceptor} created the concurrency strategy and thus should
-  /// delete it, else 0.
-  int delete_concurrency_strategy_;
+  /// true if {Acceptor} created the concurrency strategy and thus should
+  /// delete it, else false.
+  bool delete_concurrency_strategy_;
 
   /// Scheduling strategy for an {Acceptor}.
   SCHEDULING_STRATEGY *scheduling_strategy_;
 
-  /// 1 if {Acceptor} created the scheduling strategy and thus should
-  /// delete it, else 0.
-  int delete_scheduling_strategy_;
+  /// true if {Acceptor} created the scheduling strategy and thus should
+  /// delete it, else false.
+  bool delete_scheduling_strategy_;
 
   // = Service information objects.
 
@@ -664,9 +664,9 @@ private:
   /// Concurrency strategy for an Acceptor.
   ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy_;
 
-  /// 1 if Acceptor created the concurrency strategy and thus should
-  /// delete it, else 0.
-  int delete_concurrency_strategy_;
+  /// true if Acceptor created the concurrency strategy and thus should
+  /// delete it, else false.
+  bool delete_concurrency_strategy_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index 4c0937490a5..f5543727824 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -36,7 +36,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @class ACE_Cached_Connect_Strategy_Ex
  *
  * @brief A connection strategy which caches connections to peers
- * (represented by <SVC_HANDLER> instances), thereby allowing
+ * (represented by SVC_HANDLER instances), thereby allowing
  * subsequent re-use of unused, but available, connections.
  *
  * <Cached_Connect_Strategy> is intended to be used as a
@@ -172,7 +172,7 @@ protected:
                               int flags,
                               int perms);
 
-  /// Table that maintains the cache of connected <SVC_HANDLER>s.
+  /// Table that maintains the cache of connected SVC_HANDLERs.
   CONNECTION_CACHE connection_cache_;
 };
 
@@ -185,7 +185,7 @@ protected:
  * @class ACE_Bounded_Cached_Connect_Strategy
  *
  * @brief A connection strategy which caches connections to peers
- *     (represented by <SVC_HANDLER> instances), thereby allowing
+ *     (represented by SVC_HANDLER instances), thereby allowing
  *     subsequent re-use of unused, but available, connections.
  *     This strategy should be used when the cache is bounded by
  *     maximum size.
diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h
index 00343bbdf6e..6d23824ba31 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -114,7 +114,7 @@ public:
 
   /// Constructor.
   ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation = 0,
-                                int delete_implementation = 0);
+                                bool delete_implementation = false);
 
   /// Destructor.
   ~ACE_Caching_Strategy_Adapter (void);
@@ -170,7 +170,7 @@ private:
   IMPLEMENTATION *implementation_;
 
   /// Do we need to delete the implementation?
-  int delete_implementation_;
+  bool delete_implementation_;
 };
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl
index f5ea93858ed..69f1ac99807 100644
--- a/ACE/ace/Caching_Strategies_T.inl
+++ b/ACE/ace/Caching_Strategies_T.inl
@@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE
 ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation,
-                                                                                                         int delete_implementation)
+                                                                                                         bool delete_implementation)
   : implementation_ (implementation),
     delete_implementation_ (delete_implementation)
 {
@@ -18,7 +18,7 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::ACE_C
     {
       ACE_NEW (this->implementation_,
                IMPLEMENTATION);
-      this->delete_implementation_ = 1;
+      this->delete_implementation_ = true;
     }
 }
 
@@ -28,7 +28,7 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::~ACE_
   if (this->delete_implementation_)
     {
       delete this->implementation_;
-      this->delete_implementation_ = 0;
+      this->delete_implementation_ = false;
       this->implementation_ = 0;
     }
 }
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index c971329c0cd..112fbca4003 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -655,7 +655,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
   ACE_HANDLE *handle = 0;
   while (1)
     {
-      ACE_Unbounded_Set_Iterator<ACE_HANDLE> 
+      ACE_Unbounded_Set_Iterator<ACE_HANDLE>
         iterator (this->non_blocking_handles ());
       if (!iterator.next (handle))
         break;
@@ -775,12 +775,12 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
 
   // First we decide if we need to clean up.
   if (this->creation_strategy_ != 0 &&
-      this->delete_creation_strategy_ != 0 &&
+      this->delete_creation_strategy_ &&
       cre_s != 0)
     {
       delete this->creation_strategy_;
       this->creation_strategy_ = 0;
-      this->delete_creation_strategy_ = 0;
+      this->delete_creation_strategy_ = false;
     }
 
   if (cre_s != 0)
@@ -790,19 +790,19 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
       ACE_NEW_RETURN (this->creation_strategy_,
                       CREATION_STRATEGY,
                       -1);
-      this->delete_creation_strategy_ = 1;
+      this->delete_creation_strategy_ = true;
     }
 
 
   // Initialize the accept strategy.
 
   if (this->connect_strategy_ != 0 &&
-      this->delete_connect_strategy_ != 0 &&
+      this->delete_connect_strategy_ &&
       conn_s != 0)
     {
       delete this->connect_strategy_;
       this->connect_strategy_ = 0;
-      this->delete_connect_strategy_ = 0;
+      this->delete_connect_strategy_ = false;
     }
 
   if (conn_s != 0)
@@ -812,18 +812,18 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
       ACE_NEW_RETURN (this->connect_strategy_,
                       CONNECT_STRATEGY,
                       -1);
-      this->delete_connect_strategy_ = 1;
+      this->delete_connect_strategy_ = true;
     }
 
   // Initialize the concurrency strategy.
 
   if (this->concurrency_strategy_ != 0 &&
-      this->delete_concurrency_strategy_ != 0 &&
+      this->delete_concurrency_strategy_ &&
       con_s != 0)
     {
       delete this->concurrency_strategy_;
       this->concurrency_strategy_ = 0;
-      this->delete_concurrency_strategy_ = 0;
+      this->delete_concurrency_strategy_ = false;
     }
 
   if (con_s != 0)
@@ -833,7 +833,7 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
       ACE_NEW_RETURN (this->concurrency_strategy_,
                       CONCURRENCY_STRATEGY,
                       -1);
-      this->delete_concurrency_strategy_ = 1;
+      this->delete_concurrency_strategy_ = true;
     }
 
   return 0;
@@ -847,11 +847,11 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connecto
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  int flags)
   : creation_strategy_ (0),
-    delete_creation_strategy_ (0),
+    delete_creation_strategy_ (false),
     connect_strategy_ (0),
-    delete_connect_strategy_ (0),
+    delete_connect_strategy_ (false),
     concurrency_strategy_ (0),
-    delete_concurrency_strategy_ (0)
+    delete_concurrency_strategy_ (false)
 {
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector");
 
@@ -873,17 +873,17 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
 {
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
-  this->delete_creation_strategy_ = 0;
+  this->delete_creation_strategy_ = false;
   this->creation_strategy_ = 0;
 
   if (this->delete_connect_strategy_)
     delete this->connect_strategy_;
-  this->delete_connect_strategy_ = 0;
+  this->delete_connect_strategy_ = false;
   this->connect_strategy_ = 0;
 
   if (this->delete_concurrency_strategy_)
     delete this->concurrency_strategy_;
-  this->delete_concurrency_strategy_ = 0;
+  this->delete_concurrency_strategy_ = false;
   this->concurrency_strategy_ = 0;
 
   return SUPER::close ();
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 427679c1673..512f7340524 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -164,19 +164,19 @@ public:
   typedef ACE_PEER_CONNECTOR_ADDR                ACE_PEER_ADDR_TYPEDEF;
 
   /**
-   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how SVC_HANDLER's
    * should be initialized prior to being activated.  Right now, the
    * only flag that is processed is ACE_NONBLOCK, which enabled
-   * non-blocking I/O on the <SVC_HANDLER> when it is opened.
+   * non-blocking I/O on the SVC_HANDLER when it is opened.
    */
   ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
                  int flags = 0);
 
   /**
-   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how SVC_HANDLER's
    * should be initialized prior to being activated.  Right now, the
    * only flag that is processed is ACE_NONBLOCK, which enabled
-   * non-blocking I/O on the <SVC_HANDLER> when it is opened.
+   * non-blocking I/O on the SVC_HANDLER when it is opened.
    */
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
                     int flags = 0);
@@ -230,7 +230,7 @@ public:
    * Initiate connection of @a n @a svc_handlers to peers at
    * @a remote_addrs using @a synch_options.  Returns -1 if failure
    * occurs and 0 otherwise.  If @a failed_svc_handlers is non-NULL, a
-   * 1 is placed in the corresponding index of <failed_svc_handler>
+   * 1 is placed in the corresponding index of @a failed_svc_handlers
    * for each <svc_handlers[i]> that failed to connect, else a 0 is
    * placed in that index.
    */
@@ -281,7 +281,7 @@ protected:
 
   /**
    * Bridge method for creating a SVC_HANDLER.  The default is to
-   * create a new SVC_HANDLER only if <sh> == 0, else <sh> is
+   * create a new SVC_HANDLER only if @a sh == 0, else @a sh is
    * unchanged.  However, subclasses can override this policy to
    * perform SVC_HANDLER creation in any way that they like (such as
    * creating subclass instances of SVC_HANDLER, using a singleton,
@@ -366,10 +366,10 @@ private:
   ACE_PEER_CONNECTOR connector_;
 
   /**
-   * Flags that indicate how <SVC_HANDLER>'s should be initialized
+   * Flags that indicate how SVC_HANDLER's should be initialized
    * prior to being activated.  Right now, the only flag that is
    * processed is ACE_NONBLOCK, which enabled non-blocking I/O on
-   * the <SVC_HANDLER> when it is opened.
+   * the SVC_HANDLER when it is opened.
    */
   int flags_;
 
@@ -425,7 +425,7 @@ public:
    * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
    * should be initialized prior to being activated.  Right now, the
    * only flag that is processed is ACE_NONBLOCK, which enabled
-   * non-blocking I/O on the <SVC_HANDLER> when it is opened.
+   * non-blocking I/O on the SVC_HANDLER when it is opened.
    */
   ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
                           ACE_Creation_Strategy<SVC_HANDLER> * = 0,
@@ -434,20 +434,20 @@ public:
                           int flags = 0);
 
   /**
-   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how SVC_HANDLER's
    * should be initialized prior to being activated.  Right now, the
    * only flag that is processed is ACE_NONBLOCK, which enabled
-   * non-blocking I/O on the <SVC_HANDLER> when it is opened.
+   * non-blocking I/O on the SVC_HANDLER when it is opened.
    * Default strategies would be created and used.
    */
   virtual int open (ACE_Reactor *r,
                     int flags);
 
   /**
-   * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
+   * Initialize a connector.  @a flags indicates how SVC_HANDLER's
    * should be initialized prior to being activated.  Right now, the
    * only flag that is processed is ACE_NONBLOCK, which enabled
-   * non-blocking I/O on the <SVC_HANDLER> when it is opened.
+   * non-blocking I/O on the SVC_HANDLER when it is opened.
    */
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
                     ACE_Creation_Strategy<SVC_HANDLER> * = 0,
@@ -468,17 +468,17 @@ public:
 
 protected:
   // = The following three methods define the <Connector>'s strategies
-  // for creating, connecting, and activating <SVC_HANDLER>'s,
+  // for creating, connecting, and activating SVC_HANDLER's,
   // respectively.
 
   /**
-   * Bridge method for creating a <SVC_HANDLER>.  The strategy for
-   * creating a <SVC_HANDLER> are configured into the Connector via
+   * Bridge method for creating a SVC_HANDLER.  The strategy for
+   * creating a SVC_HANDLER are configured into the Connector via
    * it's <creation_strategy_>.  The default is to create a new
-   * <SVC_HANDLER> only if <sh> == 0, else <sh> is unchanged.
+   * SVC_HANDLER only if @a sh == 0, else @a sh is unchanged.
    * However, subclasses can override this policy to perform
-   * <SVC_HANDLER> creation in any way that they like (such as
-   * creating subclass instances of <SVC_HANDLER>, using a singleton,
+   * SVC_HANDLER creation in any way that they like (such as
+   * creating subclass instances of SVC_HANDLER, using a singleton,
    * dynamically linking the handler, etc.).  Returns -1 if failure,
    * else 0.
    */
@@ -486,7 +486,7 @@ protected:
 
   /**
    * Bridge method for connecting the new connection into the
-   * <SVC_HANDLER>.  The default behavior delegates to the
+   * SVC_HANDLER.  The default behavior delegates to the
    * <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
    */
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
@@ -499,13 +499,13 @@ protected:
 
   /**
    * Bridge method for connecting the new connection into the
-   * <SVC_HANDLER>.  The default behavior delegates to the
+   * SVC_HANDLER.  The default behavior delegates to the
    * <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
-   * <sh_copy> is used to obtain a copy of the <sh> pointer, but that
+   * @a sh_copy is used to obtain a copy of the @a sh pointer, but that
    * can be kept in the stack; the motivation is a bit too long to
-   * include here, but basically we want to modify <sh> safely, using
+   * include here, but basically we want to modify @a sh safely, using
    * the internal locks in the Connect_Strategy, while saving a TSS
-   * copy in <sh_copy>, usually located in the stack.
+   * copy in @a sh_copy, usually located in the stack.
    */
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
                                    SVC_HANDLER *&sh_copy,
@@ -517,39 +517,39 @@ protected:
                                    int perms);
 
   /**
-   * Bridge method for activating a <SVC_HANDLER> with the appropriate
+   * Bridge method for activating a SVC_HANDLER with the appropriate
    * concurrency strategy.  The default behavior of this method is to
-   * activate the <SVC_HANDLER> by calling its <open> method (which
-   * allows the <SVC_HANDLER> to define its own concurrency strategy).
+   * activate the SVC_HANDLER by calling its <open> method (which
+   * allows the SVC_HANDLER to define its own concurrency strategy).
    * However, subclasses can override this strategy to do more
    * sophisticated concurrency activations (such as creating the
-   * <SVC_HANDLER> as an "active object" via multi-threading or
+   * SVC_HANDLER as an "active object" via multi-threading or
    * multi-processing).
    */
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler);
 
   // = Strategy objects.
 
-  /// Creation strategy for an <Connector>.
+  /// Creation strategy for an Connector.
   CREATION_STRATEGY *creation_strategy_;
 
-  /// 1 if <Connector> created the creation strategy and thus should
-  /// delete it, else 0.
-  int delete_creation_strategy_;
+  /// true if Connector created the creation strategy and thus should
+  /// delete it, else false.
+  bool delete_creation_strategy_;
 
-  /// Connect strategy for a <Connector>.
+  /// Connect strategy for a Connector.
   CONNECT_STRATEGY *connect_strategy_;
 
-  /// 1 if <Connector> created the connect strategy and thus should
-  /// delete it, else 0.
-  int delete_connect_strategy_;
+  /// true if Connector created the connect strategy and thus should
+  /// delete it, else false.
+  bool delete_connect_strategy_;
 
   /// Concurrency strategy for an <Connector>.
   CONCURRENCY_STRATEGY *concurrency_strategy_;
 
-  /// 1 if <Connector> created the concurrency strategy and thus should
-  /// delete it, else 0.
-  int delete_concurrency_strategy_;
+  /// true if Connector created the concurrency strategy and thus should
+  /// delete it, else false.
+  bool delete_concurrency_strategy_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Countdown_Time.h b/ACE/ace/Countdown_Time.h
index 58f74c235e9..33d0d2751ce 100644
--- a/ACE/ace/Countdown_Time.h
+++ b/ACE/ace/Countdown_Time.h
@@ -31,7 +31,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief Keeps track of the amount of elapsed time.
  *
  * This class has a side-effect on the @c max_wait_time -- every
- * time the <stop> method is called the <max_wait_time> is
+ * time the stop() method is called the @c max_wait_time is
  * updated.
  */
 class ACE_Export ACE_Countdown_Time
diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h
index 11e2216b9ce..07b91951b64 100644
--- a/ACE/ace/DEV_Connector.h
+++ b/ACE/ace/DEV_Connector.h
@@ -48,7 +48,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    * The <flags> and <perms> arguments are passed down to the <open>
    * method.
@@ -73,7 +73,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    * The <flags> and <perms> arguments are passed down to the <open>
    * method.
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index f9a83b635b6..3d2915f45fa 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -613,11 +613,11 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh,
   , token_ (*this, s_queue)
   , lock_adapter_ (token_)
   , timer_queue_ (0)
-  , delete_timer_queue_ (0)
+  , delete_timer_queue_ (false)
   , signal_handler_ (0)
-  , delete_signal_handler_ (0)
+  , delete_signal_handler_ (false)
   , notify_handler_ (0)
-  , delete_notify_handler_ (0)
+  , delete_notify_handler_ (false)
   , mask_signals_ (mask_signals)
   , restart_ (0)
 {
@@ -661,11 +661,11 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size,
   , token_ (*this, s_queue)
   , lock_adapter_ (token_)
   , timer_queue_ (0)
-  , delete_timer_queue_ (0)
+  , delete_timer_queue_ (false)
   , signal_handler_ (0)
-  , delete_signal_handler_ (0)
+  , delete_signal_handler_ (false)
   , notify_handler_ (0)
-  , delete_notify_handler_ (0)
+  , delete_notify_handler_ (false)
   , mask_signals_ (mask_signals)
   , restart_ (0)
 {
@@ -721,7 +721,7 @@ ACE_Dev_Poll_Reactor::open (size_t size,
       if (this->signal_handler_ == 0)
         result = -1;
       else
-        this->delete_signal_handler_ = 1;
+        this->delete_signal_handler_ = true;
     }
 
   // Allows the timer queue to be overridden.
@@ -734,7 +734,7 @@ ACE_Dev_Poll_Reactor::open (size_t size,
       if (this->timer_queue_ == 0)
         result = -1;
       else
-        this->delete_timer_queue_ = 1;
+        this->delete_timer_queue_ = true;
     }
 
   // Allows the Notify_Handler to be overridden.
@@ -747,7 +747,7 @@ ACE_Dev_Poll_Reactor::open (size_t size,
       if (this->notify_handler_ == 0)
         result = -1;
       else
-        this->delete_notify_handler_ = 1;
+        this->delete_notify_handler_ = true;
     }
 
 #if defined (ACE_HAS_EVENT_POLL)
@@ -812,11 +812,11 @@ ACE_Dev_Poll_Reactor::current_info (ACE_HANDLE, size_t & /* size */)
 int
 ACE_Dev_Poll_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler)
 {
-  if (this->delete_signal_handler_ && this->signal_handler_)
+  if (this->delete_signal_handler_)
     delete this->signal_handler_;
 
   this->signal_handler_ = signal_handler;
-  this->delete_signal_handler_ = 0;
+  this->delete_signal_handler_ = false;
 
   return 0;
 }
@@ -824,11 +824,11 @@ ACE_Dev_Poll_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler)
 int
 ACE_Dev_Poll_Reactor::timer_queue (ACE_Timer_Queue *tq)
 {
-  if (this->delete_timer_queue_ && this->timer_queue_)
+  if (this->delete_timer_queue_)
     delete this->timer_queue_;
 
   this->timer_queue_ = tq;
-  this->delete_timer_queue_ = 0;
+  this->delete_timer_queue_ = false;
 
   return 0;
 
@@ -870,7 +870,7 @@ ACE_Dev_Poll_Reactor::close (void)
     {
       delete this->signal_handler_;
       this->signal_handler_ = 0;
-      this->delete_signal_handler_ = 0;
+      this->delete_signal_handler_ = false;
     }
 
  (void) this->handler_rep_.close ();
@@ -879,7 +879,7 @@ ACE_Dev_Poll_Reactor::close (void)
     {
       delete this->timer_queue_;
       this->timer_queue_ = 0;
-      this->delete_timer_queue_ = 0;
+      this->delete_timer_queue_ = false;
     }
 
   if (this->notify_handler_ != 0)
@@ -889,7 +889,7 @@ ACE_Dev_Poll_Reactor::close (void)
     {
       delete this->notify_handler_;
       this->notify_handler_ = 0;
-      this->delete_notify_handler_ = 0;
+      this->delete_notify_handler_ = false;
     }
 
   this->poll_fd_ = ACE_INVALID_HANDLE;
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 9a0ed1f3985..b8607ea58ad 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -1118,14 +1118,14 @@ protected:
 
   /// Keeps track of whether we should delete the timer queue (if we
   /// didn't create it, then we don't delete it).
-  int delete_timer_queue_;
+  bool delete_timer_queue_;
 
   /// Handle signals without requiring global/static variables.
   ACE_Sig_Handler *signal_handler_;
 
   /// Keeps track of whether we should delete the signal handler (if we
   /// didn't create it, then we don't delete it).
-  int delete_signal_handler_;
+  bool delete_signal_handler_;
 
   /// Callback object that unblocks the <ACE_Select_Reactor> if it's
   /// sleeping.
@@ -1133,7 +1133,7 @@ protected:
 
   /// Keeps track of whether we need to delete the notify handler (if
   /// we didn't create it, then we don't delete it).
-  int delete_notify_handler_;
+  bool delete_notify_handler_;
 
   /// Flag that determines if signals are masked during event
   /// dispatching.
diff --git a/ACE/ace/Dirent.h b/ACE/ace/Dirent.h
index 5178c547964..823b28d747c 100644
--- a/ACE/ace/Dirent.h
+++ b/ACE/ace/Dirent.h
@@ -74,7 +74,7 @@ public:
 
   /**
    * Has the equivalent functionality as <readdir> except that an
-   * <entry> and <result> buffer must be supplied by the caller to
+   * @a entry and @a result buffer must be supplied by the caller to
    * store the result.
    */
   int read (struct ACE_DIRENT *entry,
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h
index 3f5ccb98224..1ca4cbec2eb 100644
--- a/ACE/ace/Event_Handler.h
+++ b/ACE/ace/Event_Handler.h
@@ -113,7 +113,7 @@ public:
   virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
 
   /**
-   * Called when timer expires.  <current_time> represents the current
+   * Called when timer expires.  @a current_time represents the current
    * time that the <Event_Handler> was selected for timeout
    * dispatching and @a act is the asynchronous completion token that
    * was passed in when <schedule_timer> was invoked.
@@ -126,7 +126,7 @@ public:
 
   /// Called when a <handle_*()> method returns -1 or when the
   /// <remove_handler> method is called on an ACE_Reactor.  The
-  /// <close_mask> indicates which event has triggered the
+  /// @a close_mask indicates which event has triggered the
   /// <handle_close> method callback on a particular @a handle.
   virtual int handle_close (ACE_HANDLE handle,
                             ACE_Reactor_Mask close_mask);
diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h
index 3bf5e675d93..d82dfc4f48c 100644
--- a/ACE/ace/FILE_Connector.h
+++ b/ACE/ace/FILE_Connector.h
@@ -53,7 +53,7 @@ public:
    * indefinitely.  If *timeout == {0, 0} then the file is created
    * using non-blocking mode.  If *timeout > {0, 0} then this is the
    * maximum amount of time to wait before timing out.  The
-   * <local_sap> and <reuse_addr> parameters are ignored.  The <flags>
+   * <local_sap> and @a reuse_addr parameters are ignored.  The <flags>
    * and <perms> arguments are passed down to the <ACE_OS::open>
    * method.
    */
@@ -78,7 +78,7 @@ public:
    * EWOULDBLOCK>.  If *timeout > {0, 0} then this is the maximum amount of
    * time to wait before timing out.  If the time expires before the
    * connection is made <errno == ETIME>.  The <local_sap> and
-   * <reuse_addr> parameters are ignored.  The <flags> and <perms>
+   * @a reuse_addr parameters are ignored.  The <flags> and <perms>
    * arguments are passed down to the <ACE_OS::open> method.
    */
   int connect (ACE_FILE_IO &new_io,
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index 8c4d15f133b..c172b0fd9ac 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -122,7 +122,7 @@ private:
            ACE_Time_Value *tv) const;
 
   /**
-   * Attaches the specified observer to a subject (i.e., the <ACE_Future_Rep>).
+   * Attaches the specified observer to a subject (i.e., the ACE_Future_Rep).
    * The update method of the specified subject will be invoked with a copy of
    * the written-to ACE_Future as input when the result gets set.
    *
@@ -133,9 +133,9 @@ private:
                ACE_Future<T> &caller);
 
   /**
-   * Detaches the specified observer from a subject (i.e., the <ACE_Future_Rep>).
+   * Detaches the specified observer from a subject (i.e., the ACE_Future_Rep).
    * The update method of the specified subject will not be invoked when the
-   * <ACE_Future_Rep>s result gets set.  Returns 1 if the specified observer was
+   * ACE_Future_Reps result gets set.  Returns 1 if the specified observer was
    * actually attached to the subject prior to this call and 0 if was not.
    *
    * Returns 0 if the observer was successfully detached, and -1 if the
@@ -195,8 +195,7 @@ private:
    *
    * Precondition (rep != 0 && new_rep != 0)
    */
-  static void assign (ACE_Future_Rep<T> *&rep,
-                      ACE_Future_Rep<T> *new_rep);
+  static void assign (ACE_Future_Rep<T> *&rep, ACE_Future_Rep<T> *new_rep);
 
   /// Is result available?
   int ready (void) const;
@@ -207,11 +206,9 @@ private:
   /// Reference count.
   int ref_count_;
 
-  typedef ACE_Future_Observer<T>
-            OBSERVER;
+  typedef ACE_Future_Observer<T> OBSERVER;
 
-  typedef ACE_Unbounded_Set<OBSERVER *>
-        OBSERVER_COLLECTION;
+  typedef ACE_Unbounded_Set<OBSERVER *> OBSERVER_COLLECTION;
 
   /// Keep a list of ACE_Future_Observers unread by client's reader thread.
   OBSERVER_COLLECTION observer_collection_;
diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp
index a87770d5528..3d04fe9ed5d 100644
--- a/ACE/ace/Future_Set.cpp
+++ b/ACE/ace/Future_Set.cpp
@@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue)
-  : delete_queue_ (0)
+  : delete_queue_ (false)
 {
   if (new_queue)
     this->future_notification_queue_ = new_queue;
@@ -23,7 +23,7 @@ ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue)
     {
       ACE_NEW (this->future_notification_queue_,
                ACE_Message_Queue<ACE_SYNCH>);
-      this->delete_queue_ = 1;
+      this->delete_queue_ = true;
     }
 }
 
@@ -46,7 +46,7 @@ ACE_Future_Set<T>::~ACE_Future_Set (void)
       delete future_holder;
     }
 
-  if (this->delete_queue_ != 0)
+  if (this->delete_queue_)
     delete this->future_notification_queue_;
 }
 
diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h
index 316a2840a19..6e804248021 100644
--- a/ACE/ace/Future_Set.h
+++ b/ACE/ace/Future_Set.h
@@ -128,7 +128,7 @@ private:
   ACE_Message_Queue<ACE_SYNCH> *future_notification_queue_;
 
   /// Keeps track of whether we need to delete the message queue.
-  int delete_queue_;
+  bool delete_queue_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h
index 8b9edb4fd39..845c332526a 100644
--- a/ACE/ace/Handle_Set.h
+++ b/ACE/ace/Handle_Set.h
@@ -43,10 +43,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class ACE_Handle_Set
  *
- * @brief C++ wrapper facade for the socket <fd_set> abstraction.
+ * @brief C++ wrapper facade for the socket @c fd_set abstraction.
  *
  * This abstraction is a very efficient wrapper facade over
- * <fd_set>.  In particular, no range checking is performed, so
+ * @c fd_set.  In particular, no range checking is performed, so
  * it's important not to set or clear bits that are outside the
  * @c ACE_DEFAULT_SELECT_REACTOR_SIZE.
  */
@@ -97,19 +97,19 @@ public:
   ACE_HANDLE max_set (void) const;
 
   /**
-   * Rescan the underlying <fd_set> up to handle @a max to find the new
+   * Rescan the underlying @c fd_set up to handle @a max to find the new
    * <max_handle> (highest bit set) and <size> (how many bits set) values.
    * This is useful for evaluating the changes after the handle set has
    * been manipulated in some way other than member functions; for example,
-   * after <select> modifies the <fd_set>.
+   * after <select> modifies the @c fd_set.
    */
   void sync (ACE_HANDLE max);
 
-  /// Returns a pointer to the underlying <fd_set>.  Returns 0 if
+  /// Returns a pointer to the underlying @c fd_set.  Returns 0 if
   /// there are no handle bits set (<size_> == 0).
   operator fd_set *();
 
-  /// Returns a pointer to the underlying <fd_set>.  Returns 0 if
+  /// Returns a pointer to the underlying @c fd_set.  Returns 0 if
   /// there are no handle bits set (<size_> == 0).
   fd_set *fdset (void);
 
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index fe74f8a9795..c07e1bd154b 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -303,7 +303,7 @@ public:
    * then behaves just like <bind>.  Otherwise, store the old values
    * of @a ext_id and @a int_id into the "out" parameters and rebind the
    * new parameters.  This is very useful if you need to have an
-   * atomic way of updating <ACE_Hash_Map_Entrys> and you also need
+   * atomic way of updating ACE_Hash_Map_Entrys and you also need
    * full control over memory allocation.  Returns 0 if a new entry is
    * bound successfully, returns 1 if an existing entry was rebound,
    * and returns -1 if failures occur.
@@ -332,7 +332,7 @@ public:
   /// Returns 0 if the @a ext_id is in the mapping, otherwise -1.
   int find (const EXT_ID &ext_id) const;
 
-  /// Locate @a ext_id and pass out parameter via <entry>.  If found,
+  /// Locate @a ext_id and pass out parameter via @a entry.  If found,
   /// return 0, returns -1 if not found.
   int find (const EXT_ID &ext_id,
             ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry) const;
diff --git a/ACE/ace/Local_Name_Space.cpp b/ACE/ace/Local_Name_Space.cpp
index af0274f5cf7..7047c234095 100644
--- a/ACE/ace/Local_Name_Space.cpp
+++ b/ACE/ace/Local_Name_Space.cpp
@@ -50,7 +50,7 @@ ACE_NS_String::char_rep (void) const
 ACE_NS_String::ACE_NS_String (void)
   : len_ (0),
     rep_ (0),
-    delete_rep_ (0)
+    delete_rep_ (false)
 {
   ACE_TRACE ("ACE_NS_String::ACE_NS_String");
 }
@@ -58,7 +58,7 @@ ACE_NS_String::ACE_NS_String (void)
 ACE_NS_String::ACE_NS_String (const ACE_NS_WString &s)
   : len_ ((s.length () + 1) * sizeof (ACE_WCHAR_T)),
     rep_ (s.rep ()),
-    delete_rep_ (1)
+    delete_rep_ (true)
 {
   ACE_TRACE ("ACE_NS_String::ACE_NS_String");
 }
@@ -118,7 +118,7 @@ ACE_NS_String::ACE_NS_String (ACE_WCHAR_T *dst,
                               size_t bytes)
   : len_ (bytes),
     rep_ (dst),
-    delete_rep_ (0)
+    delete_rep_ (false)
 {
   ACE_TRACE ("ACE_NS_String::ACE_NS_String");
   ACE_OS::memcpy (this->rep_, src, bytes);
diff --git a/ACE/ace/Local_Name_Space.h b/ACE/ace/Local_Name_Space.h
index 728ac8afb1c..381d2d0d5a4 100644
--- a/ACE/ace/Local_Name_Space.h
+++ b/ACE/ace/Local_Name_Space.h
@@ -87,7 +87,7 @@ private:
 
   /// Should rep_ be deleted when destructed (only used
   /// for WString conversions)
-  int delete_rep_;
+  bool delete_rep_;
 };
 
 /**
diff --git a/ACE/ace/Lock_Adapter_T.cpp b/ACE/ace/Lock_Adapter_T.cpp
index ec0c013a220..f26a79fdd4c 100644
--- a/ACE/ace/Lock_Adapter_T.cpp
+++ b/ACE/ace/Lock_Adapter_T.cpp
@@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class ACE_LOCKING_MECHANISM>
 ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
   : lock_ (0),
-    delete_lock_ (1)
+    delete_lock_ (true)
 {
   ACE_NEW (this->lock_,
            ACE_LOCKING_MECHANISM);
diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h
index d6b6aa830dc..117684a1a2a 100644
--- a/ACE/ace/Lock_Adapter_T.h
+++ b/ACE/ace/Lock_Adapter_T.h
@@ -102,7 +102,7 @@ private:
 
   /// This flag keep track of whether we are responsible for deleting
   /// the lock
-  int delete_lock_;
+  bool delete_lock_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Lock_Adapter_T.inl b/ACE/ace/Lock_Adapter_T.inl
index f3b09bc0ab7..bc7899bffb3 100644
--- a/ACE/ace/Lock_Adapter_T.inl
+++ b/ACE/ace/Lock_Adapter_T.inl
@@ -9,7 +9,7 @@ ACE_INLINE
 ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (
   ACE_LOCKING_MECHANISM &lock)
   : lock_ (&lock),
-    delete_lock_ (0)
+    delete_lock_ (false)
 {
 }
 
diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h
index a893cff1147..62869da889e 100644
--- a/ACE/ace/Message_Queue_T.h
+++ b/ACE/ace/Message_Queue_T.h
@@ -617,7 +617,7 @@ public:
   ACE_Message_Queue_Iterator (ACE_Message_Queue <ACE_SYNCH_USE> &queue);
 
   // = Iteration methods.
-  /// Pass back the <entry> that hasn't been seen in the queue.
+  /// Pass back the @a entry that hasn't been seen in the queue.
   /// Returns 0 when all items have been seen, else 1.
   int next (ACE_Message_Block *&entry);
 
@@ -655,7 +655,7 @@ public:
   ACE_Message_Queue_Reverse_Iterator (ACE_Message_Queue <ACE_SYNCH_USE> &queue);
 
   // = Iteration methods.
-  /// Pass back the <entry> that hasn't been seen in the queue.
+  /// Pass back the @a entry that hasn't been seen in the queue.
   /// Returns 0 when all items have been seen, else 1.
   int next (ACE_Message_Block *&entry);
 
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index 4ad835badc7..7023a0df0b2 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -386,12 +386,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   }                                                                         \
   VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                      \
                                          ACE_TCHAR **lpszArgv) {            \
-    int delete_svc_obj = 0;                                                 \
+    bool delete_svc_obj = false;                                            \
     if (_ace_nt_svc_obj_##SVCNAME == 0) {                                   \
       ACE_NEW (_ace_nt_svc_obj_##SVCNAME, SVCCLASS);                        \
       if (_ace_nt_svc_obj_##SVCNAME == 0)                                   \
         return;                                                             \
-      delete_svc_obj = 1;                                                   \
+      delete_svc_obj = true;                                                \
     }                                                                       \
     else                                                                    \
       _ace_nt_svc_obj_##SVCNAME->inherit_log_msg_attributes ();             \
diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h
index 6f67ad99a9d..036ba2e8e29 100644
--- a/ACE/ace/OS_NS_sys_socket.h
+++ b/ACE/ace/OS_NS_sys_socket.h
@@ -82,9 +82,9 @@ namespace ACE_OS
 
 #if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /**
-   * QoS-enabled <accept>, which passes <qos_params> to <accept>.  If
+   * QoS-enabled <accept>, which passes @a qos_params to <accept>.  If
    * the OS platform doesn't support QoS-enabled <accept> then the
-   * <qos_params> are ignored and the BSD-style <accept> is called.
+   * @a qos_params are ignored and the BSD-style <accept> is called.
    */
   extern ACE_Export
   ACE_HANDLE accept (ACE_HANDLE handle,
@@ -110,9 +110,9 @@ namespace ACE_OS
 
 #if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500))
   /**
-   * QoS-enabled <connect>, which passes <qos_params> to <connect>.
+   * QoS-enabled <connect>, which passes @a qos_params to <connect>.
    * If the OS platform doesn't support QoS-enabled <connect> then the
-   * <qos_params> are ignored and the BSD-style <connect> is called.
+   * @a qos_params are ignored and the BSD-style <connect> is called.
    */
   extern ACE_Export
   int connect (ACE_HANDLE handle,
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 5eef3596e59..a96b8dde528 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -46,7 +46,7 @@ ACE_Proactor *ACE_Proactor::proactor_ = 0;
 
 /// Controls whether the Proactor is deleted when we shut down (we can
 /// only delete it safely if we created it!)
-int ACE_Proactor::delete_proactor_ = 0;
+bool ACE_Proactor::delete_proactor_ = false;
 
 /**
  * @class ACE_Proactor_Timer_Handler
@@ -376,7 +376,7 @@ ACE_Proactor::instance (size_t /* threads */)
                           ACE_Proactor,
                           0);
 
-          ACE_Proactor::delete_proactor_ = 1;
+          ACE_Proactor::delete_proactor_ = true;
           ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Proactor, ACE_Proactor::proactor_);
         }
     }
@@ -384,7 +384,7 @@ ACE_Proactor::instance (size_t /* threads */)
 }
 
 ACE_Proactor *
-ACE_Proactor::instance (ACE_Proactor * r, int delete_proactor)
+ACE_Proactor::instance (ACE_Proactor * r, bool delete_proactor)
 {
   ACE_TRACE ("ACE_Proactor::instance");
 
@@ -410,10 +410,9 @@ ACE_Proactor::close_singleton (void)
 
   if (ACE_Proactor::delete_proactor_)
     {
-
       delete ACE_Proactor::proactor_;
       ACE_Proactor::proactor_ = 0;
-      ACE_Proactor::delete_proactor_ = 0;
+      ACE_Proactor::delete_proactor_ = false;
     }
 }
 
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h
index 90e01d423b0..b9d0f3cdf07 100644
--- a/ACE/ace/Proactor.h
+++ b/ACE/ace/Proactor.h
@@ -133,7 +133,7 @@ protected:
  */
 class ACE_Export ACE_Proactor
 {
-  // = Here are the private typedefs that the <ACE_Proactor> uses.
+  // = Here are the private typedefs that the ACE_Proactor uses.
 
   typedef ACE_Timer_Queue_Iterator_T<ACE_Handler *,
     ACE_Proactor_Handle_Timeout_Upcall,
@@ -190,14 +190,14 @@ public:
   /// Destruction.
   ~ACE_Proactor (void);
 
-  /// Get pointer to a process-wide <ACE_Proactor>.  <threads> should
+  /// Get pointer to a process-wide ACE_Proactor.  <threads> should
   /// be part of another method.
   static ACE_Proactor *instance (size_t threads = 0);
 
-  /// Set pointer to a process-wide <ACE_Proactor> and return existing
+  /// Set pointer to a process-wide ACE_Proactor and return existing
   /// pointer.
   static ACE_Proactor *instance (ACE_Proactor * proactor,
-                                 int delete_proactor = 0);
+                                 bool delete_proactor = false);
 
   /// Delete the dynamically allocated Singleton.
   static void close_singleton (void);
@@ -601,11 +601,11 @@ protected:
   /// the implementation instance.
   int delete_implementation_;
 
-  /// Pointer to a process-wide <ACE_Proactor>.
+  /// Pointer to a process-wide ACE_Proactor.
   static ACE_Proactor *proactor_;
 
-  /// Must delete the <proactor_> if non-0.
-  static int delete_proactor_;
+  /// Must delete the <proactor_> if true.
+  static bool delete_proactor_;
 
   /// Handles timeout events.
   ACE_Proactor_Timer_Handler *timer_handler_;
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index 8b7215816e6..8d7924736df 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -332,7 +332,7 @@ public:
   int find (const EXT_ID &ext_id,
             INT_ID &int_id);
 
-  /// Locate @a ext_id and pass out parameter via <entry>.  If found,
+  /// Locate @a ext_id and pass out parameter via @a entry.  If found,
   /// return 0, returns -1 if not found.
   int find (const EXT_ID &ext_id,
             ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h
index 8aa3f1f8a3a..951cd47c138 100644
--- a/ACE/ace/SOCK_Acceptor.h
+++ b/ACE/ace/SOCK_Acceptor.h
@@ -69,7 +69,7 @@ public:
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
    * <local_sap> is the address that we're going to listen for
-   * connections on.  If <reuse_addr> is 1 then we'll use the
+   * connections on.  If @a reuse_addr is 1 then we'll use the
    * <SO_REUSEADDR> to reuse this address.  Returns 0 on success and
    * -1 on failure.
    */
@@ -101,9 +101,9 @@ public:
    * Accept a new ACE_SOCK_Stream connection.  A @a timeout of 0
    * means block forever, a @a timeout of {0, 0} means poll.  <restart>
    * == 1 means "restart if interrupted," i.e., if errno == EINTR.
-   * Note that <new_stream> inherits the "blocking mode" of @c this
+   * Note that @a new_stream inherits the "blocking mode" of @c this
    * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in
-   * non-blocking mode, the <net_stream> will be in non-blocking mode
+   * non-blocking mode, the @a new_stream will be in non-blocking mode
    * and vice versa.
    */
   int accept (ACE_SOCK_Stream &new_stream,
@@ -115,12 +115,12 @@ public:
 #if !defined (ACE_HAS_WINCE)
   /**
    * Accept a new ACE_SOCK_Stream connection using the QoS
-   * information in <qos_params>.  A @a timeout of 0 means block
+   * information in @a qos_params.  A @a timeout of 0 means block
    * forever, a @a timeout of {0, 0} means poll.  <restart> == 1 means
    * "restart if interrupted," i.e., if errno == EINTR.  Note that
-   * <new_stream> inherits the "blocking mode" of @c this
+   * @a new_stream inherits the "blocking mode" of @c this
    * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in
-   * non-blocking mode, the <net_stream> will be in non-blocking mode
+   * non-blocking mode, the @a new_stream will be in non-blocking mode
    * and vice versa.
    */
   int accept (ACE_SOCK_Stream &new_stream,
diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h
index 4f95edea6d2..21775fa4f80 100644
--- a/ACE/ace/SOCK_Dgram.h
+++ b/ACE/ace/SOCK_Dgram.h
@@ -49,7 +49,7 @@ public:
 
   /**
    * This is a QoS-enabed method for initiating a socket dgram that
-   * will accept datagrams at the <local> address.  The <qos_params>
+   * will accept datagrams at the <local> address.  The @a qos_params
    * are passed to <ACE_OS::join_leaf>.
    */
   ACE_SOCK_Dgram (const ACE_Addr &local,
@@ -69,7 +69,7 @@ public:
 
   /**
    * This is a QoS-enabed method for initiating a socket dgram that
-   * will accept datagrams at the <local> address.  The <qos_params>
+   * will accept datagrams at the <local> address.  The @a qos_params
    * are passed to <ACE_OS::join_leaf>.
    */
   int open (const ACE_Addr &local,
diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h
index 798ec49602a..1f53e9f0646 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.h
+++ b/ACE/ace/SOCK_Dgram_Mcast.h
@@ -211,7 +211,7 @@ public:
    * feature is not supported by the envriornment.)
    * The port# in <mcast_addr> may be 0, in which case a system-assigned
    * (ephemeral) port# is used for sending and receiving.
-   * If <reuse_addr> != 0, the SO_REUSEADDR option and, if it is supported,
+   * If @a reuse_addr != 0, the SO_REUSEADDR option and, if it is supported,
    * the SO_REUSEPORT option are enabled.
    *
    * Returns: -1 if the call fails.  Failure can occur due to problems with
@@ -247,7 +247,7 @@ public:
    * <ACE_Sock_Connect::get_ip_interfaces> is not implemented in this
    * environment.
    *
-   * Note that the optional <reuse_addr> parameter does not apply to
+   * Note that the optional @a reuse_addr parameter does not apply to
    * subscriptions; it is only used if <open> is implicitly invoked (see above).
    *
    * @deprecated This method has been deprecated, please use join() instead.
@@ -260,8 +260,8 @@ public:
                  int protocol_family = PF_INET,
                  int protocol = 0);
 
-  // join() replaces subscribe() and uses the mcast_addr to determine
-  // protocol_family, and protocol which we always pass as 0 anyway.
+  /// join() replaces subscribe() and uses the mcast_addr to determine
+  /// protocol_family, and protocol which we always pass as 0 anyway.
   int join (const ACE_INET_Addr &mcast_addr,
             int reuse_addr = 1,               // (see above)
             const ACE_TCHAR *net_if = 0);
@@ -289,8 +289,8 @@ public:
                    int protocol_family = PF_INET,
                    int protocol = 0);
 
-  // leave() replaces unsubscribe() and uses mcast_addr to determine
-  // protocol_family, and protocol which we always pass as 0 anyway.
+  /// leave() replaces unsubscribe() and uses mcast_addr to determine
+  /// protocol_family, and protocol which we always pass as 0 anyway.
   int leave (const ACE_INET_Addr &mcast_addr,
              const ACE_TCHAR *net_if = 0);
 
@@ -338,8 +338,7 @@ public:
    * @deprecated  This method has been deprecated since it cannot be used
    * easily with with IPv6 options. Use ACE_SOCK::set_option instead.
    */
-  int set_option (int option,
-                  char optval);
+  int set_option (int option, char optval);
 
   /// Dump the state of an object.
   /**
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h
index 4872a9cfb00..e469df03341 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.h
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h
@@ -52,7 +52,7 @@ public:
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
    * <local_sap> is the address that we're going to listen for
-   * connections on.  If <reuse_addr> is 1 then we'll use the
+   * connections on.  If @a reuse_addr is 1 then we'll use the
    * <SO_REUSEADDR> to reuse this address.
    */
   ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap,
@@ -84,7 +84,7 @@ public:
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
    * <local_sap> is the address that we're going to listen for
-   * connections on.  If <reuse_addr> is 1 then we'll use the
+   * connections on.  If @a reuse_addr is 1 then we'll use the
    * <SO_REUSEADDR> to reuse this address.  Returns 0 on success and
    * -1 on failure.
    */
diff --git a/ACE/ace/SPIPE_Connector.h b/ACE/ace/SPIPE_Connector.h
index 395d14bf241..eeaa3a70543 100644
--- a/ACE/ace/SPIPE_Connector.h
+++ b/ACE/ace/SPIPE_Connector.h
@@ -50,7 +50,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    * The <flags> and <perms> arguments are passed down to the <open>
    * method.  The <pipe_mode> argument is only used in NT and is used to
@@ -78,7 +78,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    * The <flags> and <perms> arguments are passed down to the <open>
    * method.  The <pipe_mode> argument is only used in NT and is used to
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 422b22b4d70..1ae307607b2 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -27,7 +27,7 @@ ACE_Service_Repository *ACE_Service_Repository::svc_rep_ = 0;
 
 // Controls whether the Service_Repository is deleted when we shut
 // down (we can only delete it safely if we created it)!
-int ACE_Service_Repository::delete_svc_rep_ = 0;
+bool ACE_Service_Repository::delete_svc_rep_ = false;
 
 void
 ACE_Service_Repository::dump (void) const
@@ -63,7 +63,7 @@ ACE_Service_Repository::instance (size_t size /* = ACE_Service_Repository::DEFAU
               ACE_NEW_RETURN (ACE_Service_Repository::svc_rep_,
                               ACE_Service_Repository (size),
                               0);
-              ACE_Service_Repository::delete_svc_rep_ = 1;
+              ACE_Service_Repository::delete_svc_rep_ = true;
             }
         }
     }
@@ -80,7 +80,7 @@ ACE_Service_Repository::instance (ACE_Service_Repository *s)
 
   ACE_Service_Repository *t = ACE_Service_Repository::svc_rep_;
   // We can't safely delete it since we don't know who created it!
-  ACE_Service_Repository::delete_svc_rep_ = 0;
+  ACE_Service_Repository::delete_svc_rep_ = false;
 
   ACE_Service_Repository::svc_rep_ = s;
   return t;
@@ -98,7 +98,7 @@ ACE_Service_Repository::close_singleton (void)
     {
       delete ACE_Service_Repository::svc_rep_;
       ACE_Service_Repository::svc_rep_ = 0;
-      ACE_Service_Repository::delete_svc_rep_ = 0;
+      ACE_Service_Repository::delete_svc_rep_ = false;
     }
 }
 
diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h
index 4041688ee9a..ad2b442819b 100644
--- a/ACE/ace/Service_Repository.h
+++ b/ACE/ace/Service_Repository.h
@@ -205,8 +205,8 @@ private:
   /// Pointer to a process-wide ACE_Service_Repository.
   static ACE_Service_Repository *svc_rep_;
 
-  /// Must delete the <svc_rep_> if non-0.
-  static int delete_svc_rep_;
+  /// Must delete the <svc_rep_> if true.
+  static bool delete_svc_rep_;
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   /// Synchronization variable for the MT_SAFE Repository
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 3f5fc469991..aa3b607d52e 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -51,7 +51,7 @@ template <class SVC_HANDLER>
 ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy (void)
 {
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy");
-  if (this->delete_svc_handler_ != 0)
+  if (this->delete_svc_handler_)
     delete this->svc_handler_;
 }
 
@@ -72,8 +72,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::open (SVC_HANDLER *sh,
 {
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::open");
 
-  if (this->delete_svc_handler_
-      && this->svc_handler_ != 0)
+  if (this->delete_svc_handler_)
     delete this->svc_handler_;
 
   // If <sh> is NULL then create a new <SVC_HANDLER>.
@@ -82,12 +81,12 @@ ACE_Singleton_Strategy<SVC_HANDLER>::open (SVC_HANDLER *sh,
       ACE_NEW_RETURN (this->svc_handler_,
                       SVC_HANDLER,
                       -1);
-      this->delete_svc_handler_ = 1;
+      this->delete_svc_handler_ = true;
     }
   else
     {
       this->svc_handler_ = sh;
-      this->delete_svc_handler_ = 0;
+      this->delete_svc_handler_ = false;
     }
 
   return 0;
@@ -470,16 +469,16 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  ACE_Recycling_Strategy<SVC_HANDLER> *rec_s,
  MUTEX *lock,
- int delete_lock)
+ bool delete_lock)
   : lock_ (lock),
     delete_lock_ (delete_lock),
     reverse_lock_ (0),
     creation_strategy_ (0),
-    delete_creation_strategy_ (0),
+    delete_creation_strategy_ (false),
     concurrency_strategy_ (0),
-    delete_concurrency_strategy_ (0),
+    delete_concurrency_strategy_ (false),
     recycling_strategy_ (0),
-    delete_recycling_strategy_ (0)
+    delete_recycling_strategy_ (false)
 {
   // Create a new lock if necessary.
   if (this->lock_ == 0)
@@ -487,7 +486,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
       ACE_NEW (this->lock_,
                MUTEX);
 
-      this->delete_lock_ = 1;
+      this->delete_lock_ = true;
     }
 
   ACE_NEW (this->reverse_lock_,
@@ -511,17 +510,17 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
 
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
-  this->delete_creation_strategy_ = 0;
+  this->delete_creation_strategy_ = false;
   this->creation_strategy_ = 0;
 
   if (this->delete_concurrency_strategy_)
     delete this->concurrency_strategy_;
-  this->delete_concurrency_strategy_ = 0;
+  this->delete_concurrency_strategy_ = false;
   this->concurrency_strategy_ = 0;
 
   if (this->delete_recycling_strategy_)
     delete this->recycling_strategy_;
-  this->delete_recycling_strategy_ = 0;
+  this->delete_recycling_strategy_ = false;
   this->recycling_strategy_ = 0;
 
   // Close down all cached service handlers.
@@ -545,12 +544,12 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
 
   // First we decide if we need to clean up.
   if (this->creation_strategy_ != 0 &&
-      this->delete_creation_strategy_ != 0 &&
+      this->delete_creation_strategy_ &&
       cre_s != 0)
     {
       delete this->creation_strategy_;
       this->creation_strategy_ = 0;
-      this->delete_creation_strategy_ = 0;
+      this->delete_creation_strategy_ = false;
     }
 
   if (cre_s != 0)
@@ -559,18 +558,18 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
     {
       ACE_NEW_RETURN (this->creation_strategy_,
                       CREATION_STRATEGY, -1);
-      this->delete_creation_strategy_ = 1;
+      this->delete_creation_strategy_ = true;
     }
 
   // Initialize the concurrency strategy.
 
   if (this->concurrency_strategy_ != 0 &&
-      this->delete_concurrency_strategy_ != 0 &&
+      this->delete_concurrency_strategy_ &&
       con_s != 0)
     {
       delete this->concurrency_strategy_;
       this->concurrency_strategy_ = 0;
-      this->delete_concurrency_strategy_ = 0;
+      this->delete_concurrency_strategy_ = false;
     }
 
   if (con_s != 0)
@@ -579,18 +578,18 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
     {
       ACE_NEW_RETURN (this->concurrency_strategy_,
                       CONCURRENCY_STRATEGY, -1);
-      this->delete_concurrency_strategy_ = 1;
+      this->delete_concurrency_strategy_ = true;
     }
 
   // Initialize the recycling strategy.
 
   if (this->recycling_strategy_ != 0 &&
-      this->delete_recycling_strategy_ != 0 &&
+      this->delete_recycling_strategy_ &&
       rec_s != 0)
     {
       delete this->recycling_strategy_;
       this->recycling_strategy_ = 0;
-      this->delete_recycling_strategy_ = 0;
+      this->delete_recycling_strategy_ = false;
     }
 
   if (rec_s != 0)
@@ -599,7 +598,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::open
     {
       ACE_NEW_RETURN (this->recycling_strategy_,
                       RECYCLING_STRATEGY, -1);
-      this->delete_recycling_strategy_ = 1;
+      this->delete_recycling_strategy_ = true;
     }
 
   return 0;
diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h
index 9985b194353..1ab517d4b7b 100644
--- a/ACE/ace/Strategies_T.h
+++ b/ACE/ace/Strategies_T.h
@@ -106,8 +106,8 @@ public:
   // = Factory method.
   /**
    * Create a SVC_HANDLER with the appropriate creation strategy.  The
-   * default behavior of this method is to make a new <SVC_HANDLER> if
-   * <sh> == 0 (passing in the <Thread_Manager>), else <sh> is
+   * default behavior of this method is to make a new SVC_HANDLER if
+   * @a sh == 0 (passing in the <Thread_Manager>), else @a sh is
    * unchanged.  Returns -1 on failure, else 0.
    */
   virtual int make_svc_handler (SVC_HANDLER *&sh);
@@ -130,7 +130,7 @@ protected:
  * @class ACE_Singleton_Strategy
  *
  * @brief Defines the interface for specifying a creation strategy for
- * a <SVC_HANDLER> that always returns the same <SVC_HANDLER> (i.e.,
+ * a SVC_HANDLER that always returns the same SVC_HANDLER (i.e.,
  * it's a Singleton).
  *
  * Note that this class takes over the ownership of the
@@ -167,8 +167,8 @@ protected:
   /// Pointer to the Singleton svc_handler.
   SVC_HANDLER *svc_handler_;
 
-  /// Keep track of whether we need to delete the <SVC_HANDLER>.
-  int delete_svc_handler_;
+  /// Keep track of whether we need to delete the SVC_HANDLER.
+  bool delete_svc_handler_;
 };
 
 /**
@@ -281,7 +281,7 @@ public:
 protected:
 
   /// Flags that are parsed to set options for the connected
-  /// <SVC_HANDLER>.
+  /// SVC_HANDLER.
   int flags_;
 };
 
@@ -293,7 +293,7 @@ protected:
  * methods run in the reactor's thread of control.
  *
  * This class provides a strategy that registers the
- * <SVC_HANDLER> with a <Reactor>.
+ * SVC_HANDLER with a <Reactor>.
  */
 template <class SVC_HANDLER>
 class ACE_Reactive_Strategy : public ACE_Concurrency_Strategy <SVC_HANDLER>
@@ -335,11 +335,11 @@ public:
 protected:
   typedef ACE_Concurrency_Strategy<SVC_HANDLER> inherited;
 
-  /// Pointer to the Reactor we'll use to register the <SVC_HANDLER>.
+  /// Pointer to the Reactor we'll use to register the SVC_HANDLER.
   ACE_Reactor *reactor_;
 
   /// The mask that we pass to the <Reactor> when we register the
-  /// <SVC_HANDLER>.
+  /// SVC_HANDLER.
   ACE_Reactor_Mask mask_;
 };
 
@@ -347,13 +347,13 @@ protected:
  * @class ACE_Thread_Strategy
  *
  * @brief Defines the interface for specifying a concurrency strategy
- * for a <SVC_HANDLER> based on multithreading.
+ * for a SVC_HANDLER based on multithreading.
  *
  * This class provides a strategy that manages the creation of threads
  * to handle requests from clients concurrently via a
  * thread-per-connection model.  It behaves as a "thread factory",
  * spawning threads "on-demand" to run the service specified by a
- * user-supplied <SVC_HANDLER>.
+ * user-supplied SVC_HANDLER.
  */
 template <class SVC_HANDLER>
 class ACE_Thread_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER>
@@ -743,7 +743,7 @@ protected:
  * as in connect or accept strategy.
  *
  * An example of the use of this is in the
- * <ACE_Cached_Connect_Strategy>, which only returns a single
+ * ACE_Cached_Connect_Strategy, which only returns a single
  * connection for a given endpoint.
  */
 template <class SVC_HANDLER>
@@ -765,7 +765,7 @@ public:
  * calling open on a svc_handler multiple times.
  *
  * An example of the use of this is in the
- * <ACE_Cached_Connect_Strategy>, which reuses svc_handlers.
+ * ACE_Cached_Connect_Strategy, which reuses svc_handlers.
  * Therefore we don't want to call open on the recycled
  * svc_handler more than once.
  */
@@ -818,7 +818,7 @@ protected:
  * @class ACE_Cached_Connect_Strategy
  *
  * @brief A connection strategy which caches connections to peers
- * (represented by <SVC_HANDLER> instances), thereby allowing
+ * (represented by SVC_HANDLER instances), thereby allowing
  * subsequent re-use of unused, but available, connections.
  *
  * <ACE_Cached_Connect_Strategy> is intended to be used as a
@@ -861,7 +861,7 @@ public:
                                ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0,
                                ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0,
                                MUTEX *mutex = 0,
-                               int delete_mutex = 0);
+                               bool delete_lock = false);
 
   /// Destructor
   virtual ~ACE_Cached_Connect_Strategy (void);
@@ -891,7 +891,7 @@ public:
    * Checks to see if there is already a <SVC_HANDLER> in the cache
    * connected to the <remote_addr>.  If so, we return this pointer.
    * Otherwise we establish the connection, put it into the cache, and
-   * return the <SVC_HANDLER> pointer.  <[NOTE]>: the <{reuse_addr}>
+   * return the SVC_HANDLER pointer.  <[NOTE]>: the <{reuse_addr}>
    * argument does NOT control re-use of addresses in the cache.
    * Rather, if the underlying protocol requires a "dead time" prior
    * to re-use of its addresses (TCP is a classic example of this),
@@ -1021,14 +1021,14 @@ protected:
     int perms,
     int &found);
 
-  /// Table that maintains the cache of connected <SVC_HANDLER>s.
+  /// Table that maintains the cache of connected SVC_HANDLERs.
   CONNECTION_MAP connection_map_;
 
   /// Mutual exclusion for this object.
   MUTEX *lock_;
 
   /// Mutual exclusion for this object.
-  int delete_lock_;
+  bool delete_lock_;
 
   /// Reverse lock.
   REVERSE_MUTEX *reverse_lock_;
@@ -1038,23 +1038,23 @@ protected:
   /// Creation strategy for an <Connector>.
   CREATION_STRATEGY *creation_strategy_;
 
-  /// 1 if <Connector> created the creation strategy and thus should
-  /// delete it, else 0.
-  int delete_creation_strategy_;
+  /// true if <Connector> created the creation strategy and thus should
+  /// delete it, else false.
+  bool delete_creation_strategy_;
 
   /// Concurrency strategy for an <Connector>.
   CONCURRENCY_STRATEGY *concurrency_strategy_;
 
-  /// 1 if <Connector> created the concurrency strategy and thus should
-  /// delete it, else 0.
-  int delete_concurrency_strategy_;
+  /// true if <Connector> created the concurrency strategy and thus should
+  /// delete it, else false.
+  bool delete_concurrency_strategy_;
 
   /// Recycling strategy for an <Connector>.
   RECYCLING_STRATEGY *recycling_strategy_;
 
-  /// 1 if <Connector> created the recycling strategy and thus should
-  /// delete it, else 0.
-  int delete_recycling_strategy_;
+  /// true if <Connector> created the recycling strategy and thus should
+  /// delete it, else false.
+  bool delete_recycling_strategy_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 263515146ff..70c5158f4cf 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -85,7 +85,7 @@ public:
 
   /**
    * Call this method if you want to recycling the @c Svc_Handler
-   * instead of closing it.  If the object does not have a recycler,
+   * instead of closing it. If the object does not have a recycler,
    * it will be closed.
    */
   virtual int idle (u_long flags = 0);
@@ -252,7 +252,7 @@ protected:
  * its connected peer and supports buffering.
  *
  * The buffering feature makes it possible to queue up
- * <ACE_Message_Blocks> in an ACE_Message_Queue until (1) the
+ * ACE_Message_Blocks in an ACE_Message_Queue until (1) the
  * queue is "full" or (2) a period of time elapses, at which
  * point the queue is "flushed" via <sendv_n> to the peer.
  */
@@ -262,12 +262,12 @@ class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_S
 public:
   // = Initialization and termination methods.
   /**
-   * Constructor initializes the <thr_mgr> and <mq> by passing them
-   * down to the ACE_Task base class.  The <reactor> is passed to
-   * the ACE_Event_Handler.  The <max_buffer_size> and
-   * <relative_timeout> are used to determine at what point to flush
-   * the <mq>.  By default, there's no buffering at all.  The
-   * <relative_timeout> value is interpreted to be in a unit that's
+   * Constructor initializes the @a thr_mgr and @a mq by passing them
+   * down to the ACE_Task base class.  The @a reactor is passed to
+   * the ACE_Event_Handler.  The @a max_buffer_size and
+   * @a relative_timeout are used to determine at what point to flush
+   * the @a mq.  By default, there's no buffering at all.  The
+   * @a relative_timeout value is interpreted to be in a unit that's
    * relative to the current time returned by <ACE_OS::gettimeofday>.
    */
   ACE_Buffered_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0,
diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h
index 74e477a7b6b..5caaff82d9f 100644
--- a/ACE/ace/TLI_Connector.h
+++ b/ACE/ace/TLI_Connector.h
@@ -51,7 +51,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
@@ -79,7 +79,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   int connect (ACE_TLI_Stream &new_stream,
@@ -97,7 +97,7 @@ public:
 
   /**
    * Try to complete a non-blocking connection.
-   * If connection completion is successful then <new_stream> contains
+   * If connection completion is successful then @a new_stream contains
    * the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
    * will contain the address of the connected peer.
    */
diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp
index 727452f8546..1a3848d6ccb 100644
--- a/ACE/ace/Task_Ex_T.cpp
+++ b/ACE/ace/Task_Ex_T.cpp
@@ -49,7 +49,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::ACE_Task_Ex (ACE_Thread_Manager *t
                                    ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE> *mq)
   : ACE_Task_Base (thr_man),
     msg_queue_ (0),
-    delete_msg_queue_ (0),
+    delete_msg_queue_ (false),
     mod_ (0),
     next_ (0)
 {
@@ -59,7 +59,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::ACE_Task_Ex (ACE_Thread_Manager *t
     {
       ACE_NEW (mq,
                (ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>));
-      this->delete_msg_queue_ = 1;
+      this->delete_msg_queue_ = true;
     }
 
   this->msg_queue_ = mq;
@@ -74,7 +74,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::~ACE_Task_Ex (void)
 
   // These assignments aren't strickly necessary but they help guard
   // against odd race conditions...
-  this->delete_msg_queue_ = 0;
+  this->delete_msg_queue_ = false;
 }
 
 template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> ACE_Task<ACE_SYNCH_USE> *
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 8a8da2a63c8..ba308193bd9 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -162,8 +162,8 @@ public: // Should be protected:
   /// Queue of messages on the ACE_Task..
   MESSAGE_QUEUE_EX *msg_queue_;
 
-  /// 1 if should delete Message_Queue, 0 otherwise.
-  int delete_msg_queue_;
+  /// true if should delete Message_Queue, false otherwise.
+  bool delete_msg_queue_;
 
   /// Back-pointer to the enclosing module.
   ACE_Module<ACE_SYNCH_USE> *mod_;
diff --git a/ACE/ace/Task_Ex_T.inl b/ACE/ace/Task_Ex_T.inl
index b49f4bf53f1..3ce14b52224 100644
--- a/ACE/ace/Task_Ex_T.inl
+++ b/ACE/ace/Task_Ex_T.inl
@@ -63,7 +63,7 @@ ACE_Task_Ex<ACE_SYNCH_USE,ACE_MESSAGE_TYPE>::msg_queue (ACE_Message_Queue_Ex<ACE
   if (this->delete_msg_queue_)
     {
       delete this->msg_queue_;
-      this->delete_msg_queue_ = 0;
+      this->delete_msg_queue_ = false;
     }
   this->msg_queue_ = mq;
 }
diff --git a/ACE/ace/Task_T.cpp b/ACE/ace/Task_T.cpp
index c54449276d1..cb7010d0bda 100644
--- a/ACE/ace/Task_T.cpp
+++ b/ACE/ace/Task_T.cpp
@@ -48,7 +48,7 @@ ACE_Task<ACE_SYNCH_USE>::ACE_Task (ACE_Thread_Manager *thr_man,
                                    ACE_Message_Queue<ACE_SYNCH_USE> *mq)
   : ACE_Task_Base (thr_man),
     msg_queue_ (0),
-    delete_msg_queue_ (0),
+    delete_msg_queue_ (false),
     mod_ (0),
     next_ (0)
 {
@@ -58,7 +58,7 @@ ACE_Task<ACE_SYNCH_USE>::ACE_Task (ACE_Thread_Manager *thr_man,
     {
       ACE_NEW (mq,
                ACE_Message_Queue<ACE_SYNCH_USE>);
-      this->delete_msg_queue_ = 1;
+      this->delete_msg_queue_ = true;
     }
 
   this->msg_queue_ = mq;
@@ -73,7 +73,7 @@ ACE_Task<ACE_SYNCH_USE>::~ACE_Task (void)
 
   // These assignments aren't strickly necessary but they help guard
   // against odd race conditions...
-  this->delete_msg_queue_ = 0;
+  this->delete_msg_queue_ = false;
 }
 
 template<ACE_SYNCH_DECL> ACE_Task<ACE_SYNCH_USE> *
diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h
index 5531e136b0b..befe62ceac3 100644
--- a/ACE/ace/Task_T.h
+++ b/ACE/ace/Task_T.h
@@ -149,8 +149,8 @@ public: // Should be protected:
   /// Queue of messages on the ACE_Task..
   ACE_Message_Queue<ACE_SYNCH_USE> *msg_queue_;
 
-  /// 1 if should delete Message_Queue, 0 otherwise.
-  int delete_msg_queue_;
+  /// true if should delete Message_Queue, false otherwise.
+  bool delete_msg_queue_;
 
   /// Back-pointer to the enclosing module.
   ACE_Module<ACE_SYNCH_USE> *mod_;
diff --git a/ACE/ace/Task_T.inl b/ACE/ace/Task_T.inl
index 77d7c0d789e..bb41aba1da1 100644
--- a/ACE/ace/Task_T.inl
+++ b/ACE/ace/Task_T.inl
@@ -63,7 +63,7 @@ ACE_Task<ACE_SYNCH_USE>::msg_queue (ACE_Message_Queue<ACE_SYNCH_USE> *mq)
   if (this->delete_msg_queue_)
     {
       delete this->msg_queue_;
-      this->delete_msg_queue_ = 0;
+      this->delete_msg_queue_ = false;
     }
   this->msg_queue_ = mq;
 }
diff --git a/ACE/ace/Thread_Control.h b/ACE/ace/Thread_Control.h
index 269ed426d5a..ee9d7f5094b 100644
--- a/ACE/ace/Thread_Control.h
+++ b/ACE/ace/Thread_Control.h
@@ -43,7 +43,7 @@ class ACE_Thread_Manager;
 class ACE_Export ACE_Thread_Control
 {
 public:
-  /// Initialize the thread control object.  If <insert> != 0, then
+  /// Initialize the thread control object.  If @a insert != 0, then
   /// register the thread with the Thread_Manager.
   ACE_Thread_Control (ACE_Thread_Manager *tm = 0,
                       int insert = 0);
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 8f00bf22abe..98d66d5b914 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -48,7 +48,7 @@ ACE_Thread_Manager *ACE_Thread_Manager::thr_mgr_ = 0;
 
 // Controls whether the Thread_Manager is deleted when we shut down
 // (we can only delete it safely if we created it!)
-int ACE_Thread_Manager::delete_thr_mgr_ = 0;
+bool ACE_Thread_Manager::delete_thr_mgr_ = false;
 #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */
 
 ACE_TSS_TYPE (ACE_Thread_Exit) *ACE_Thread_Manager::thr_exit_ = 0;
@@ -391,7 +391,7 @@ ACE_Thread_Manager::instance (void)
           ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_,
                           ACE_Thread_Manager,
                           0);
-          ACE_Thread_Manager::delete_thr_mgr_ = 1;
+          ACE_Thread_Manager::delete_thr_mgr_ = true;
         }
     }
 
@@ -407,7 +407,7 @@ ACE_Thread_Manager::instance (ACE_Thread_Manager *tm)
 
   ACE_Thread_Manager *t = ACE_Thread_Manager::thr_mgr_;
   // We can't safely delete it since we don't know who created it!
-  ACE_Thread_Manager::delete_thr_mgr_ = 0;
+  ACE_Thread_Manager::delete_thr_mgr_ = false;
 
   ACE_Thread_Manager::thr_mgr_ = tm;
   return t;
@@ -427,7 +427,7 @@ ACE_Thread_Manager::close_singleton (void)
       ACE_Thread_Manager::thr_mgr_->close ();
       delete ACE_Thread_Manager::thr_mgr_;
       ACE_Thread_Manager::thr_mgr_ = 0;
-      ACE_Thread_Manager::delete_thr_mgr_ = 0;
+      ACE_Thread_Manager::delete_thr_mgr_ = false;
     }
 
   ACE_Thread_Exit::cleanup (ACE_Thread_Manager::thr_exit_);
diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h
index c6939117103..2f209f7d986 100644
--- a/ACE/ace/Thread_Manager.h
+++ b/ACE/ace/Thread_Manager.h
@@ -1121,8 +1121,8 @@ private:
   /// Pointer to a process-wide ACE_Thread_Manager.
   static ACE_Thread_Manager *thr_mgr_;
 
-  /// Must delete the <thr_mgr_> if non-0.
-  static int delete_thr_mgr_;
+  /// Must delete the thr_mgr_ if true.
+  static bool delete_thr_mgr_;
 
   /// Global ACE_TSS (ACE_Thread_Exit) object ptr.
   static ACE_TSS_TYPE (ACE_Thread_Exit) *thr_exit_;
diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h
index 0b44ef310da..d8f5369b01a 100644
--- a/ACE/ace/Thread_Mutex.h
+++ b/ACE/ace/Thread_Mutex.h
@@ -81,8 +81,8 @@ public:
    * If @a tv == 0 the call <acquire()> directly.  Otherwise, Block the
    * thread until we acquire the mutex or until @a tv times out, in
    * which case -1 is returned with @c errno == @c ETIME.  Note that
-   * <*tv> is assumed to be in "absolute" rather than "relative" time.
-   * The value of <*tv> is updated upon return to show the actual
+   * @a tv is assumed to be in "absolute" rather than "relative" time.
+   * The value of @a tv is updated upon return to show the actual
    * (absolute) acquisition time.
    */
   int acquire (ACE_Time_Value *tv);
@@ -98,14 +98,14 @@ public:
   int release (void);
 
   /**
-   * Acquire mutex ownership.  This calls <acquire> and is only here
+   * Acquire mutex ownership.  This calls acquire() and is only here
    * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
   int acquire_read (void);
 
   /**
-   * Acquire mutex ownership.  This calls <acquire> and is only here
+   * Acquire mutex ownership.  This calls acquire() and is only here
    * to make the ACE_Thread_Mutex interface consistent with the
    * other synchronization APIs.
    */
@@ -113,7 +113,7 @@ public:
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
-   * <tryacquire> and is only here to make the ACE_Thread_Mutex
+   * tryacquire() and is only here to make the ACE_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
@@ -122,7 +122,7 @@ public:
 
   /**
    * Conditionally acquire mutex (i.e., won't block).  This calls
-   * <tryacquire> and is only here to make the ACE_Thread_Mutex
+   * tryacquire() and is only here to make the ACE_Thread_Mutex
    * interface consistent with the other synchronization APIs.
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, @c errno is set to @c EBUSY.
@@ -150,7 +150,7 @@ public:
   /// Mutex type that supports single-process locking efficiently.
   ACE_thread_mutex_t lock_;
 
-  /// Keeps track of whether <remove> has been called yet to avoid
+  /// Keeps track of whether remove() has been called yet to avoid
   /// multiple <remove> calls, e.g., explicitly and implicitly in the
   /// destructor.  This flag isn't protected by a lock, so make sure
   /// that you don't have multiple threads simultaneously calling
diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h
index a7f530b4889..ff339660780 100644
--- a/ACE/ace/Timeprobe_T.h
+++ b/ACE/ace/Timeprobe_T.h
@@ -117,7 +117,7 @@ public:
   /// Sorted Event Descriptions.
   ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions (void);
 
-  /// Find description of event \<i\>
+  /// Find description of event @a i
   const char *find_description_i (u_long i);
 
   /// Sort event descriptions
@@ -165,7 +165,6 @@ protected:
   /// drained.
   u_short report_buffer_full_;
 
-
 private:
    ALLOCATOR *   allocator_;
 };
@@ -193,8 +192,7 @@ class ACE_Function_Timeprobe
 {
 public:
   /// Constructor.
-  ACE_Function_Timeprobe (Timeprobe &timeprobe,
-                          u_long event);
+  ACE_Function_Timeprobe (Timeprobe &timeprobe, u_long event);
 
   /// Destructor.
   ~ACE_Function_Timeprobe (void);
diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h
index b919aabda9e..53072ebd51c 100644
--- a/ACE/ace/Timer_Hash_T.h
+++ b/ACE/ace/Timer_Hash_T.h
@@ -112,7 +112,7 @@ private:
 /**
  * @class ACE_Timer_Hash_Iterator_T
  *
- * @brief Iterates over an <ACE_Timer_Hash_T>.
+ * @brief Iterates over an ACE_Timer_Hash_T.
  *
  * This is a generic iterator that can be used to visit every
  * node of a timer queue.  Be aware that it doesn't transverse
@@ -151,7 +151,7 @@ protected:
 /**
  * @class ACE_Timer_Hash_T
  *
- * @brief Provides a hash table of <BUCKET>s as an implementation for
+ * @brief Provides a hash table of BUCKETs as an implementation for
  * a timer queue.
  *
  * This implementation uses a hash table of BUCKETs.  The hash
@@ -174,9 +174,9 @@ public:
 
   // = Initialization and termination methods.
   /**
-   * Default constructor. <table_size> determines the size of the
-   * hash table.  <upcall_functor> is the instance of the FUNCTOR
-   * to be used by the buckets. If <upcall_functor> is 0, a default
+   * Default constructor. @a table_size determines the size of the
+   * hash table.  @a upcall_functor is the instance of the FUNCTOR
+   * to be used by the buckets. If @a upcall_functor is 0, a default
    * FUNCTOR will be created.
    */
   ACE_Timer_Hash_T (size_t table_size,
@@ -184,9 +184,9 @@ public:
                     ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0);
 
   /**
-   * Default constructor. <upcall_functor> is the instance of the
-   * FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer
-   * Hash will create a default FUNCTOR.  <freelist> the freelist of
+   * Default constructor. @a upcall_functor is the instance of the
+   * FUNCTOR to be used by the queue. If @a upcall_functor is 0, Timer
+   * Hash will create a default FUNCTOR.  @a freelist the freelist of
    * timer nodes.  If 0, then a default freelist will be created.  The default
    * size will be ACE_DEFAULT_TIMERS and there will be no preallocation.
    */
@@ -245,7 +245,7 @@ public:
   virtual int expire (void);
 
   /**
-   * Run the <functor> for all timers whose values are <= <cur_time>.
+   * Run the <functor> for all timers whose values are <= @a current_time.
    * This does not account for <timer_skew>.  Returns the number of
    * timers canceled.
    */
diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index 9d2083e7176..ced92db6181 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -212,9 +212,9 @@ public:
 
   // = Initialization and termination methods.
   /**
-   * Default constructor. <upcall_functor> is the instance of the
-   * FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer
-   * Queue will create a default FUNCTOR.  <freelist> the freelist of
+   * Default constructor. @a upcall_functor is the instance of the
+   * FUNCTOR to be used by the queue. If @a upcall_functor is 0, Timer
+   * Queue will create a default FUNCTOR.  @a freelist the freelist of
    * timer nodes.  If 0, then a default freelist will be created.
    */
   ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0,
@@ -445,10 +445,10 @@ protected:
   FUNCTOR *upcall_functor_;
 
   /// To delete or not to delete is the question?
-  int delete_upcall_functor_;
+  bool const delete_upcall_functor_;
 
   /// Flag to delete only if the class created the <free_list_>
-  int delete_free_list_;
+  bool const delete_free_list_;
 
 private:
 
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 726119ba307..54c4221de02 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -211,8 +211,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
         && // Make sure that it is not already marked for deleted
         !this->current_info_[i].delete_entry_)
       {
-        result = this->remove_handler_i (i,
-                                         mask);
+        result = this->remove_handler_i (i, mask);
         if (result == -1)
           error = 1;
       }
@@ -243,8 +242,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
         // Make sure that it is not already marked for deleted
         !this->to_be_added_info_[i].delete_entry_)
       {
-        result = this->remove_to_be_added_handler_i (i,
-                                                     mask);
+        result = this->remove_to_be_added_handler_i (i, mask);
         if (result == -1)
           error = 1;
       }
@@ -303,7 +301,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot,
   if (this->current_info_[slot].network_events_ == 0)
     {
       // Mark to be deleted
-      this->current_info_[slot].delete_entry_ = 1;
+      this->current_info_[slot].delete_entry_ = true;
       // Remember the mask
       this->current_info_[slot].close_masks_ = to_be_removed_masks;
       // Increment the handle count
@@ -371,7 +369,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot,
   if (this->current_suspended_info_[slot].network_events_ == 0)
     {
       // Mark to be deleted
-      this->current_suspended_info_[slot].delete_entry_ = 1;
+      this->current_suspended_info_[slot].delete_entry_ = true;
       // Remember the mask
       this->current_suspended_info_[slot].close_masks_ = to_be_removed_masks;
       // Increment the handle count
@@ -438,7 +436,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot,
   if (this->to_be_added_info_[slot].network_events_ == 0)
     {
       // Mark to be deleted
-      this->to_be_added_info_[slot].delete_entry_ = 1;
+      this->to_be_added_info_[slot].delete_entry_ = true;
       // Remember the mask
       this->to_be_added_info_[slot].close_masks_ = to_be_removed_masks;
       // Increment the handle count
@@ -629,7 +627,7 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry,
                                              long network_events,
                                              ACE_HANDLE io_handle,
                                              ACE_HANDLE event_handle,
-                                             int delete_event)
+                                             bool delete_event)
 {
   if (event_handler == 0)
     return -1;
@@ -1384,7 +1382,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
     }
 
   long new_network_events = 0;
-  int delete_event = 0;
+  bool delete_event = false;
   auto_ptr <ACE_Auto_Event> event;
 
   // Look up the repository to see if the <event_handler> is already
@@ -1407,7 +1405,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
       auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event);
       event = tmp;
       event_handle = event->handle ();
-      delete_event = 1;
+      delete_event = true;
     }
 
   int result = ::WSAEventSelect ((SOCKET) io_handle,
@@ -1459,7 +1457,7 @@ ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle,
     return -1;
 
   long new_network_events = 0;
-  int delete_event = 0;
+  bool delete_event = false;
   ACE_HANDLE event_handle = ACE_INVALID_HANDLE;
 
   // Look up the repository to see if the <Event_Handler> is already
@@ -1494,7 +1492,7 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
                                                               ACE_Reactor_Mask &old_masks,
                                                               long &new_network_events,
                                                               ACE_HANDLE &event_handle,
-                                                              int &delete_event,
+                                                              bool &delete_event,
                                                               int operation)
 {
   long *modified_network_events = &new_network_events;
@@ -1556,8 +1554,7 @@ ACE_Event_Handler *
 ACE_WFMO_Reactor_Handler_Repository::find_handler (ACE_HANDLE handle)
 {
   long existing_masks_ignored = 0;
-  return this->handler (handle,
-                        existing_masks_ignored);
+  return this->handler (handle, existing_masks_ignored);
 }
 
 ACE_Event_Handler *
diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h
index a31950ff03f..fa7d6a4e7c3 100644
--- a/ACE/ace/WFMO_Reactor.h
+++ b/ACE/ace/WFMO_Reactor.h
@@ -144,10 +144,10 @@ public:
      * <Event_Handler> removes itself from <WFMO_Reactor>.  This entry
      * is only valid if the <io_entry_> flag is true.
      */
-    int delete_event_;
+    bool delete_event_;
 
     /// This is set when the entry needed to be deleted.
-    int delete_entry_;
+    bool delete_entry_;
 
     /**
      * These are the masks related to <handle_close> for the
@@ -167,8 +167,8 @@ public:
               ACE_Event_Handler *event_handler,
               ACE_HANDLE io_handle,
               long network_events,
-              int delete_event,
-              int delete_entry,
+              bool delete_event,
+              bool delete_entry,
               ACE_Reactor_Mask close_masks);
 
     /// Set the structure to these new values
@@ -201,8 +201,8 @@ public:
               ACE_Event_Handler *event_handler,
               ACE_HANDLE io_handle,
               long network_events,
-              int delete_event,
-              int delete_entry = 0,
+              bool delete_event,
+              bool delete_entry = false,
               ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK,
               int suspend_entry = 0);
 
@@ -241,8 +241,8 @@ public:
               ACE_Event_Handler *event_handler,
               ACE_HANDLE io_handle,
               long network_events,
-              int delete_event,
-              int delete_entry = 0,
+              bool delete_event,
+              bool delete_entry = false,
               ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK,
               int suspend_entry = 0);
 
@@ -282,8 +282,8 @@ public:
               ACE_Event_Handler *event_handler,
               ACE_HANDLE io_handle,
               long network_events,
-              int delete_event,
-              int delete_entry = 0,
+              bool delete_event,
+              bool delete_entry = false,
               ACE_Reactor_Mask close_masks = 0,
               int resume_entry = 0);
 
@@ -321,7 +321,7 @@ public:
               long network_events,
               ACE_HANDLE io_handle,
               ACE_HANDLE event_handle,
-              int delete_event);
+              bool delete_event);
 
   /// Remove the binding of ACE_HANDLE in accordance with the @a mask.
   int unbind (ACE_HANDLE,
@@ -372,7 +372,7 @@ public:
                                ACE_Reactor_Mask &old_masks,
                                long &new_network_events,
                                ACE_HANDLE &event_handle,
-                               int &delete_event,
+                               bool &delete_event,
                                int operation);
 
   /// This method is used to change the network mask left (if any)
diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl
index 03407695dd6..1b6b47c0f28 100644
--- a/ACE/ace/WFMO_Reactor.inl
+++ b/ACE/ace/WFMO_Reactor.inl
@@ -33,8 +33,8 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::Common_Info (void)
     event_handler_ (0),
     io_handle_ (ACE_INVALID_HANDLE),
     network_events_ (0),
-    delete_event_ (0),
-    delete_entry_ (0),
+    delete_event_ (false),
+    delete_entry_ (false),
     close_masks_ (ACE_Event_Handler::NULL_MASK)
 {
 }
@@ -46,8 +46,8 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::reset (void)
   this->io_entry_ = 0;
   this->io_handle_ = ACE_INVALID_HANDLE;
   this->network_events_ = 0;
-  this->delete_event_ = 0;
-  this->delete_entry_ = 0;
+  this->delete_event_ = false;
+  this->delete_entry_ = false;
   this->close_masks_ = ACE_Event_Handler::NULL_MASK;
 }
 
@@ -56,8 +56,8 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (int io_entry,
                                                        ACE_Event_Handler *event_handler,
                                                        ACE_HANDLE io_handle,
                                                        long network_events,
-                                                       int delete_event,
-                                                       int delete_entry,
+                                                       bool delete_event,
+                                                       bool delete_entry,
                                                        ACE_Reactor_Mask close_masks)
 {
   this->event_handler_ = event_handler;
@@ -128,8 +128,8 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::set (int io_entry,
                                                         ACE_Event_Handler *event_handler,
                                                         ACE_HANDLE io_handle,
                                                         long network_events,
-                                                        int delete_event,
-                                                        int delete_entry,
+                                                        bool delete_event,
+                                                        bool delete_entry,
                                                         ACE_Reactor_Mask close_masks,
                                                         int suspend_entry)
 {
@@ -197,8 +197,8 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::set (ACE_HANDLE event_han
                                                             ACE_Event_Handler *event_handler,
                                                             ACE_HANDLE io_handle,
                                                             long network_events,
-                                                            int delete_event,
-                                                            int delete_entry,
+                                                            bool delete_event,
+                                                            bool delete_entry,
                                                             ACE_Reactor_Mask close_masks,
                                                             int suspend_entry)
 {
@@ -276,8 +276,8 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handl
                                                           ACE_Event_Handler *event_handler,
                                                           ACE_HANDLE io_handle,
                                                           long network_events,
-                                                          int delete_event,
-                                                          int delete_entry,
+                                                          bool delete_event,
+                                                          bool delete_entry,
                                                           ACE_Reactor_Mask close_masks,
                                                           int resume_entry)
 {
@@ -372,9 +372,9 @@ ACE_INLINE int
 ACE_WFMO_Reactor_Handler_Repository::scheduled_for_deletion (size_t slot) const
 {
   if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ())
-    return this->current_info_[slot].delete_entry_ == 1;
+    return this->current_info_[slot].delete_entry_ == true;
   else
-    return this->current_info_[slot + 1].delete_entry_ == 1;
+    return this->current_info_[slot + 1].delete_entry_ == true;
 }
 
 ACE_INLINE int
diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h
index 23fbc0c6381..3172e942e8a 100644
--- a/ACE/ace/XTI_ATM_Mcast.h
+++ b/ACE/ace/XTI_ATM_Mcast.h
@@ -42,7 +42,7 @@ public:
   ACE_XTI_ATM_Mcast (void);
 
   /**
-   * Actively connect and produce a <new_stream> if things go well.
+   * Actively connect and produce a @a new_stream if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
@@ -53,7 +53,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
@@ -70,7 +70,7 @@ public:
                      struct netbuf *opt = 0);
 
   /**
-   * Actively connect and produce a <new_stream> if things go well.
+   * Actively connect and produce a @a new_stream if things go well.
    * The <remote_sap> is the address that we are trying to connect
    * with.  The @a timeout is the amount of time to wait to connect.
    * If it's 0 then we block indefinitely.  If *timeout == {0, 0} then
@@ -81,7 +81,7 @@ public:
    * time expires before the connection is made <errno == ETIME>.  The
    * <local_sap> is the value of local address to bind to.  If it's
    * the default value of <ACE_Addr::sap_any> then the user is letting
-   * the OS do the binding.  If <reuse_addr> == 1 then the
+   * the OS do the binding.  If @a reuse_addr == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    */
   int connect (ACE_TLI_Stream &new_stream,