Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

1 files changed, 5 insertions, 5 deletions

diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h
index c02a37d61f1..80c1a2de638 100644
--- a/ACE/ace/Message_Block.h
+++ b/ACE/ace/Message_Block.h
@@ -717,7 +717,7 @@ public:
    */
   char *mark (void) const;
 
-  // = Message size is the total amount of space alloted.
+  // = Message size is the total amount of space allotred.
 
   /// Get the total amount of allotted space in the message.  The amount of
   /// allotted space may be less than allocated space.
@@ -762,11 +762,11 @@ public:
   ACE_Data_Block *release (ACE_Lock *lock = 0);
 
   // = Message flag accessors and mutators.
-  /// Bitwise-or the <more_flags> into the existing message flags and
+  /// Bitwise-or the @a more_flags into the existing message flags and
   /// return the new value.
   ACE_Message_Block::Message_Flags set_flags (ACE_Message_Block::Message_Flags more_flags);
 
-  /// Clear the message flag bits specified in <less_flags> and return
+  /// Clear the message flag bits specified in @a less_flags and return
   /// the new value.
   ACE_Message_Block::Message_Flags clr_flags (ACE_Message_Block::Message_Flags less_flags);
 
@@ -803,7 +803,7 @@ protected:
    * Decrease the reference count, but don't delete the object.
    * Returns 0 if the object should be removed.
    * If @a lock is equal to the locking strategy then we assume that
-   * the lock is beign held by the current thread; this is used to
+   * the lock is being held by the current thread; this is used to
    * release all the data blocks in a chain while holding a single
    * lock.
    */
@@ -843,7 +843,7 @@ protected:
 
   /**
    * Reference count for this ACE_Data_Block, which is used to avoid
-   * deep copies (i.e., <clone>).  Note that this pointer value is
+   * deep copies (i.e., clone()).  Note that this pointer value is
    * shared by all owners of the <Data_Block>'s data, i.e., all the
    * ACE_Message_Blocks.
    */