11 files changed, 615 insertions, 588 deletions
diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index e63831e059..b7ec333945 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -2,12 +2,12 @@
   Provides string functions, linked list functions, math functions, synchronization
   functions, and CPU architecture-specific functions.
 
-Copyright (c) 2006 - 2008, Intel Corporation<BR>
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
 Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 #if   defined (MDE_CPU_IA32)
 ///
-/// IA-32 architecture context buffer used by SetJump() and LongJump()
+/// The IA-32 architecture context buffer used by SetJump() and LongJump().
 ///
 typedef struct {
   UINT32                            Ebx;
@@ -40,7 +40,7 @@ typedef struct {
 #if defined (MDE_CPU_IPF)
 
 ///
-/// Itanium architecture context buffer used by SetJump() and LongJump()
+/// The Itanium architecture context buffer used by SetJump() and LongJump().
 ///
 typedef struct {
   UINT64                            F2[2];
@@ -89,7 +89,7 @@ typedef struct {
 
 #if defined (MDE_CPU_X64)
 ///
-/// x64 architecture context buffer used by SetJump() and LongJump()
+/// The x64 architecture context buffer used by SetJump() and LongJump().
 ///
 typedef struct {
   UINT64                            Rbx;
@@ -103,7 +103,7 @@ typedef struct {
   UINT64                            R15;
   UINT64                            Rip;
   UINT64                            MxCsr;
-  UINT8                             XmmBuffer[160]; ///< XMM6-XMM15
+  UINT8                             XmmBuffer[160]; ///< XMM6-XMM15.
 } BASE_LIBRARY_JUMP_BUFFER;
 
 #define BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT 8
@@ -112,7 +112,7 @@ typedef struct {
 
 #if defined (MDE_CPU_EBC)
 ///
-/// EBC context buffer used by SetJump() and LongJump()
+/// The EBC context buffer used by SetJump() and LongJump().
 ///
 typedef struct {
   UINT64                            R0;
@@ -129,7 +129,7 @@ typedef struct {
 #if defined (MDE_CPU_ARM)
 
 typedef struct {
-  UINT32    R3;  ///< Copy of R13
+  UINT32    R3;  ///< A copy of R13.
   UINT32    R4;
   UINT32    R5;
   UINT32    R6;
@@ -167,8 +167,8 @@ typedef struct {
   PcdMaximumUnicodeStringLength Unicode characters not including the
   Null-terminator, then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
+  @param  Destination The pointer to a Null-terminated Unicode string.
+  @param  Source      The pointer to a Null-terminated Unicode string.
 
   @return Destination.
 
@@ -182,7 +182,7 @@ StrCpy (
 
 
 /**
-  Copies up to a specified length from one Null-terminated Unicode string  to 
+  Copies up to a specified length from one Null-terminated Unicode string to 
   another Null-terminated Unicode string and returns the new Unicode string.
 
   This function copies the contents of the Unicode string Source to the Unicode
@@ -204,9 +204,9 @@ StrCpy (
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,
   then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-  @param  Length      Maximum number of Unicode characters to copy.
+  @param  Destination The pointer to a Null-terminated Unicode string.
+  @param  Source      The pointer to a Null-terminated Unicode string.
+  @param  Length      The maximum number of Unicode characters to copy.
 
   @return Destination.
 
@@ -257,7 +257,7 @@ StrLen (
   PcdMaximumUnicodeStringLength Unicode characters not including the
   Null-terminator, then ASSERT().
 
-  @param  String  Pointer to a Null-terminated Unicode string.
+  @param  String  The pointer to a Null-terminated Unicode string.
 
   @return The size of String.
 
@@ -287,11 +287,11 @@ StrSize (
   than PcdMaximumUnicodeStringLength Unicode characters not including the
   Null-terminator, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
-  @param  FirstString   Pointer to a Null-terminated Unicode string.
-  @param  SecondString  Pointer to a Null-terminated Unicode string.
+  @param  FirstString   The pointer to a Null-terminated Unicode string.
+  @param  SecondString  The pointer to a Null-terminated Unicode string.
 
   @retval 0      FirstString is identical to SecondString.
   @return others FirstString is not identical to SecondString.
@@ -329,9 +329,9 @@ StrCmp (
   PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator,
   then ASSERT().
 
-  @param  FirstString   Pointer to a Null-terminated Unicode string.
-  @param  SecondString  Pointer to a Null-terminated Unicode string.
-  @param  Length        Maximum number of Unicode characters to compare.
+  @param  FirstString   The pointer to a Null-terminated Unicode string.
+  @param  SecondString  The pointer to a Null-terminated Unicode string.
+  @param  Length        The maximum number of Unicode characters to compare.
 
   @retval 0      FirstString is identical to SecondString.
   @return others FirstString is not identical to SecondString.
@@ -362,18 +362,18 @@ StrnCmp (
   If Source is not aligned on a 16-bit boundary, then ASSERT().
   If Source and Destination overlap, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and Destination contains more
-  than PcdMaximumUnicodeStringLength Unicode characters not including the
+  than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and Source contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
+  PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination
   and Source results in a Unicode string with more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the
+  PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
+  @param  Destination The pointer to a Null-terminated Unicode string.
+  @param  Source      The pointer to a Null-terminated Unicode string.
 
   @return Destination.
 
@@ -416,9 +416,9 @@ StrCat (
   and Source results in a Unicode string with more than PcdMaximumUnicodeStringLength
   Unicode characters, not including the Null-terminator, then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated Unicode string.
-  @param  Source      Pointer to a Null-terminated Unicode string.
-  @param  Length      Maximum number of Unicode characters to concatenate from
+  @param  Destination The pointer to a Null-terminated Unicode string.
+  @param  Source      The pointer to a Null-terminated Unicode string.
+  @param  Length      The maximum number of Unicode characters to concatenate from
                       Source.
 
   @return Destination.
@@ -439,8 +439,7 @@ StrnCat (
   This function scans the contents of the Null-terminated Unicode string
   specified by String and returns the first occurrence of SearchString.
   If SearchString is not found in String, then NULL is returned.  If
-  the length of SearchString is zero, then String is
-  returned.
+  the length of SearchString is zero, then String is returned.
 
   If String is NULL, then ASSERT().
   If String is not aligned on a 16-bit boundary, then ASSERT().
@@ -449,10 +448,10 @@ StrnCat (
 
   If PcdMaximumUnicodeStringLength is not zero, and SearchString
   or String contains more than PcdMaximumUnicodeStringLength Unicode
-  characters not including the Null-terminator, then ASSERT().
+  characters, not including the Null-terminator, then ASSERT().
 
-  @param  String          Pointer to a Null-terminated Unicode string.
-  @param  SearchString    Pointer to a Null-terminated Unicode string to search for.
+  @param  String          The pointer to a Null-terminated Unicode string.
+  @param  SearchString    The pointer to a Null-terminated Unicode string to search for.
 
   @retval NULL            If the SearchString does not appear in String.
   @return others          If there is a match.
@@ -494,7 +493,7 @@ StrStr (
   more than PcdMaximumUnicodeStringLength Unicode characters not including
   the Null-terminator, then ASSERT().
 
-  @param  String      Pointer to a Null-terminated Unicode string.
+  @param  String      The pointer to a Null-terminated Unicode string.
 
   @retval Value translated from String.
 
@@ -534,7 +533,7 @@ StrDecimalToUintn (
   more than PcdMaximumUnicodeStringLength Unicode characters not including
   the Null-terminator, then ASSERT().
 
-  @param  String          Pointer to a Null-terminated Unicode string.
+  @param  String          The pointer to a Null-terminated Unicode string.
 
   @retval Value translated from String.
 
@@ -561,8 +560,8 @@ StrDecimalToUint64 (
   The function will ignore the pad space, which includes spaces or tab characters,
   before [zeros], [x] or [hexadecimal digit]. The running zero before [x] or
   [hexadecimal digit] will be ignored. Then, the decoding starts after [x] or the
-  first valid hexadecimal digit. Then, the function stops at the first character that is
-  a not a valid hexadecimal character or NULL, whichever one comes first.
+  first valid hexadecimal digit. Then, the function stops at the first character 
+  that is a not a valid hexadecimal character or NULL, whichever one comes first.
 
   If String is NULL, then ASSERT().
   If String is not aligned in a 16-bit boundary, then ASSERT().
@@ -576,7 +575,7 @@ StrDecimalToUint64 (
   PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String          Pointer to a Null-terminated Unicode string.
+  @param  String          The pointer to a Null-terminated Unicode string.
 
   @retval Value translated from String.
 
@@ -618,7 +617,7 @@ StrHexToUintn (
   PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String          Pointer to a Null-terminated Unicode string.
+  @param  String          The pointer to a Null-terminated Unicode string.
 
   @retval Value translated from String.
 
@@ -653,8 +652,8 @@ StrHexToUint64 (
   than PcdMaximumAsciiStringLength Unicode characters not including the
   Null-terminator, then ASSERT().
 
-  @param  Source        Pointer to a Null-terminated Unicode string.
-  @param  Destination   Pointer to a Null-terminated ASCII string.
+  @param  Source        The pointer to a Null-terminated Unicode string.
+  @param  Destination   The pointer to a Null-terminated ASCII string.
 
   @return Destination.
 
@@ -682,8 +681,8 @@ UnicodeStrToAsciiStr (
   PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
   then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
+  @param  Destination The pointer to a Null-terminated ASCII string.
+  @param  Source      The pointer to a Null-terminated ASCII string.
 
   @return Destination
 
@@ -716,9 +715,9 @@ AsciiStrCpy (
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,
   then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-  @param  Length      Maximum number of ASCII characters to copy.
+  @param  Destination The pointer to a Null-terminated ASCII string.
+  @param  Source      The pointer to a Null-terminated ASCII string.
+  @param  Length      The maximum number of ASCII characters to copy.
 
   @return Destination
 
@@ -744,7 +743,7 @@ AsciiStrnCpy (
   PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String  Pointer to a Null-terminated ASCII string.
+  @param  String  The pointer to a Null-terminated ASCII string.
 
   @return The length of String.
 
@@ -768,7 +767,7 @@ AsciiStrLen (
   PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String  Pointer to a Null-terminated ASCII string.
+  @param  String  The pointer to a Null-terminated ASCII string.
 
   @return The size of String.
 
@@ -799,8 +798,8 @@ AsciiStrSize (
   than PcdMaximumAsciiStringLength ASCII characters not including the
   Null-terminator, then ASSERT().
 
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
+  @param  FirstString   The pointer to a Null-terminated ASCII string.
+  @param  SecondString  The pointer to a Null-terminated ASCII string.
 
   @retval ==0      FirstString is identical to SecondString.
   @retval !=0      FirstString is not identical to SecondString.
@@ -834,8 +833,8 @@ AsciiStrCmp (
   than PcdMaximumAsciiStringLength ASCII characters not including the
   Null-terminator, then ASSERT().
 
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
+  @param  FirstString   The pointer to a Null-terminated ASCII string.
+  @param  SecondString  The pointer to a Null-terminated ASCII string.
 
   @retval ==0    FirstString is identical to SecondString using case insensitive
                  comparisons.
@@ -873,9 +872,9 @@ AsciiStriCmp (
   PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator,
   then ASSERT().
 
-  @param  FirstString   Pointer to a Null-terminated ASCII string.
-  @param  SecondString  Pointer to a Null-terminated ASCII string.
-  @param  Length        Maximum number of ASCII characters for compare.
+  @param  FirstString   The pointer to a Null-terminated ASCII string.
+  @param  SecondString  The pointer to a Null-terminated ASCII string.
+  @param  Length        The maximum number of ASCII characters for compare.
   
   @retval ==0       FirstString is identical to SecondString.
   @retval !=0       FirstString is not identical to SecondString.
@@ -911,8 +910,8 @@ AsciiStrnCmp (
   Source results in a ASCII string with more than PcdMaximumAsciiStringLength
   ASCII characters, then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
+  @param  Destination The pointer to a Null-terminated ASCII string.
+  @param  Source      The pointer to a Null-terminated ASCII string.
 
   @return Destination
 
@@ -953,9 +952,9 @@ AsciiStrCat (
   Source results in a ASCII string with more than PcdMaximumAsciiStringLength
   ASCII characters, not including the Null-terminator, then ASSERT().
 
-  @param  Destination Pointer to a Null-terminated ASCII string.
-  @param  Source      Pointer to a Null-terminated ASCII string.
-  @param  Length      Maximum number of ASCII characters to concatenate from
+  @param  Destination The pointer to a Null-terminated ASCII string.
+  @param  Source      The pointer to a Null-terminated ASCII string.
+  @param  Length      The maximum number of ASCII characters to concatenate from
                       Source.
 
   @return Destination
@@ -986,8 +985,8 @@ AsciiStrnCat (
   String contains more than PcdMaximumAsciiStringLength Unicode characters
   not including the Null-terminator, then ASSERT().
 
-  @param  String          Pointer to a Null-terminated ASCII string.
-  @param  SearchString    Pointer to a Null-terminated ASCII string to search for.
+  @param  String          The pointer to a Null-terminated ASCII string.
+  @param  SearchString    The pointer to a Null-terminated ASCII string to search for.
 
   @retval NULL            If the SearchString does not appear in String.
   @retval others          If there is a match return the first occurrence of SearchingString.
@@ -1027,9 +1026,9 @@ AsciiStrStr (
   PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String          Pointer to a Null-terminated ASCII string.
+  @param  String          The pointer to a Null-terminated ASCII string.
 
-  @retval Value translated from String.
+  @retval The value translated from String.
 
 **/
 UINTN
@@ -1064,7 +1063,7 @@ AsciiStrDecimalToUintn (
   PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator,
   then ASSERT().
 
-  @param  String          Pointer to a Null-terminated ASCII string.
+  @param  String          The pointer to a Null-terminated ASCII string.
 
   @retval Value translated from String.
 
@@ -1105,7 +1104,7 @@ AsciiStrDecimalToUint64 (
   and String contains more than PcdMaximumAsciiStringLength ASCII characters not including
   the Null-terminator, then ASSERT().
 
-  @param  String          Pointer to a Null-terminated ASCII string.
+  @param  String          The pointer to a Null-terminated ASCII string.
 
   @retval Value translated from String.
 
@@ -1146,7 +1145,7 @@ AsciiStrHexToUintn (
   and String contains more than PcdMaximumAsciiStringLength ASCII characters not including
   the Null-terminator, then ASSERT().
 
-  @param  String          Pointer to a Null-terminated ASCII string.
+  @param  String          The pointer to a Null-terminated ASCII string.
 
   @retval Value translated from String.
 
@@ -1179,8 +1178,8 @@ AsciiStrHexToUint64 (
   PcdMaximumUnicodeStringLength ASCII characters not including the
   Null-terminator, then ASSERT().
 
-  @param  Source        Pointer to a Null-terminated ASCII string.
-  @param  Destination   Pointer to a Null-terminated Unicode string.
+  @param  Source        The pointer to a Null-terminated ASCII string.
+  @param  Destination   The pointer to a Null-terminated Unicode string.
 
   @return Destination.
 
@@ -1383,7 +1382,7 @@ GetFirstNode (
   @param  List  A pointer to the head node of a doubly linked list.
   @param  Node  A pointer to a node in the doubly linked list.
 
-  @return Pointer to the next node if one exists. Otherwise List is returned.
+  @return The pointer to the next node if one exists. Otherwise List is returned.
 
 **/
 LIST_ENTRY *
@@ -1412,7 +1411,7 @@ GetNextNode (
   @param  List  A pointer to the head node of a doubly linked list.
   @param  Node  A pointer to a node in the doubly linked list.
  
-  @return Pointer to the previous node if one exists. Otherwise List is returned.
+  @return The pointer to the previous node if one exists. Otherwise List is returned.
  
 **/
 LIST_ENTRY *
@@ -1868,7 +1867,7 @@ GetPowerOfTwo64 (
 
 
 /**
-  Switches the endianess of a 16-bit integer.
+  Switches the endianness of a 16-bit integer.
 
   This function swaps the bytes in a 16-bit unsigned value to switch the value
   from little endian to big endian or vice versa. The byte swapped value is
@@ -1887,7 +1886,7 @@ SwapBytes16 (
 
 
 /**
-  Switches the endianess of a 32-bit integer.
+  Switches the endianness of a 32-bit integer.
 
   This function swaps the bytes in a 32-bit unsigned value to switch the value
   from little endian to big endian or vice versa. The byte swapped value is
@@ -1906,7 +1905,7 @@ SwapBytes32 (
 
 
 /**
-  Switches the endianess of a 64-bit integer.
+  Switches the endianness of a 64-bit integer.
 
   This function swaps the bytes in a 64-bit unsigned value to switch the value
   from little endian to big endian or vice versa. The byte swapped value is
@@ -1957,7 +1956,7 @@ MultU64x32 (
   @param  Multiplicand  A 64-bit unsigned value.
   @param  Multiplier    A 64-bit unsigned value.
 
-  @return Multiplicand * Multiplier
+  @return Multiplicand * Multiplier.
 
 **/
 UINT64
@@ -2003,7 +2002,7 @@ MultS64x64 (
   @param  Dividend  A 64-bit unsigned value.
   @param  Divisor   A 32-bit unsigned value.
 
-  @return Dividend / Divisor
+  @return Dividend / Divisor.
 
 **/
 UINT64
@@ -2027,7 +2026,7 @@ DivU64x32 (
   @param  Dividend  A 64-bit unsigned value.
   @param  Divisor   A 32-bit unsigned value.
 
-  @return Dividend % Divisor
+  @return Dividend % Divisor.
 
 **/
 UINT32
@@ -2054,7 +2053,7 @@ ModU64x32 (
   @param  Remainder A pointer to a 32-bit unsigned value. This parameter is
                     optional and may be NULL.
 
-  @return Dividend / Divisor
+  @return Dividend / Divisor.
 
 **/
 UINT64
@@ -2082,7 +2081,7 @@ DivU64x32Remainder (
   @param  Remainder A pointer to a 64-bit unsigned value. This parameter is
                     optional and may be NULL.
 
-  @return Dividend / Divisor
+  @return Dividend / Divisor.
 
 **/
 UINT64
@@ -2114,7 +2113,7 @@ DivU64x64Remainder (
   @param  Remainder A pointer to a 64-bit signed value. This parameter is
                     optional and may be NULL.
 
-  @return Dividend / Divisor
+  @return Dividend / Divisor.
 
 **/
 INT64
@@ -2134,7 +2133,7 @@ DivS64x64Remainder (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 16-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 16-bit value that may be unaligned.
 
   @return The 16-bit value read from Buffer.
 
@@ -2155,7 +2154,7 @@ ReadUnaligned16 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 16-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 16-bit value that may be unaligned.
   @param  Value   16-bit value to write to Buffer.
 
   @return The 16-bit value to write to Buffer.
@@ -2177,7 +2176,7 @@ WriteUnaligned16 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 24-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 24-bit value that may be unaligned.
 
   @return The 24-bit value read from Buffer.
 
@@ -2198,7 +2197,7 @@ ReadUnaligned24 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 24-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 24-bit value that may be unaligned.
   @param  Value   24-bit value to write to Buffer.
 
   @return The 24-bit value to write to Buffer.
@@ -2220,7 +2219,7 @@ WriteUnaligned24 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 32-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 32-bit value that may be unaligned.
 
   @return The 32-bit value read from Buffer.
 
@@ -2241,7 +2240,7 @@ ReadUnaligned32 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 32-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 32-bit value that may be unaligned.
   @param  Value   32-bit value to write to Buffer.
 
   @return The 32-bit value to write to Buffer.
@@ -2263,7 +2262,7 @@ WriteUnaligned32 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 64-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 64-bit value that may be unaligned.
 
   @return The 64-bit value read from Buffer.
 
@@ -2284,7 +2283,7 @@ ReadUnaligned64 (
 
   If the Buffer is NULL, then ASSERT().
 
-  @param  Buffer  Pointer to a 64-bit value that may be unaligned.
+  @param  Buffer  The pointer to a 64-bit value that may be unaligned.
   @param  Value   64-bit value to write to Buffer.
 
   @return The 64-bit value to write to Buffer.
@@ -2704,7 +2703,7 @@ BitFieldWrite32 (
                     Range 0..31.
   @param  EndBit    The ordinal of the most significant bit in the bit field.
                     Range 0..31.
-  @param  OrData    The value to OR with the read value from the value
+  @param  OrData    The value to OR with the read value from the value.
 
   @return The new 32-bit value.
 
@@ -2965,7 +2964,7 @@ BitFieldAndThenOr64 (
   If Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the sum operation.
+  @param  Buffer      The pointer to the buffer to carry out the sum operation.
   @param  Length      The size, in bytes, of Buffer.
 
   @return Sum         The sum of Buffer with carry bits dropped during additions.
@@ -2991,10 +2990,10 @@ CalculateSum8 (
   If Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the checksum operation.
+  @param  Buffer      The pointer to the buffer to carry out the checksum operation.
   @param  Length      The size, in bytes, of Buffer.
 
-  @return Checksum    The 2's complement checksum of Buffer.
+  @return Checksum    The two's complement checksum of Buffer.
 
 **/
 UINT8
@@ -3018,7 +3017,7 @@ CalculateCheckSum8 (
   If Length is not aligned on a 16-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the sum operation.
+  @param  Buffer      The pointer to the buffer to carry out the sum operation.
   @param  Length      The size, in bytes, of Buffer.
 
   @return Sum         The sum of Buffer with carry bits dropped during additions.
@@ -3046,10 +3045,10 @@ CalculateSum16 (
   If Length is not aligned on a 16-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the checksum operation.
+  @param  Buffer      The pointer to the buffer to carry out the checksum operation.
   @param  Length      The size, in bytes, of Buffer.
 
-  @return Checksum    The 2's complement checksum of Buffer.
+  @return Checksum    The two's complement checksum of Buffer.
 
 **/
 UINT16
@@ -3073,7 +3072,7 @@ CalculateCheckSum16 (
   If Length is not aligned on a 32-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the sum operation.
+  @param  Buffer      The pointer to the buffer to carry out the sum operation.
   @param  Length      The size, in bytes, of Buffer.
 
   @return Sum         The sum of Buffer with carry bits dropped during additions.
@@ -3101,10 +3100,10 @@ CalculateSum32 (
   If Length is not aligned on a 32-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the checksum operation.
+  @param  Buffer      The pointer to the buffer to carry out the checksum operation.
   @param  Length      The size, in bytes, of Buffer.
 
-  @return Checksum    The 2's complement checksum of Buffer.
+  @return Checksum    The two's complement checksum of Buffer.
 
 **/
 UINT32
@@ -3128,7 +3127,7 @@ CalculateCheckSum32 (
   If Length is not aligned on a 64-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the sum operation.
+  @param  Buffer      The pointer to the buffer to carry out the sum operation.
   @param  Length      The size, in bytes, of Buffer.
 
   @return Sum         The sum of Buffer with carry bits dropped during additions.
@@ -3156,10 +3155,10 @@ CalculateSum64 (
   If Length is not aligned on a 64-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the buffer to carry out the checksum operation.
+  @param  Buffer      The pointer to the buffer to carry out the checksum operation.
   @param  Length      The size, in bytes, of Buffer.
 
-  @return Checksum    The 2's complement checksum of Buffer.
+  @return Checksum    The two's complement checksum of Buffer.
 
 **/
 UINT64
@@ -3307,7 +3306,7 @@ EnableDisableInterrupts (
 /**
   Retrieves the current CPU interrupt state.
 
-  Returns TRUE is interrupts are currently enabled. Otherwise
+  Returns TRUE if interrupts are currently enabled. Otherwise
   returns FALSE.
 
   @retval TRUE  CPU interrupts are enabled.
@@ -3378,10 +3377,10 @@ CpuPause (
                       function.
   @param  NewStack    A pointer to the new stack to use for the EntryPoint
                       function.
-  @param  ...         This variable argument list is ignored for IA-32, x64, and EBC architectures.  
-                      For Itanium processors, this variable argument list is expected to contain 
-                      a single parameter of type VOID * that specifies the new backing 
-                      store pointer.
+  @param  ...         This variable argument list is ignored for IA-32, x64, and 
+                      EBC architectures.  For Itanium processors, this variable 
+                      argument list is expected to contain a single parameter of 
+                      type VOID * that specifies the new backing store pointer.
 
 
 **/
@@ -3460,8 +3459,8 @@ AsmFlushCacheRange (
 
 
 /**
-  Executes a FC instruction
-  Executes a FC instruction on the cache line specified by Address.
+  Executes an FC instruction.
+  Executes an FC instruction on the cache line specified by Address.
   The cache line size affected is at least 32-bytes (aligned on a 32-byte boundary).
   An implementation may flush a larger region.  This function is only available on Itanium processors.
 
@@ -3478,14 +3477,14 @@ AsmFc (
 
 
 /**
-  Executes a FC.I instruction.
-  Executes a FC.I instruction on the cache line specified by Address.
+  Executes an FC.I instruction.
+  Executes an FC.I instruction on the cache line specified by Address.
   The cache line size affected is at least 32-bytes (aligned on a 32-byte boundary).
   An implementation may flush a larger region.  This function is only available on Itanium processors.
 
   @param Address    The Address of cache line to be flushed.
 
-  @return The address of FC.I instruction executed.
+  @return The address of the FC.I instruction executed.
 
 **/
 UINT64
@@ -4351,7 +4350,7 @@ AsmWriteLrr1 (
   
   The Instruction Breakpoint Registers are used in pairs.  The even numbered
   registers contain breakpoint addresses, and the odd numbered registers contain
-  breakpoint mask conditions.  At least 4 instruction registers pairs are implemented
+  breakpoint mask conditions.  At least four instruction registers pairs are implemented
   on all processor models.   Implemented registers are contiguous starting with
   register 0.  No parameter checking is performed on Index, and if the Index value
   is beyond the implemented IBR register range, a Reserved Register/Field fault may
@@ -4376,7 +4375,7 @@ AsmReadIbr (
 
   The Data Breakpoint Registers are used in pairs.  The even numbered registers
   contain breakpoint addresses, and odd numbered registers contain breakpoint
-  mask conditions.  At least 4 data registers pairs are implemented on all processor
+  mask conditions.  At least four data registers pairs are implemented on all processor
   models.  Implemented registers are contiguous starting with register 0.
   No parameter checking is performed on Index.  If the Index value is beyond
   the implemented DBR register range, a Reserved Register/Field fault may occur.
@@ -4399,8 +4398,8 @@ AsmReadDbr (
 /**
   Reads the current value of Performance Monitor Configuration Register (PMC).
 
-  All processor implementations provide at least 4 performance counters
-  (PMC/PMD [4]...PMC/PMD [7] pairs), and 4 performance monitor counter overflow
+  All processor implementations provide at least four performance counters
+  (PMC/PMD [4]...PMC/PMD [7] pairs), and four performance monitor counter overflow
   status registers (PMC [0]... PMC [3]).  Processor implementations may provide
   additional implementation-dependent PMC and PMD to increase the number of
   'generic' performance counters (PMC/PMD pairs).  The remainder of PMC and PMD
@@ -4453,7 +4452,7 @@ AsmReadPmd (
   Writes current value of Instruction Breakpoint Register specified by Index.
   The Instruction Breakpoint Registers are used in pairs.  The even numbered
   registers contain breakpoint addresses, and odd numbered registers contain
-  breakpoint mask conditions.  At least 4 instruction registers pairs are implemented
+  breakpoint mask conditions.  At least four instruction registers pairs are implemented
   on all processor models.  Implemented registers are contiguous starting with
   register 0.  No parameter checking is performed on Index.  If the Index value
   is beyond the implemented IBR register range, a Reserved Register/Field fault may
@@ -4481,7 +4480,7 @@ AsmWriteIbr (
   Writes current value of Data Breakpoint Register specified by Index.
   The Data Breakpoint Registers are used in pairs.  The even numbered registers
   contain breakpoint addresses, and odd numbered registers contain breakpoint
-  mask conditions.  At least 4 data registers pairs are implemented on all processor
+  mask conditions.  At least four data registers pairs are implemented on all processor
   models.  Implemented registers are contiguous starting with register 0.  No parameter
   checking is performed on Index.  If the Index value is beyond the implemented
   DBR register range, a Reserved Register/Field fault may occur.  The caller must
@@ -4507,8 +4506,8 @@ AsmWriteDbr (
   Writes the current value of 64-bit Performance Monitor Configuration Register (PMC).
 
   Writes current value of Performance Monitor Configuration Register specified by Index.
-  All processor implementations provide at least 4 performance counters
-  (PMC/PMD [4]...PMC/PMD [7] pairs), and 4 performance monitor counter overflow status
+  All processor implementations provide at least four performance counters
+  (PMC/PMD [4]...PMC/PMD [7] pairs), and four performance monitor counter overflow status
   registers (PMC [0]... PMC [3]).  Processor implementations may provide additional
   implementation-dependent PMC and PMD to increase the number of 'generic' performance
   counters (PMC/PMD pairs).  The remainder of PMC and PMD register set is implementation
@@ -4534,8 +4533,8 @@ AsmWritePmc (
   Writes the current value of 64-bit Performance Monitor Data Register (PMD).
 
   Writes current value of Performance Monitor Data Register specified by Index.
-  All processor implementations provide at least 4 performance counters
-  (PMC/PMD [4]...PMC/PMD [7] pairs), and 4 performance monitor counter overflow
+  All processor implementations provide at least four performance counters
+  (PMC/PMD [4]...PMC/PMD [7] pairs), and four performance monitor counter overflow
   status registers (PMC [0]... PMC [3]).  Processor implementations may provide
   additional implementation-dependent PMC and PMD to increase the number of 'generic'
   performance counters (PMC/PMD pairs).  The remainder of PMC and PMD register set
@@ -4609,7 +4608,7 @@ AsmReadSp (
 
 
 ///
-/// Valid Index value for AsmReadControlRegister()
+/// Valid Index value for AsmReadControlRegister().
 ///
 #define IPF_CONTROL_REGISTER_DCR   0
 #define IPF_CONTROL_REGISTER_ITM   1
@@ -4641,9 +4640,10 @@ AsmReadSp (
 /**
   Reads a 64-bit control register.
 
-  Reads and returns the control register specified by Index. The valid Index valued are defined
-  above in "Related Definitions".
-  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only available on Itanium processors.
+  Reads and returns the control register specified by Index. The valid Index valued 
+  are defined above in "Related Definitions".
+  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only 
+  available on Itanium processors.
 
   @param  Index                     The index of the control register to read.
 
@@ -4658,7 +4658,7 @@ AsmReadControlRegister (
 
 
 ///
-/// Valid Index value for AsmReadApplicationRegister()
+/// Valid Index value for AsmReadApplicationRegister().
 ///
 #define IPF_APPLICATION_REGISTER_K0        0
 #define IPF_APPLICATION_REGISTER_K1        1
@@ -4691,9 +4691,10 @@ AsmReadControlRegister (
 /**
   Reads a 64-bit application register.
 
-  Reads and returns the application register specified by Index. The valid Index valued are defined
-  above in "Related Definitions".
-  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only available on Itanium processors.
+  Reads and returns the application register specified by Index. The valid Index 
+  valued are defined above in "Related Definitions".
+  If Index is invalid then 0xFFFFFFFFFFFFFFFF is returned.  This function is only 
+  available on Itanium processors.
 
   @param  Index                     The index of the application register to read.
 
@@ -4817,119 +4818,119 @@ AsmPalCall (
 
 #if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)
 ///
-/// IA32 and x64 Specific Functions
-/// Byte packed structure for 16-bit Real Mode EFLAGS
+/// IA32 and x64 Specific Functions.
+/// Byte packed structure for 16-bit Real Mode EFLAGS.
 ///
 typedef union {
   struct {
-    UINT32  CF:1;           ///< Carry Flag
-    UINT32  Reserved_0:1;   ///< Reserved
-    UINT32  PF:1;           ///< Parity Flag
-    UINT32  Reserved_1:1;   ///< Reserved
-    UINT32  AF:1;           ///< Auxiliary Carry Flag
-    UINT32  Reserved_2:1;   ///< Reserved
-    UINT32  ZF:1;           ///< Zero Flag
-    UINT32  SF:1;           ///< Sign Flag
-    UINT32  TF:1;           ///< Trap Flag
-    UINT32  IF:1;           ///< Interrupt Enable Flag
-    UINT32  DF:1;           ///< Direction Flag
-    UINT32  OF:1;           ///< Overflow Flag
-    UINT32  IOPL:2;         ///< I/O Privilege Level
-    UINT32  NT:1;           ///< Nested Task
-    UINT32  Reserved_3:1;   ///< Reserved
+    UINT32  CF:1;           ///< Carry Flag.
+    UINT32  Reserved_0:1;   ///< Reserved.
+    UINT32  PF:1;           ///< Parity Flag.
+    UINT32  Reserved_1:1;   ///< Reserved.
+    UINT32  AF:1;           ///< Auxiliary Carry Flag.
+    UINT32  Reserved_2:1;   ///< Reserved.
+    UINT32  ZF:1;           ///< Zero Flag.
+    UINT32  SF:1;           ///< Sign Flag.
+    UINT32  TF:1;           ///< Trap Flag.
+    UINT32  IF:1;           ///< Interrupt Enable Flag.
+    UINT32  DF:1;           ///< Direction Flag.
+    UINT32  OF:1;           ///< Overflow Flag.
+    UINT32  IOPL:2;         ///< I/O Privilege Level.
+    UINT32  NT:1;           ///< Nested Task.
+    UINT32  Reserved_3:1;   ///< Reserved.
   } Bits;
   UINT16    Uint16;
 } IA32_FLAGS16;
 
 ///
-/// Byte packed structure for EFLAGS/RFLAGS
-/// 32-bits on IA-32
-/// 64-bits on x64.  The upper 32-bits on x64 are reserved
+/// Byte packed structure for EFLAGS/RFLAGS.
+/// 32-bits on IA-32.
+/// 64-bits on x64.  The upper 32-bits on x64 are reserved.
 ///
 typedef union {
   struct {
-    UINT32  CF:1;           ///< Carry Flag
-    UINT32  Reserved_0:1;   ///< Reserved
-    UINT32  PF:1;           ///< Parity Flag
-    UINT32  Reserved_1:1;   ///< Reserved
-    UINT32  AF:1;           ///< Auxiliary Carry Flag
-    UINT32  Reserved_2:1;   ///< Reserved
-    UINT32  ZF:1;           ///< Zero Flag
-    UINT32  SF:1;           ///< Sign Flag
-    UINT32  TF:1;           ///< Trap Flag
-    UINT32  IF:1;           ///< Interrupt Enable Flag
-    UINT32  DF:1;           ///< Direction Flag
-    UINT32  OF:1;           ///< Overflow Flag
-    UINT32  IOPL:2;         ///< I/O Privilege Level
-    UINT32  NT:1;           ///< Nested Task
-    UINT32  Reserved_3:1;   ///< Reserved
-    UINT32  RF:1;           ///< Resume Flag
-    UINT32  VM:1;           ///< Virtual 8086 Mode
-    UINT32  AC:1;           ///< Alignment Check
-    UINT32  VIF:1;          ///< Virtual Interrupt Flag
-    UINT32  VIP:1;          ///< Virtual Interrupt Pending
-    UINT32  ID:1;           ///< ID Flag
-    UINT32  Reserved_4:10;  ///< Reserved
+    UINT32  CF:1;           ///< Carry Flag.
+    UINT32  Reserved_0:1;   ///< Reserved.
+    UINT32  PF:1;           ///< Parity Flag.
+    UINT32  Reserved_1:1;   ///< Reserved.
+    UINT32  AF:1;           ///< Auxiliary Carry Flag.
+    UINT32  Reserved_2:1;   ///< Reserved.
+    UINT32  ZF:1;           ///< Zero Flag.
+    UINT32  SF:1;           ///< Sign Flag.
+    UINT32  TF:1;           ///< Trap Flag.
+    UINT32  IF:1;           ///< Interrupt Enable Flag.
+    UINT32  DF:1;           ///< Direction Flag.
+    UINT32  OF:1;           ///< Overflow Flag.
+    UINT32  IOPL:2;         ///< I/O Privilege Level.
+    UINT32  NT:1;           ///< Nested Task.
+    UINT32  Reserved_3:1;   ///< Reserved.
+    UINT32  RF:1;           ///< Resume Flag.
+    UINT32  VM:1;           ///< Virtual 8086 Mode.
+    UINT32  AC:1;           ///< Alignment Check.
+    UINT32  VIF:1;          ///< Virtual Interrupt Flag.
+    UINT32  VIP:1;          ///< Virtual Interrupt Pending.
+    UINT32  ID:1;           ///< ID Flag.
+    UINT32  Reserved_4:10;  ///< Reserved.
   } Bits;
   UINTN     UintN;
 } IA32_EFLAGS32;
 
 ///
-/// Byte packed structure for Control Register 0 (CR0)
-/// 32-bits on IA-32
-/// 64-bits on x64.  The upper 32-bits on x64 are reserved
+/// Byte packed structure for Control Register 0 (CR0).
+/// 32-bits on IA-32.
+/// 64-bits on x64.  The upper 32-bits on x64 are reserved.
 ///
 typedef union {
   struct {
-    UINT32  PE:1;           ///< Protection Enable
-    UINT32  MP:1;           ///< Monitor Coprocessor
-    UINT32  EM:1;           ///< Emulation
-    UINT32  TS:1;           ///< Task Switched
-    UINT32  ET:1;           ///< Extension Type
-    UINT32  NE:1;           ///< Numeric Error
-    UINT32  Reserved_0:10;  ///< Reserved
-    UINT32  WP:1;           ///< Write Protect
-    UINT32  Reserved_1:1;   ///< Reserved
-    UINT32  AM:1;           ///< Alignment Mask
-    UINT32  Reserved_2:10;  ///< Reserved
-    UINT32  NW:1;           ///< Mot Write-through
-    UINT32  CD:1;           ///< Cache Disable
-    UINT32  PG:1;           ///< Paging
+    UINT32  PE:1;           ///< Protection Enable.
+    UINT32  MP:1;           ///< Monitor Coprocessor.
+    UINT32  EM:1;           ///< Emulation.
+    UINT32  TS:1;           ///< Task Switched.
+    UINT32  ET:1;           ///< Extension Type.
+    UINT32  NE:1;           ///< Numeric Error.
+    UINT32  Reserved_0:10;  ///< Reserved.
+    UINT32  WP:1;           ///< Write Protect.
+    UINT32  Reserved_1:1;   ///< Reserved.
+    UINT32  AM:1;           ///< Alignment Mask.
+    UINT32  Reserved_2:10;  ///< Reserved.
+    UINT32  NW:1;           ///< Mot Write-through.
+    UINT32  CD:1;           ///< Cache Disable.
+    UINT32  PG:1;           ///< Paging.
   } Bits;
   UINTN     UintN;
 } IA32_CR0;
 
 ///
-/// Byte packed structure for Control Register 4 (CR4)
-/// 32-bits on IA-32
-/// 64-bits on x64.  The upper 32-bits on x64 are reserved
+/// Byte packed structure for Control Register 4 (CR4).
+/// 32-bits on IA-32.
+/// 64-bits on x64.  The upper 32-bits on x64 are reserved.
 ///
 typedef union {
   struct {
-    UINT32  VME:1;          ///< Virtual-8086 Mode Extensions
-    UINT32  PVI:1;          ///< Protected-Mode Virtual Interrupts
-    UINT32  TSD:1;          ///< Time Stamp Disable
-    UINT32  DE:1;           ///< Debugging Extensions
-    UINT32  PSE:1;          ///< Page Size Extensions
-    UINT32  PAE:1;          ///< Physical Address Extension
-    UINT32  MCE:1;          ///< Machine Check Enable
-    UINT32  PGE:1;          ///< Page Global Enable
+    UINT32  VME:1;          ///< Virtual-8086 Mode Extensions.
+    UINT32  PVI:1;          ///< Protected-Mode Virtual Interrupts.
+    UINT32  TSD:1;          ///< Time Stamp Disable.
+    UINT32  DE:1;           ///< Debugging Extensions.
+    UINT32  PSE:1;          ///< Page Size Extensions.
+    UINT32  PAE:1;          ///< Physical Address Extension.
+    UINT32  MCE:1;          ///< Machine Check Enable.
+    UINT32  PGE:1;          ///< Page Global Enable.
     UINT32  PCE:1;          ///< Performance Monitoring Counter
-                            ///< Enable
+                            ///< Enable.
     UINT32  OSFXSR:1;       ///< Operating System Support for
                             ///< FXSAVE and FXRSTOR instructions
     UINT32  OSXMMEXCPT:1;   ///< Operating System Support for
                             ///< Unmasked SIMD Floating Point
-                            ///< Exceptions
-    UINT32  Reserved_0:2;   ///< Reserved
+                            ///< Exceptions.
+    UINT32  Reserved_0:2;   ///< Reserved.
     UINT32  VMXE:1;         ///< VMX Enable
-    UINT32  Reserved_1:18;  ///< Reserved
+    UINT32  Reserved_1:18;  ///< Reserved.
   } Bits;
   UINTN     UintN;
 } IA32_CR4;
 
 ///
-/// Byte packed structure for an IDTR, GDTR, LDTR descriptor
+/// Byte packed structure for an IDTR, GDTR, LDTR descriptor.
 ///
 #pragma pack (1)
 typedef struct {
@@ -4947,15 +4948,15 @@ typedef struct {
 
 #if defined (MDE_CPU_IA32)
 ///
-/// Byte packed structure for an IA-32 Interrupt Gate Descriptor
+/// Byte packed structure for an IA-32 Interrupt Gate Descriptor.
 ///
 typedef union {
   struct {
-    UINT32  OffsetLow:16;   ///< Offset bits 15..0
-    UINT32  Selector:16;    ///< Selector
-    UINT32  Reserved_0:8;   ///< Reserved
-    UINT32  GateType:8;     ///< Gate Type.  See #defines above
-    UINT32  OffsetHigh:16;  ///< Offset bits 31..16
+    UINT32  OffsetLow:16;   ///< Offset bits 15..0.
+    UINT32  Selector:16;    ///< Selector.
+    UINT32  Reserved_0:8;   ///< Reserved.
+    UINT32  GateType:8;     ///< Gate Type.  See #defines above.
+    UINT32  OffsetHigh:16;  ///< Offset bits 31..16.
   } Bits;
   UINT64  Uint64;
 } IA32_IDT_GATE_DESCRIPTOR;
@@ -4964,17 +4965,17 @@ typedef union {
 
 #if defined (MDE_CPU_X64)
 ///
-/// Byte packed structure for an x64 Interrupt Gate Descriptor
+/// Byte packed structure for an x64 Interrupt Gate Descriptor.
 ///
 typedef union {
   struct {
-    UINT32  OffsetLow:16;   ///< Offset bits 15..0
-    UINT32  Selector:16;    ///< Selector
-    UINT32  Reserved_0:8;   ///< Reserved
-    UINT32  GateType:8;     ///< Gate Type.  See #defines above
-    UINT32  OffsetHigh:16;  ///< Offset bits 31..16
-    UINT32  OffsetUpper:32; ///< Offset bits 63..32
-    UINT32  Reserved_1:32;  ///< Reserved
+    UINT32  OffsetLow:16;   ///< Offset bits 15..0.
+    UINT32  Selector:16;    ///< Selector.
+    UINT32  Reserved_0:8;   ///< Reserved.
+    UINT32  GateType:8;     ///< Gate Type.  See #defines above.
+    UINT32  OffsetHigh:16;  ///< Offset bits 31..16.
+    UINT32  OffsetUpper:32; ///< Offset bits 63..32.
+    UINT32  Reserved_1:32;  ///< Reserved.
   } Bits;
   struct {
     UINT64  Uint64;
@@ -4985,14 +4986,14 @@ typedef union {
 #endif
 
 ///
-/// Byte packed structure for an FP/SSE/SSE2 context
+/// Byte packed structure for an FP/SSE/SSE2 context.
 ///
 typedef struct {
   UINT8  Buffer[512];
 } IA32_FX_BUFFER;
 
 ///
-/// Structures for the 16-bit real mode thunks
+/// Structures for the 16-bit real mode thunks.
 ///
 typedef struct {
   UINT32                            Reserved1;
@@ -5058,7 +5059,7 @@ typedef union {
 } IA32_REGISTER_SET;
 
 ///
-/// Byte packed structure for an 16-bit real mode thunks
+/// Byte packed structure for an 16-bit real mode thunks.
 ///
 typedef struct {
   IA32_REGISTER_SET                 *RealModeState;
@@ -5084,13 +5085,13 @@ typedef struct {
 
   @param  Index The 32-bit value to load into EAX prior to invoking the CPUID
                 instruction.
-  @param  Eax   Pointer to the 32-bit EAX value returned by the CPUID
+  @param  Eax   The pointer to the 32-bit EAX value returned by the CPUID
                 instruction. This is an optional parameter that may be NULL.
-  @param  Ebx   Pointer to the 32-bit EBX value returned by the CPUID
+  @param  Ebx   The pointer to the 32-bit EBX value returned by the CPUID
                 instruction. This is an optional parameter that may be NULL.
-  @param  Ecx   Pointer to the 32-bit ECX value returned by the CPUID
+  @param  Ecx   The pointer to the 32-bit ECX value returned by the CPUID
                 instruction. This is an optional parameter that may be NULL.
-  @param  Edx   Pointer to the 32-bit EDX value returned by the CPUID
+  @param  Edx   The pointer to the 32-bit EDX value returned by the CPUID
                 instruction. This is an optional parameter that may be NULL.
 
   @return Index.
@@ -5123,16 +5124,16 @@ AsmCpuid (
                     CPUID instruction.
   @param  SubIndex  The 32-bit value to load into ECX prior to invoking the
                     CPUID instruction.
-  @param  Eax       Pointer to the 32-bit EAX value returned by the CPUID
+  @param  Eax       The pointer to the 32-bit EAX value returned by the CPUID
                     instruction. This is an optional parameter that may be
                     NULL.
-  @param  Ebx       Pointer to the 32-bit EBX value returned by the CPUID
+  @param  Ebx       The pointer to the 32-bit EBX value returned by the CPUID
                     instruction. This is an optional parameter that may be
                     NULL.
-  @param  Ecx       Pointer to the 32-bit ECX value returned by the CPUID
+  @param  Ecx       The pointer to the 32-bit ECX value returned by the CPUID
                     instruction. This is an optional parameter that may be
                     NULL.
-  @param  Edx       Pointer to the 32-bit EDX value returned by the CPUID
+  @param  Edx       The pointer to the 32-bit EDX value returned by the CPUID
                     instruction. This is an optional parameter that may be
                     NULL.
 
@@ -6347,7 +6348,7 @@ AsmReadTr (
 
   If Gdtr is NULL, then ASSERT().
 
-  @param  Gdtr  Pointer to a GDTR descriptor.
+  @param  Gdtr  The pointer to a GDTR descriptor.
 
 **/
 VOID
@@ -6365,7 +6366,7 @@ AsmReadGdtr (
 
   If Gdtr is NULL, then ASSERT().
 
-  @param  Gdtr  Pointer to a GDTR descriptor.
+  @param  Gdtr  The pointer to a GDTR descriptor.
 
 **/
 VOID
@@ -6383,7 +6384,7 @@ AsmWriteGdtr (
 
   If Idtr is NULL, then ASSERT().
 
-  @param  Idtr  Pointer to a IDTR descriptor.
+  @param  Idtr  The pointer to a IDTR descriptor.
 
 **/
 VOID
@@ -6401,7 +6402,7 @@ AsmReadIdtr (
 
   If Idtr is NULL, then ASSERT().
 
-  @param  Idtr  Pointer to a IDTR descriptor.
+  @param  Idtr  The pointer to a IDTR descriptor.
 
 **/
 VOID
@@ -6453,7 +6454,7 @@ AsmWriteLdtr (
   If Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 16-byte boundary, then ASSERT().
 
-  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
+  @param  Buffer  The pointer to a buffer to save the floating point/SSE/SSE2 context.
 
 **/
 VOID
@@ -6474,7 +6475,7 @@ AsmFxSave (
   If Buffer is not aligned on a 16-byte boundary, then ASSERT().
   If Buffer was not saved with AsmFxSave(), then ASSERT().
 
-  @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
+  @param  Buffer  The pointer to a buffer to save the floating point/SSE/SSE2 context.
 
 **/
 VOID
@@ -6862,7 +6863,7 @@ AsmInvd (
                         addressing mode, then LinearAddress is a virtual
                         address.
 
-  @return LinearAddress
+  @return LinearAddress.
 **/
 VOID *
 EFIAPI
@@ -7147,7 +7148,7 @@ AsmPrepareThunk16 (
   ThunkAttributes, then ASSERT().
 
   This interface is limited to be used in either physical mode or virtual modes with paging enabled where the
-  virtual to physical mappings for ThunkContext.RealModeBuffer is mapped 1:1.
+  virtual to physical mappings for ThunkContext.RealModeBuffer are mapped 1:1.
 
   @param  ThunkContext  A pointer to the context structure that describes the
                         16-bit real mode code to call.
diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/MdePkg/Include/Library/BaseMemoryLib.h
index 47033d70a0..0a54311689 100644
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/MdePkg/Include/Library/BaseMemoryLib.h
@@ -5,11 +5,11 @@
   These functions should be used in place of coding your own loops to do equivalent common functions. 
   This allows optimized library implementations to help increase performance. 
 
-Copyright (c) 2006 - 2008, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -29,9 +29,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().
 
-  @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.
-  @param  SourceBuffer        Pointer to the source buffer of the memory copy.
-  @param  Length              Number of bytes to copy from SourceBuffer to DestinationBuffer.
+  @param  DestinationBuffer   The pointer to the destination buffer of the memory copy.
+  @param  SourceBuffer        The pointer to the source buffer of the memory copy.
+  @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.
 
   @return DestinationBuffer.
 
@@ -51,9 +51,9 @@ CopyMem (
   
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer    Memory to set.
-  @param  Length    Number of bytes to set.
-  @param  Value     Value with which to fill Length bytes of Buffer.
+  @param  Buffer    The memory to set.
+  @param  Length    The number of bytes to set.
+  @param  Value     The value with which to fill Length bytes of Buffer.
 
   @return Buffer.
 
@@ -78,9 +78,9 @@ SetMem (
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().
   If Length is not aligned on a 16-bit boundary, then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to fill.
-  @param  Length  Number of bytes in Buffer to fill.
-  @param  Value   Value with which to fill Length bytes of Buffer.
+  @param  Buffer  The pointer to the target buffer to fill.
+  @param  Length  The number of bytes in Buffer to fill.
+  @param  Value   The value with which to fill Length bytes of Buffer.
 
   @return Buffer.
 
@@ -105,9 +105,9 @@ SetMem16 (
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().
   If Length is not aligned on a 32-bit boundary, then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to fill.
-  @param  Length  Number of bytes in Buffer to fill.
-  @param  Value   Value with which to fill Length bytes of Buffer.
+  @param  Buffer  The pointer to the target buffer to fill.
+  @param  Length  The number of bytes in Buffer to fill.
+  @param  Value   The value with which to fill Length bytes of Buffer.
 
   @return Buffer.
 
@@ -132,9 +132,9 @@ SetMem32 (
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().
   If Length is not aligned on a 64-bit boundary, then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to fill.
-  @param  Length  Number of bytes in Buffer to fill.
-  @param  Value   Value with which to fill Length bytes of Buffer.
+  @param  Buffer  The pointer to the target buffer to fill.
+  @param  Length  The number of bytes in Buffer to fill.
+  @param  Value   The value with which to fill Length bytes of Buffer.
 
   @return Buffer.
 
@@ -159,9 +159,9 @@ SetMem64 (
   If Buffer is not aligned on a UINTN boundary, then ASSERT().
   If Length is not aligned on a UINTN boundary, then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to fill.
-  @param  Length  Number of bytes in Buffer to fill.
-  @param  Value   Value with which to fill Length bytes of Buffer.
+  @param  Buffer  The pointer to the target buffer to fill.
+  @param  Length  The number of bytes in Buffer to fill.
+  @param  Value   The value with which to fill Length bytes of Buffer.
 
   @return Buffer.
 
@@ -182,8 +182,8 @@ SetMemN (
   If Length > 0 and Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to fill with zeros.
-  @param  Length      Number of bytes in Buffer to fill with zeros.
+  @param  Buffer      The pointer to the target buffer to fill with zeros.
+  @param  Length      The number of bytes in Buffer to fill with zeros.
 
   @return Buffer.
 
@@ -208,9 +208,9 @@ ZeroMem (
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().
 
-  @param  DestinationBuffer Pointer to the destination buffer to compare.
-  @param  SourceBuffer      Pointer to the source buffer to compare.
-  @param  Length            Number of bytes to compare.
+  @param  DestinationBuffer The pointer to the destination buffer to compare.
+  @param  SourceBuffer      The pointer to the source buffer to compare.
+  @param  Length            The number of bytes to compare.
 
   @return 0                 All Length bytes of the two buffers are identical.
   @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first
@@ -237,11 +237,11 @@ CompareMem (
   If Length > 0 and Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
-  @return A pointer to the matching byte in the target buffer or NULL otherwise.
+  @return A pointer to the matching byte in the target buffer, otherwise NULL.
 
 **/
 VOID *
@@ -266,11 +266,11 @@ ScanMem8 (
   If Length is not aligned on a 16-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
-  @return A pointer to the matching byte in the target buffer or NULL otherwise.
+  @return A pointer to the matching byte in the target buffer, otherwise NULL.
 
 **/
 VOID *
@@ -295,11 +295,11 @@ ScanMem16 (
   If Length is not aligned on a 32-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
-  @return A pointer to the matching byte in the target buffer or NULL otherwise.
+  @return A pointer to the matching byte in the target buffer, otherwise NULL.
 
 **/
 VOID *
@@ -324,11 +324,11 @@ ScanMem32 (
   If Length is not aligned on a 64-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
-  @return A pointer to the matching byte in the target buffer or NULL otherwise.
+  @return A pointer to the matching byte in the target buffer, otherwise NULL.
 
 **/
 VOID *
@@ -353,11 +353,11 @@ ScanMem64 (
   If Length is not aligned on a UINTN boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
-  @return A pointer to the matching byte in the target buffer or NULL otherwise.
+  @return A pointer to the matching byte in the target buffer, otherwise NULL.
 
 **/
 VOID *
@@ -377,8 +377,8 @@ ScanMemN (
   If DestinationGuid is NULL, then ASSERT().
   If SourceGuid is NULL, then ASSERT().
 
-  @param  DestinationGuid   Pointer to the destination GUID.
-  @param  SourceGuid        Pointer to the source GUID.
+  @param  DestinationGuid   The pointer to the destination GUID.
+  @param  SourceGuid        The pointer to the source GUID.
 
   @return DestinationGuid.
 
@@ -428,11 +428,11 @@ CompareGuid (
   If Length is not aligned on a 128-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to scan.
-  @param  Length  Number of bytes in Buffer to scan.
-  @param  Guid    Value to search for in the target buffer.
+  @param  Buffer  The pointer to the target buffer to scan.
+  @param  Length  The number of bytes in Buffer to scan.
+  @param  Guid    The value to search for in the target buffer.
 
-  @return A pointer to the matching Guid in the target buffer or NULL otherwise.
+  @return A pointer to the matching Guid in the target buffer, otherwise NULL.
 
 **/
 VOID *
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index bf38fd8bf5..bbc974a375 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -8,11 +8,11 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is
   defined, then debug and assert related macros wrapped by it are the NULL implementations.
 
-Copyright (c) 2006 - 2010, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -82,8 +82,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   If Format is NULL, then ASSERT().
 
   @param  ErrorLevel  The error level of the debug message.
-  @param  Format      Format string for the debug message to print.
-  @param  ...         Variable argument list whose contents are accessed 
+  @param  Format      The format string for the debug message to print.
+  @param  ...         The variable argument list whose contents are accessed 
                       based on the format string specified by Format.
 
 **/
@@ -112,9 +112,9 @@ DebugPrint (
   If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.
   If Description is NULL, then a <Description> string of "(NULL) Description" is printed.
 
-  @param  FileName     Pointer to the name of the source file that generated the assert condition.
+  @param  FileName     The pointer to the name of the source file that generated the assert condition.
   @param  LineNumber   The line number in the source file that generated the assert condition
-  @param  Description  Pointer to the description of the assert condition.
+  @param  Description  The pointer to the description of the assert condition.
 
 **/
 VOID
@@ -135,10 +135,10 @@ DebugAssert (
   If Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). 
 
-  @param   Buffer  Pointer to the target buffer to be filled with PcdDebugClearMemoryValue.
-  @param   Length  Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. 
+  @param   Buffer  The pointer to the target buffer to be filled with PcdDebugClearMemoryValue.
+  @param   Length  The number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. 
 
-  @return  Buffer  Pointer to the target buffer filled with PcdDebugClearMemoryValue.
+  @return  Buffer  The pointer to the target buffer filled with PcdDebugClearMemoryValue.
 
 **/
 VOID *
@@ -153,7 +153,7 @@ DebugClearMemory (
   Returns TRUE if ASSERT() macros are enabled.
 
   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of 
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.
+  PcdDebugProperyMask is set.  Otherwise, FALSE is returned.
 
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.
   @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear.
@@ -170,7 +170,7 @@ DebugAssertEnabled (
   Returns TRUE if DEBUG() macros are enabled.
 
   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of 
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.
+  PcdDebugProperyMask is set.  Otherwise, FALSE is returned.
 
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.
   @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is clear.
@@ -187,7 +187,7 @@ DebugPrintEnabled (
   Returns TRUE if DEBUG_CODE() macros are enabled.
 
   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of 
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.
+  PcdDebugProperyMask is set.  Otherwise, FALSE is returned.
 
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.
   @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is clear.
@@ -204,7 +204,7 @@ DebugCodeEnabled (
   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.
 
   This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of 
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.
+  PcdDebugProperyMask is set.  Otherwise, FALSE is returned.
 
   @retval  TRUE    The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.
   @retval  FALSE   The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is clear.
@@ -251,7 +251,7 @@ DebugClearMemoryEnabled (
   DebugAssert() is called passing in the source filename, source line number, 
   and Expression.
 
-  @param  Expression  Boolean expression
+  @param  Expression  Boolean expression.
 
 **/
 #if !defined(MDEPKG_NDEBUG)       
@@ -335,7 +335,7 @@ DebugClearMemoryEnabled (
                   parameter that may be NULL.  If it is NULL, then the entire 
                   handle database is searched.
 
-  @param  Guid    Pointer to a protocol GUID.
+  @param  Guid    The pointer to a protocol GUID.
 
 **/
 #if !defined(MDEPKG_NDEBUG)
@@ -372,7 +372,7 @@ DebugClearMemoryEnabled (
 
 
 /**  
-  Macro that marks the end of debug source code.
+  The macro that marks the end of debug source code.
 
   If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set, 
   then this macro marks the end of source code that is included in a module.  
@@ -384,7 +384,7 @@ DebugClearMemoryEnabled (
 
 
 /**  
-  Macro that declares a section of debug source code.
+  The macro that declares a section of debug source code.
 
   If the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set, 
   then the source code specified by Expression is included in a module.  
@@ -398,12 +398,12 @@ DebugClearMemoryEnabled (
 
 
 /**  
-  Macro that calls DebugClearMemory() to clear a buffer to a default value.
+  The macro that calls DebugClearMemory() to clear a buffer to a default value.
 
   If the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set, 
   then this macro calls DebugClearMemory() passing in Address and Length.
 
-  @param  Address  Pointer to a buffer.
+  @param  Address  The pointer to a buffer.
   @param  Length   The number of bytes in the buffer to set.
 
 **/
@@ -419,13 +419,13 @@ DebugClearMemoryEnabled (
   Macro that calls DebugAssert() if the containing record does not have a 
   matching signature.  If the signatures matches, then a pointer to the data 
   structure that contains a specified field of that data structure is returned.  
-  This is a light weight method hide information by placing a public data 
+  This is a lightweight method hide information by placing a public data 
   structure inside a larger private data structure and using a pointer to the 
   public data structure to retrieve a pointer to the private data structure.
 
   If MDEPKG_NDEBUG is defined or the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit 
   of PcdDebugProperyMask is clear, then this macro computes the offset, in bytes,
-  of field specified by Field from the beginning of the  data structure specified 
+  of the field specified by Field from the beginning of the data structure specified 
   by TYPE.  This offset is subtracted from Record, and is used to return a pointer 
   to a data structure of the type specified by TYPE.
 
@@ -445,7 +445,7 @@ DebugClearMemoryEnabled (
   If TYPE does not contain a field called Signature, then the module will not 
   compile.
 
-  @param  Record         Pointer to the field specified by Field within a data 
+  @param  Record         The pointer to the field specified by Field within a data 
                          structure of type TYPE.
 
   @param  TYPE           The name of the data structure type to return  This 
diff --git a/MdePkg/Include/Library/DevicePathLib.h b/MdePkg/Include/Library/DevicePathLib.h
index 32f18f8148..f4e5ddd24c 100644
--- a/MdePkg/Include/Library/DevicePathLib.h
+++ b/MdePkg/Include/Library/DevicePathLib.h
@@ -4,11 +4,11 @@
   This library provides defines, macros, and functions to help create and parse 
   EFI_DEVICE_PATH_PROTOCOL structures.
 
-Copyright (c) 2006 - 2009, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -97,7 +97,8 @@ NextDevicePathNode (
 
 /**
   Determines if a device path node is an end node of a device path.
-  This includes nodes that are the end of a device path instance and nodes that are the end of an entire device path.
+  This includes nodes that are the end of a device path instance and nodes that 
+  are the end of an entire device path.
 
   Determines if the device path node specified by Node is an end node of a device path.  
   This includes nodes that are the end of a device path instance and nodes that are the 
@@ -212,7 +213,7 @@ SetDevicePathEndNode (
 
   @param  DevicePath                 A pointer to a device path data structure.
   
-  @retval 0       If DevicePath is NULL.
+  @retval 0       DevicePath is NULL.
   @retval Others  The size of a device path in bytes.
 
 **/
@@ -234,7 +235,7 @@ GetDevicePathSize (
   
   @param  DevicePath                 A pointer to a device path data structure.
 
-  @retval NULL    If DevicePath is NULL.
+  @retval NULL    DevicePath is NULL.
   @retval Others  A pointer to the duplicated device path.
   
 **/
@@ -291,7 +292,7 @@ AppendDevicePath (
   @param  DevicePath                 A pointer to a device path data structure.
   @param  DevicePathNode             A pointer to a single device path node.
 
-  @retval NULL      If there is not enough memory for the new device path.
+  @retval NULL      There is not enough memory for the new device path.
   @retval Others    A pointer to the new device path if success.
                     A copy of DevicePathNode followed by an end-of-device-path node 
                     if both FirstDevicePath and SecondDevicePath are NULL.
@@ -398,7 +399,7 @@ CreateDeviceNode (
   @param  DevicePath                 A pointer to a device path data structure.
 
   @retval  TRUE                      DevicePath is multi-instance.
-  @retval  FALSE                     DevicePath is not multi-instance or DevicePath is NULL.
+  @retval  FALSE                     DevicePath is not multi-instance, or DevicePath is NULL.
 
 **/
 BOOLEAN
diff --git a/MdePkg/Include/Library/DxeServicesLib.h b/MdePkg/Include/Library/DxeServicesLib.h
index abfdde6d62..d1dd8fffd0 100644
--- a/MdePkg/Include/Library/DxeServicesLib.h
+++ b/MdePkg/Include/Library/DxeServicesLib.h
@@ -2,14 +2,14 @@
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  
   These functions help access data from sections of FFS files or from file path.
 
-  Copyright (c) 2008 - 2010, Intel Corporation<BR>                                                         
-  All rights reserved. This program and the accompanying materials                          
-  are licensed and made available under the terms and conditions of the BSD License         
-  which accompanies this distribution.  The full text of the license may be found at        
-  http://opensource.org/licenses/bsd-license.php                                            
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                           
 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
 **/
 
@@ -37,20 +37,27 @@
   If Size is NULL, then ASSERT().
 
 
-  @param  NameGuid             A pointer to to the FFS filename GUID to search for within 
-                               any of the firmware volumes in the platform. 
-  @param  SectionType          Indicates the FFS section type to search for within the FFS file specified by NameGuid.
-  @param  SectionInstance      Indicates which section instance within the FFS file specified by NameGuid to retrieve.
-  @param  Buffer               On output, a pointer to a callee allocated buffer containing the FFS file section that was found.  
-                               It is the caller's responsibility to free this buffer using FreePool().
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for  
+                               within any of the firmware volumes in the platform. 
+  @param  SectionType          Indicates the FFS section type to search for within 
+                               the FFS file specified by NameGuid.
+  @param  SectionInstance      Indicates which section instance within the FFS file 
+                               specified by NameGuid to retrieve.
+  @param  Buffer               On output, a pointer to a callee-allocated buffer 
+                               containing the FFS file section that was found.  
+                               It is the caller's responsibility to free this 
+                               buffer using FreePool().
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.
 
   @retval  EFI_SUCCESS          The specified FFS section was returned.
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.
-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve the matching FFS section.
-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a device error.
-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the firmware volume that 
-                                contains the matching FFS section does not allow reads.
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve 
+                                the matching FFS section.
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a 
+                                device error.
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the 
+                                firmware volume that contains the matching FFS 
+                                section does not allow reads.
 **/
 EFI_STATUS
 EFIAPI
@@ -83,21 +90,29 @@ GetSectionFromAnyFv  (
   If Buffer is NULL, then ASSERT().
   If Size is NULL, then ASSERT().
 
-  @param  NameGuid             A pointer to to the FFS filename GUID to search for within 
-                               the firmware volumes that the currently executing module was loaded from.
-  @param  SectionType          Indicates the FFS section type to search for within the FFS file specified by NameGuid.
-  @param  SectionInstance      Indicates which section instance within the FFS file specified by NameGuid to retrieve.
-  @param  Buffer               On output, a pointer to a callee allocated buffer containing the FFS file section that was found.  
-                               It is the caller's responsibility to free this buffer using FreePool().
+  @param  NameGuid             A pointer to to the FFS filename GUID to search for  
+                               within the firmware volumes that the currently 
+                               executing module was loaded from.
+  @param  SectionType          Indicates the FFS section type to search for within 
+                               the FFS file specified by NameGuid.
+  @param  SectionInstance      Indicates which section instance within the FFS 
+                               file specified by NameGuid to retrieve.
+  @param  Buffer               On output, a pointer to a callee allocated buffer 
+                               containing the FFS file section that was found.  
+                               It is the caller's responsibility to free this buffer 
+                               using FreePool().
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.
 
 
   @retval  EFI_SUCCESS          The specified FFS section was returned.
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.
-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve the matching FFS section.
-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a device error.
-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the firmware volume that 
-                                contains the matching FFS section does not allow reads.  
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve 
+                                the matching FFS section.
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a 
+                                device error.
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the 
+                                firmware volume that contains the matching FFS 
+                                section does not allow reads.  
 **/
 EFI_STATUS
 EFIAPI
@@ -129,20 +144,27 @@ GetSectionFromFv (
   If Size is NULL, then ASSERT().
 
 
-  @param  SectionType          Indicates the FFS section type to search for within the FFS file 
-                               that the currently executing module was loaded from.
-  @param  SectionInstance      Indicates which section instance to retrieve within the FFS file 
-                               that the currently executing module was loaded from.
-  @param  Buffer               On output, a pointer to a callee allocated buffer containing the FFS file section that was found.  
-                               It is the caller's responsibility to free this buffer using FreePool().
+  @param  SectionType          Indicates the FFS section type to search for within  
+                               the FFS file that the currently executing module 
+                               was loaded from.
+  @param  SectionInstance      Indicates which section instance to retrieve within 
+                               the FFS file that the currently executing module 
+                               was loaded from.
+  @param  Buffer               On output, a pointer to a callee allocated buffer 
+                               containing the FFS file section that was found.  
+                               It is the caller's responsibility to free this buffer 
+                               using FreePool().
   @param  Size                 On output, a pointer to the size, in bytes, of Buffer.
 
   @retval  EFI_SUCCESS          The specified FFS section was returned.
   @retval  EFI_NOT_FOUND        The specified FFS section could not be found.
-  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve the matching FFS section.
-  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a device error.
-  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the firmware volume that 
-                                contains the matching FFS section does not allow reads.  
+  @retval  EFI_OUT_OF_RESOURCES There are not enough resources available to retrieve 
+                                the matching FFS section.
+  @retval  EFI_DEVICE_ERROR     The FFS section could not be retrieves due to a 
+                                device error.
+  @retval  EFI_ACCESS_DENIED    The FFS section could not be retrieves because the 
+                                firmware volume that contains the matching FFS 
+                                section does not allow reads.  
   
 **/
 EFI_STATUS
@@ -167,17 +189,19 @@ GetSectionFromFfs (
   If FileSize is NULL, then NULL is returned.
   If AuthenticationStatus is NULL, then NULL is returned.
 
-  @param[in]       BootPolicy           Policy for Open Image File.If TRUE, indicates that the request 
-                                        originates from the boot manager, and that the boot manager is
-                                        attempting to load FilePath as a boot selection. If FALSE, 
-                                        then FilePath must match an exact file to be loaded.
-  @param[in]       FilePath             Pointer to the device path of the file that is absracted to
+  @param[in]       BootPolicy           The policy for Open Image File.If TRUE, 
+                                        indicates that the request originates from 
+                                        the boot manager, and that the boot manager is
+                                        attempting to load FilePath as a boot selection. 
+                                        If FALSE, then FilePath must match an exact 
+                                        file to be loaded.
+  @param[in]       FilePath             Pointer to the device path of the file that is abstracted to
                                         the file buffer.
   @param[out]      FileSize             Pointer to the size of the abstracted file buffer.
   @param[out]      AuthenticationStatus Pointer to a caller-allocated UINT32 in which the authentication
                                         status is returned.
 
-  @retval NULL   File is NULL, or FileSize is NULL. Or the file can't be found.
+  @retval NULL   File is NULL, or FileSize is NULL, or the file can't be found.
   @retval other  The abstracted file buffer. The caller is responsible to free memory.
 **/
 VOID *
diff --git a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h b/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
index e14ea20433..0308bef97d 100644
--- a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
+++ b/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
@@ -1,11 +1,11 @@
 /** @file
   Provides a service to retrieve the PE/COFF entry point from a PE/COFF image.
 
-Copyright (c) 2006 - 2010, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                            
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
@@ -25,8 +25,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   If Pe32Data is NULL, then ASSERT().
   If EntryPoint is NULL, then ASSERT().
 
-  @param  Pe32Data                  Pointer to the PE/COFF image that is loaded in system memory.
-  @param  EntryPoint                Pointer to entry point to the PE/COFF image to return.
+  @param  Pe32Data                  The pointer to the PE/COFF image that is loaded in system memory.
+  @param  EntryPoint                The pointer to entry point to the PE/COFF image to return.
 
   @retval RETURN_SUCCESS            EntryPoint was returned.
   @retval RETURN_INVALID_PARAMETER  The entry point could not be found in the PE/COFF image.
@@ -45,7 +45,7 @@ PeCoffLoaderGetEntryPoint (
   Returns the machine type from the PE/COFF image specified by Pe32Data.
   If Pe32Data is NULL, then ASSERT().
 
-  @param  Pe32Data   Pointer to the PE/COFF image that is loaded in system
+  @param  Pe32Data   The pointer to the PE/COFF image that is loaded in system
                      memory.
 
   @return Machine type or zero if not a valid image.
@@ -69,10 +69,10 @@ PeCoffLoaderGetMachineType (
   then NULL is returned.
   If Pe32Data is NULL, then ASSERT().
 
-  @param  Pe32Data   Pointer to the PE/COFF image that is loaded in system
+  @param  Pe32Data   The pointer to the PE/COFF image that is loaded in system
                      memory.
 
-  @return The PDB file name for the PE/COFF image specified by Pe32Data or NULL
+  @return The PDB file name for the PE/COFF image specified by Pe32Data, or NULL
           if it cannot be retrieved.
 
 **/
@@ -89,10 +89,10 @@ PeCoffLoaderGetPdbPointer (
   Returns the size of the PE/COFF header specified by Pe32Data.
   If Pe32Data is NULL, then ASSERT().
 
-  @param  Pe32Data   Pointer to the PE/COFF image that is loaded in system
+  @param  Pe32Data   The pointer to the PE/COFF image that is loaded in system
                      memory.
 
-  @return Size of PE/COFF header in bytes or zero if not a valid image.
+  @return Size of PE/COFF header in bytes, or zero if not a valid image.
 
 **/
 UINT32
diff --git a/MdePkg/Include/Library/PeCoffLib.h b/MdePkg/Include/Library/PeCoffLib.h
index fabce4b122..44f30d686f 100644
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/MdePkg/Include/Library/PeCoffLib.h
@@ -5,12 +5,11 @@
   IA-32, x86, IPF, and EBC processor types. The library functions are memory-based 
   and can be ported easily to any environment.
   
-Copyright (c) 2006 - 2008, Intel Corporation<BR>       
-Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.                                            
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
@@ -60,9 +59,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                           On output, the number of bytes actually read.
   @param  Buffer          Output buffer that contains the data read from the PE/COFF image.
   
-  @retval RETURN_SUCCESS            The specified portion of the PE/COFF image was read and the size 
-  @retval RETURN_DEVICE_ERROR       The specified portion of the PE/COFF image could not be read due 
-                                    to a device error.
+  @retval RETURN_SUCCESS            The specified portion of the PE/COFF image was 
+                                    read and the size 
+  @retval RETURN_DEVICE_ERROR       The specified portion of the PE/COFF image 
+                                    could not be read due to a device error.
 
 **/
 typedef
@@ -75,20 +75,20 @@ RETURN_STATUS
   );
 
 ///
-/// Context structure used while PE/COFF image is being loaded and relocated
+/// The context structure used while PE/COFF image is being loaded and relocated.
 ///
 typedef struct {
   ///
-  /// Is set by PeCoffLoaderGetImageInfo() to the ImageBase in the PE/COFF header
+  /// Set by PeCoffLoaderGetImageInfo() to the ImageBase in the PE/COFF header.
   ///
   PHYSICAL_ADDRESS                  ImageAddress;
   ///
-  /// Is set by PeCoffLoaderGetImageInfo() to the SizeOfImage in the PE/COFF header.
+  /// Set by PeCoffLoaderGetImageInfo() to the SizeOfImage in the PE/COFF header.
   /// Image size includes the size of Debug Entry if it is present.
   ///
   UINT64                            ImageSize;
   ///
-  /// Is set to zero by PeCoffLoaderGetImageInfo(). If DestinationAddress is non zero,
+  /// Is set to zero by PeCoffLoaderGetImageInfo(). If DestinationAddress is non-zero,
   /// PeCoffLoaderRelocateImage() will relocate the image using this base address.
   /// If the DestinationAddress is zero, the ImageAddress will be used as the base
   /// address of relocation.
@@ -115,18 +115,18 @@ typedef struct {
   ///
   VOID                              *FixupData;
   ///
-  /// Is set by PeCoffLoaderGetImageInfo() to the Section Alignment in the PE/COFF header
+  /// Set by PeCoffLoaderGetImageInfo() to the Section Alignment in the PE/COFF header.
   /// If the image is a TE image, then this field is set to 0.
   ///
   UINT32                            SectionAlignment;
   ///
   /// Set by PeCoffLoaderGetImageInfo() to offset to the PE/COFF header.
-  /// If the PE/COFF image does not start with a DOS header, this value is zero; 
-  /// otherwise, it's the offset to the PE/COFF header.
+  /// If the PE/COFF image does not start with a DOS header, this value is zero. 
+  /// Otherwise, it's the offset to the PE/COFF header.
   ///
   UINT32                            PeCoffHeaderOffset;
   ///
-  /// Set by PeCoffLoaderGetImageInfo() to the Relative Virtual Address of the debug directory
+  /// Set by PeCoffLoaderGetImageInfo() to the Relative Virtual Address of the debug directory,
   /// if it exists in the image
   ///
   UINT32                            DebugDirectoryEntryRva;
@@ -155,7 +155,7 @@ typedef struct {
   /// Not used by this library class. Other library classes that layer on top of this library 
   /// class fill in this value as part of their GetImageInfo call.
   /// This allows the caller of the library to know what type of memory needs to be allocated
-  /// to load and relocate the image
+  /// to load and relocate the image.
   ///
   UINT32                            ImageDataMemoryType;
   ///
@@ -164,11 +164,11 @@ typedef struct {
   UINT32                            ImageError;
   ///
   /// Set by PeCoffLoaderLoadImage() to indicate the size of FixupData that the caller must
-  /// allocate before calling PeCoffLoaderRelocateImage()
+  /// allocate before calling PeCoffLoaderRelocateImage().
   ///
   UINTN                             FixupDataSize;
   ///
-  /// Set by PeCoffLoaderGetImageInfo() to the machine type stored in the PE/COFF header
+  /// Set by PeCoffLoaderGetImageInfo() to the machine type stored in the PE/COFF header.
   ///
   UINT16                            Machine;
   ///
@@ -188,8 +188,8 @@ typedef struct {
   BOOLEAN                           IsTeImage;
   ///
   /// Set by PeCoffLoaderLoadImage() to the HII resource offset
-  /// if the image contains a custom PE/COFF resource with the type 'HII';
-  /// otherwise, the entry remains to be 0.
+  /// if the image contains a custom PE/COFF resource with the type 'HII'.
+  /// Otherwise, the entry remains to be 0.
   ///
   PHYSICAL_ADDRESS                  HiiResourceData;
   ///
@@ -213,8 +213,9 @@ typedef struct {
   The ImageRead and Handle fields of ImageContext structure must be valid prior 
   to invoking this service.
 
-  @param  ImageContext              Pointer to the image context structure that describes the PE/COFF
-                                    image that needs to be examined by this function.
+  @param  ImageContext              The pointer to the image context structure that 
+                                    describes the PE/COFF image that needs to be 
+                                    examined by this function.
 
   @retval RETURN_SUCCESS            The information on the PE/COFF image was collected.
   @retval RETURN_INVALID_PARAMETER  ImageContext is NULL.
@@ -246,7 +247,7 @@ PeCoffLoaderGetImageInfo (
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations
   prior to transferring control to a PE/COFF image that is loaded using this library.
 
-  @param  ImageContext        Pointer to the image context structure that describes the PE/COFF
+  @param  ImageContext        The pointer to the image context structure that describes the PE/COFF
                               image that is being relocated.
 
   @retval RETURN_SUCCESS      The PE/COFF image was relocated.
@@ -280,7 +281,7 @@ PeCoffLoaderRelocateImage (
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations
   prior to transferring control to a PE/COFF image that is loaded using this library.
 
-  @param  ImageContext              Pointer to the image context structure that describes the PE/COFF
+  @param  ImageContext              The pointer to the image context structure that describes the PE/COFF
                                     image that is being loaded.
 
   @retval RETURN_SUCCESS            The PE/COFF image was loaded into the buffer specified by
@@ -315,13 +316,13 @@ PeCoffLoaderLoadImage (
   If ReadSize is NULL, then ASSERT().
   If Buffer is NULL, then ASSERT().
 
-  @param  FileHandle        Pointer to base of the input stream
+  @param  FileHandle        The pointer to base of the input stream
   @param  FileOffset        Offset into the PE/COFF image to begin the read operation.
   @param  ReadSize          On input, the size in bytes of the requested read operation.  
                             On output, the number of bytes actually read.
   @param  Buffer            Output buffer that contains the data read from the PE/COFF image.
 
-  @retval RETURN_SUCCESS    Data is read from FileOffset from the Handle into 
+  @retval RETURN_SUCCESS    The data is read from FileOffset from the Handle into 
                             the buffer.
 **/
 RETURN_STATUS
@@ -348,7 +349,7 @@ PeCoffLoaderImageReadFromMemory (
   cache(s) in hardware, then the caller is responsible for performing cache maintenance operations
   prior to transferring control to a PE/COFF image that is loaded using this library.
 
-  @param  ImageBase          Base address of a PE/COFF image that has been loaded 
+  @param  ImageBase          The base address of a PE/COFF image that has been loaded 
                              and relocated into system memory.
   @param  VirtImageBase      The request virtual address that the PE/COFF image is to
                              be fixed up for.
diff --git a/MdePkg/Include/Library/PrintLib.h b/MdePkg/Include/Library/PrintLib.h
index 2b020384ef..59c3e11206 100644
--- a/MdePkg/Include/Library/PrintLib.h
+++ b/MdePkg/Include/Library/PrintLib.h
@@ -2,11 +2,11 @@
   Provides services to print a formatted string to a buffer. All combinations of
   Unicode and ASCII strings are supported.
 
-Copyright (c) 2006 - 2009, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -177,8 +177,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 ///
 /// Define the maximum number of characters that are required to
-/// encode a decimal, hexadecimal, GUID, or TIME value with a NULL 
-/// terminator.
+/// encode with a NULL terminator a decimal, hexadecimal, GUID,   
+/// or TIME value.
 ///  
 ///  Maximum Length Decimal String     = 28
 ///    "-9,223,372,036,854,775,808"
@@ -202,14 +202,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 /**
   Produces a Null-terminated Unicode string in an output buffer based on 
-  a Null-terminated Unicode format string and a VA_LIST argument list
+  a Null-terminated Unicode format string and a VA_LIST argument list.
   
   Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer
   and BufferSize.  
   The Unicode string is produced by parsing the format string specified by FormatString.  
   Arguments are pulled from the variable argument list specified by Marker based on the 
   contents of the format string.  
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -218,10 +218,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   If BufferSize > 1 and FormatString is NULL, then ASSERT().
   If BufferSize > 1 and FormatString is not aligned on a 16-bit boundary, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than 
-  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then
+  PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string
-  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the
+  contains more than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
@@ -230,7 +230,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  FormatString    Null-terminated Unicode format string.
   @param  Marker          VA_LIST marker for the variable argument list.
   
-  @return The number of Unicode characters in the produced output buffer not including the
+  @return The number of Unicode characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -245,14 +245,14 @@ UnicodeVSPrint (
 
 /**
   Produces a Null-terminated Unicode string in an output buffer based on 
-  a Null-terminated Unicode format string and a BASE_LIST argument list
+  a Null-terminated Unicode format string and a BASE_LIST argument list.
   
   Produces a Null-terminated Unicode string in the output buffer specified by StartOfBuffer
   and BufferSize.  
   The Unicode string is produced by parsing the format string specified by FormatString.  
   Arguments are pulled from the variable argument list specified by Marker based on the 
   contents of the format string.  
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -261,10 +261,10 @@ UnicodeVSPrint (
   If BufferSize > 1 and FormatString is NULL, then ASSERT().
   If BufferSize > 1 and FormatString is not aligned on a 16-bit boundary, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than 
-  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then
+  PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string
-  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the
+  contains more than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
@@ -273,7 +273,7 @@ UnicodeVSPrint (
   @param  FormatString    Null-terminated Unicode format string.
   @param  Marker          BASE_LIST marker for the variable argument list.
   
-  @return The number of Unicode characters in the produced output buffer not including the
+  @return The number of Unicode characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -294,7 +294,7 @@ UnicodeBSPrint (
   and BufferSize.
   The Unicode string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list based on the contents of the format string.
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -312,11 +312,11 @@ UnicodeBSPrint (
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           Unicode string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated Unicode format string.
-  @param  ...             Variable argument list whose contents are accessed based on the 
+  @param  FormatString    A null-terminated Unicode format string.
+  @param  ...             The variable argument list whose contents are accessed based on the 
                           format string specified by FormatString.
   
-  @return The number of Unicode characters in the produced output buffer not including the
+  @return The number of Unicode characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -338,7 +338,7 @@ UnicodeSPrint (
   The Unicode string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on the 
   contents of the format string.
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -346,16 +346,16 @@ UnicodeSPrint (
   If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().
   If BufferSize > 1 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string
-  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the
+  contains more than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           Unicode string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
+  @param  FormatString    A null-terminated ASCII format string.
   @param  Marker          VA_LIST marker for the variable argument list.
   
   @return The number of Unicode characters in the produced output buffer not including the
@@ -380,7 +380,7 @@ UnicodeVSPrintAsciiFormat (
   The Unicode string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on the 
   contents of the format string.
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -388,19 +388,19 @@ UnicodeVSPrintAsciiFormat (
   If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().
   If BufferSize > 1 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string
-  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the
+  contains more than PcdMaximumUnicodeStringLength Unicode characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           Unicode string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
-  @param  Marker          BASE_LIST marker for the variable argument list.
+  @param  FormatString    A null-terminated ASCII format string.
+  @param  Marker          A BASE_LIST marker for the variable argument list.
   
-  @return The number of Unicode characters in the produced output buffer not including the
+  @return The number of Unicode characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -422,7 +422,7 @@ UnicodeBSPrintAsciiFormat (
   The Unicode string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list based on the contents of the 
   format string.
-  The number of Unicode characters in the produced output buffer is returned not including
+  The number of Unicode characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0 or 1, then no output buffer is produced and 0 is returned.
 
@@ -430,20 +430,20 @@ UnicodeBSPrintAsciiFormat (
   If BufferSize > 1 and StartOfBuffer is not aligned on a 16-bit boundary, then ASSERT().
   If BufferSize > 1 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and produced Null-terminated Unicode string
-  contains more than PcdMaximumUnicodeStringLength Unicode characters not including the
+  contains more than PcdMaximumUnicodeStringLength Unicode characters, the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           Unicode string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
+  @param  FormatString    A null-terminated ASCII format string.
   @param  ...             Variable argument list whose contents are accessed based on the 
                           format string specified by FormatString.
   
-  @return The number of Unicode characters in the produced output buffer not including the
+  @return The number of Unicode characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -462,7 +462,7 @@ UnicodeSPrintAsciiFormat (
   Converts the decimal number specified by Value to a Null-terminated Unicode 
   string specified by Buffer containing at most Width characters. No padding of spaces 
   is ever performed. If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.
-  The number of Unicode characters in Buffer is returned not including the Null-terminator.
+  The number of Unicode characters in Buffer is returned, not including the Null-terminator.
   If the conversion contains more than Width characters, then only the first
   Width characters are returned, and the total number of characters 
   required to perform the conversion is returned.
@@ -487,14 +487,14 @@ UnicodeSPrintAsciiFormat (
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().
   If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()
 
-  @param  Buffer  Pointer to the output buffer for the produced Null-terminated
+  @param  Buffer  The pointer to the output buffer for the produced Null-terminated
                   Unicode string.
   @param  Flags   The bitmask of flags that specify left justification, zero pad, and commas.
   @param  Value   The 64-bit signed value to convert to a string.
   @param  Width   The maximum number of Unicode characters to place in Buffer, not including
                   the Null-terminator.
   
-  @return The number of Unicode characters in Buffer not including the Null-terminator.
+  @return The number of Unicode characters in Buffer, not including the Null-terminator.
 
 **/
 UINTN
@@ -515,26 +515,26 @@ UnicodeValueToString (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on 
   the contents of the format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
   If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
+  @param  FormatString    A null-terminated ASCII format string.
   @param  Marker          VA_LIST marker for the variable argument list.
   
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -556,26 +556,26 @@ AsciiVSPrint (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on 
   the contents of the format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
   If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
+  @param  FormatString    A null-terminated ASCII format string.
   @param  Marker          BASE_LIST marker for the variable argument list.
   
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -597,27 +597,27 @@ AsciiBSPrint (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list based on the contents of the 
   format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
   If BufferSize > 0 and StartOfBuffer is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and FormatString contains more than
-  PcdMaximumAsciiStringLength ASCII characters not including the Null-terminator, then
+  PcdMaximumAsciiStringLength ASCII characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated ASCII format string.
-  @param  ...             Variable argument list whose contents are accessed based on the 
+  @param  FormatString    A null-terminated ASCII format string.
+  @param  ...             The variable argument list whose contents are accessed based on the 
                           format string specified by FormatString.
    
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -639,7 +639,7 @@ AsciiSPrint (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on 
   the contents of the format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
@@ -647,19 +647,19 @@ AsciiSPrint (
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is not aligned on a 16-bit boundary, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then
+  PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated Unicode format string.
+  @param  FormatString    A null-terminated Unicode format string.
   @param  Marker          VA_LIST marker for the variable argument list.
   
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -681,7 +681,7 @@ AsciiVSPrintUnicodeFormat (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list specified by Marker based on 
   the contents of the format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
@@ -689,19 +689,19 @@ AsciiVSPrintUnicodeFormat (
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is not aligned on a 16-bit boundary, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then
+  PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated Unicode format string.
+  @param  FormatString    A null-terminated Unicode format string.
   @param  Marker          BASE_LIST marker for the variable argument list.
   
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -723,7 +723,7 @@ AsciiBSPrintUnicodeFormat (
   The ASCII string is produced by parsing the format string specified by FormatString.
   Arguments are pulled from the variable argument list based on the contents of the 
   format string.
-  The number of ASCII characters in the produced output buffer is returned not including
+  The number of ASCII characters in the produced output buffer is returned, not including
   the Null-terminator.
   If BufferSize is 0, then no output buffer is produced and 0 is returned.
 
@@ -731,20 +731,20 @@ AsciiBSPrintUnicodeFormat (
   If BufferSize > 0 and FormatString is NULL, then ASSERT().
   If BufferSize > 0 and FormatString is not aligned on a 16-bit boundary, then ASSERT().
   If PcdMaximumUnicodeStringLength is not zero, and FormatString contains more than
-  PcdMaximumUnicodeStringLength Unicode characters not including the Null-terminator, then
+  PcdMaximumUnicodeStringLength Unicode characters, not including the Null-terminator, then
   ASSERT().
   If PcdMaximumAsciiStringLength is not zero, and produced Null-terminated ASCII string
-  contains more than PcdMaximumAsciiStringLength ASCII characters not including the
+  contains more than PcdMaximumAsciiStringLength ASCII characters, not including the
   Null-terminator, then ASSERT().
 
   @param  StartOfBuffer   A pointer to the output buffer for the produced Null-terminated 
                           ASCII string.
   @param  BufferSize      The size, in bytes, of the output buffer specified by StartOfBuffer.
-  @param  FormatString    Null-terminated Unicode format string.
+  @param  FormatString    A null-terminated Unicode format string.
   @param  ...             Variable argument list whose contents are accessed based on the 
                           format string specified by FormatString.
   
-  @return The number of ASCII characters in the produced output buffer not including the
+  @return The number of ASCII characters in the produced output buffer, not including the
           Null-terminator.
 
 **/
@@ -764,7 +764,7 @@ AsciiSPrintUnicodeFormat (
   specified by Buffer containing at most Width characters. No padding of spaces 
   is ever performed.
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.
-  The number of ASCII characters in Buffer is returned not including the Null-terminator.
+  The number of ASCII characters in Buffer is returned, not including the Null-terminator.
   If the conversion contains more than Width characters, then only the first Width
   characters are returned, and the total number of characters required to perform
   the conversion is returned.
@@ -787,14 +787,14 @@ AsciiSPrintUnicodeFormat (
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().
   If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()
 
-  @param  Buffer  Pointer to the output buffer for the produced Null-terminated
+  @param  Buffer  A pointer to the output buffer for the produced Null-terminated
                   ASCII string.
   @param  Flags   The bitmask of flags that specify left justification, zero pad, and commas.
   @param  Value   The 64-bit signed value to convert to a string.
   @param  Width   The maximum number of ASCII characters to place in Buffer, not including
                   the Null-terminator.
   
-  @return The number of ASCII characters in Buffer not including the Null-terminator.
+  @return The number of ASCII characters in Buffer, not including the Null-terminator.
 
 **/
 UINTN
diff --git a/MdePkg/Include/Library/ReportStatusCodeLib.h b/MdePkg/Include/Library/ReportStatusCodeLib.h
index 90796ccd90..a6748d951f 100644
--- a/MdePkg/Include/Library/ReportStatusCodeLib.h
+++ b/MdePkg/Include/Library/ReportStatusCodeLib.h
@@ -1,11 +1,11 @@
 /** @file
   Provides services to log status code records.
 
-Copyright (c) 2006 - 2009, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -42,7 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  PostCode  A pointer to the 8-bit POST code value to return. 
 
   @retval  TRUE   The status code specified by CodeType and Value was converted 
-                  to an 8-bit POST code and returned in  PostCode.
+                  to an 8-bit POST code and returned in PostCode.
   @retval  FALSE  The status code specified by CodeType and Value could not be 
                   converted to an 8-bit POST code value.
 
@@ -77,10 +77,10 @@ CodeTypeToPostCode (
 
   @param  CodeType     The type of status code being converted.
   @param  Value        The status code value being converted.
-  @param  Data         Pointer to status code data buffer. 
-  @param  Filename     Pointer to the source file name that generated the ASSERT().
-  @param  Description  Pointer to the description of the ASSERT().
-  @param  LineNumber   Pointer to source line number that generated the ASSERT().
+  @param  Data         The pointer to status code data buffer. 
+  @param  Filename     The pointer to the source file name that generated the ASSERT().
+  @param  Description  The pointer to the description of the ASSERT().
+  @param  LineNumber   The pointer to source line number that generated the ASSERT().
 
   @retval  TRUE   The status code specified by CodeType, Value, and Data was 
                   converted ASSERT() arguments specified by Filename, Description, 
@@ -118,10 +118,10 @@ ReportStatusCodeExtractAssertInfo (
   If Marker is NULL, then ASSERT().
   If Format is NULL, then ASSERT().
 
-  @param  Data        Pointer to status code data buffer. 
-  @param  ErrorLevel  Pointer to error level mask for a debug message.
-  @param  Marker      Pointer to the variable argument list associated with Format.
-  @param  Format      Pointer to a Null-terminated ASCII format string of a 
+  @param  Data        The pointer to status code data buffer. 
+  @param  ErrorLevel  The pointer to error level mask for a debug message.
+  @param  Marker      The pointer to the variable argument list associated with Format.
+  @param  Format      The pointer to a Null-terminated ASCII format string of a 
                       debug message.
 
   @retval  TRUE   The status code specified by Data was converted DEBUG() arguments 
@@ -158,7 +158,7 @@ ReportStatusCodeExtractDebugInfo (
   @retval  EFI_SUCCESS       The status code was reported.
   @retval  EFI_DEVICE_ERROR  There status code could not be reported due to a 
                              device error.
-  @retval  EFI_UNSUPPORTED   Report status code is not supported
+  @retval  EFI_UNSUPPORTED   The report status code is not supported.
 
 **/
 EFI_STATUS
@@ -185,15 +185,15 @@ ReportStatusCode (
 
   If DevicePath is NULL, then ASSERT().
 
-  @param  Type        Status code type. 
-  @param  Value       Status code value.
-  @param  DevicePath  Pointer to the Device Path Protocol to be reported.
+  @param  Type        The status code type. 
+  @param  Value       The status code value.
+  @param  DevicePath  The pointer to the Device Path Protocol to be reported.
 
   @retval  EFI_SUCCESS           The status code was reported with the extended 
                                  data specified by DevicePath.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the 
                                  extended data section.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
@@ -227,9 +227,9 @@ ReportStatusCodeWithDevicePath (
   If ExtendedData is NULL, then ASSERT().
   If ExtendedDataSize is 0, then ASSERT().
 
-  @param  Type              Status code type. 
-  @param  Value             Status code value.
-  @param  ExtendedData      Pointer to the extended data buffer to be reported.
+  @param  Type              The status code type. 
+  @param  Value             The status code value.
+  @param  ExtendedData      The pointer to the extended data buffer to be reported.
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to 
                             be reported.
 
@@ -237,7 +237,7 @@ ReportStatusCodeWithDevicePath (
                                  data specified by ExtendedData and ExtendedDataSize.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the 
                                  extended data section.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
@@ -273,23 +273,23 @@ ReportStatusCodeWithExtendedData (
   If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT().
   If ExtendedData is not NULL and ExtendedDataSize is zero, then ASSERT().
 
-  @param  Type              Status code type. 
-  @param  Value             Status code value.
-  @param  Instance          Status code instance number.
-  @param  CallerId          Pointer to a GUID that identifies the caller of this 
+  @param  Type              The status code type. 
+  @param  Value             The status code value.
+  @param  Instance          The status code instance number.
+  @param  CallerId          The pointer to a GUID that identifies the caller of this 
                             function.  If this parameter is NULL, then a caller 
                             ID of gEfiCallerIdGuid is used.
-  @param  ExtendedDataGuid  Pointer to the GUID for the extended data buffer.  
+  @param  ExtendedDataGuid  The pointer to the GUID for the extended data buffer.  
                             If this parameter is NULL, then a the status code 
                             standard header is filled in with an implementation dependent GUID.
-  @param  ExtendedData      Pointer to the extended data buffer.  This is an 
+  @param  ExtendedData      The pointer to the extended data buffer.  This is an 
                             optional parameter that may be NULL.
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer.
 
   @retval  EFI_SUCCESS           The status code was reported.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate 
                                  the extended data section if it was specified.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported.
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
@@ -330,7 +330,7 @@ ReportProgressCodeEnabled (
   Returns TRUE if status codes of type EFI_ERROR_CODE are enabled
 
   This function returns TRUE if the REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED 
-  bit of PcdReportStatusCodeProperyMask is set.  Otherwise FALSE is returned.
+  bit of PcdReportStatusCodeProperyMask is set.  Otherwise, FALSE is returned.
 
   @retval  TRUE   The REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED bit of 
                   PcdReportStatusCodeProperyMask is set.
@@ -371,12 +371,12 @@ ReportDebugCodeEnabled (
   PcdReportStatusCodeProperyMask, then call ReportStatusCode() passing in Type 
   and Value.
 
-  @param  Type   Status code type. 
-  @param  Value  Status code value.
+  @param  Type   The status code type. 
+  @param  Value  The status code value.
 
   @retval  EFI_SUCCESS       The status code was reported.
   @retval  EFI_DEVICE_ERROR  There status code could not be reported due to a device error.
-  @retval  EFI_UNSUPPORTED   Report status code is not supported
+  @retval  EFI_UNSUPPORTED   Report status code is not supported.
 
 **/
 #define REPORT_STATUS_CODE(Type,Value)                                                          \
@@ -397,15 +397,15 @@ ReportDebugCodeEnabled (
   PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithDevicePath() 
   passing in Type, Value, and DevicePath.
 
-  @param  Type        Status code type. 
-  @param  Value       Status code value.
+  @param  Type        The status code type. 
+  @param  Value       The status code value.
   @param  DevicePath  Pointer to the Device Path Protocol to be reported.
 
   @retval  EFI_SUCCESS           The status code was reported with the extended 
                                  data specified by DevicePath.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the 
                                  extended data section.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
@@ -428,9 +428,9 @@ ReportDebugCodeEnabled (
   PcdReportStatusCodeProperyMask, then call ReportStatusCodeWithExtendedData() 
   passing in Type, Value, ExtendedData, and ExtendedDataSize.
 
-  @param  Type              Status code type. 
-  @param  Value             Status code value.
-  @param  ExtendedData      Pointer to the extended data buffer to be reported.
+  @param  Type              The status code type. 
+  @param  Value             The status code value.
+  @param  ExtendedData      The pointer to the extended data buffer to be reported.
   @param  ExtendedDataSize  The size, in bytes, of the extended data buffer to
                             be reported.
 
@@ -438,7 +438,7 @@ ReportDebugCodeEnabled (
                                  data specified by ExtendedData and ExtendedDataSize.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the 
                                  extended data section.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
@@ -459,10 +459,10 @@ ReportDebugCodeEnabled (
   PcdReportStatusCodeProperyMask, then call ReportStatusCodeEx() passing in Type, 
   Value, Instance, CallerId, ExtendedDataGuid, ExtendedData, and ExtendedDataSize.
 
-  @param  Type              Status code type. 
-  @param  Value             Status code value.
-  @param  Instance          Status code instance number.
-  @param  CallerId          Pointer to a GUID that identifies the caller of this 
+  @param  Type              The status code type. 
+  @param  Value             The status code value.
+  @param  Instance          The status code instance number.
+  @param  CallerId          The pointer to a GUID that identifies the caller of this 
                             function.  If this parameter is NULL, then a caller 
                             ID of gEfiCallerIdGuid is used.
   @param  ExtendedDataGuid  Pointer to the GUID for the extended data buffer.  
@@ -475,7 +475,7 @@ ReportDebugCodeEnabled (
   @retval  EFI_SUCCESS           The status code was reported.
   @retval  EFI_OUT_OF_RESOURCES  There were not enough resources to allocate the 
                                  extended data section if it was specified.
-  @retval  EFI_UNSUPPORTED       Report status code is not supported
+  @retval  EFI_UNSUPPORTED       The report status code is not supported.
   @retval  EFI_DEVICE_ERROR      A call to a Report Status Code Library function
                                  is already in progress.
 
diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index 60ba7ff1e7..41cf1376f6 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -12,11 +12,11 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is
   defined, then debug and assert related macros wrapped by it are the NULL implementations.
 
-Copyright (c) 2006 - 2010, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -64,9 +64,9 @@ typedef struct {
 
 /**
   Macro that returns the number of 100 ns units for a specified number of microseconds.
-  Useful for managing EFI timer events.
+  This is useful for managing EFI timer events.
 
-  @param  Microseconds           Number of microseconds.
+  @param  Microseconds           The number of microseconds.
 
   @return The number of 100 ns units equivalent to the number of microseconds specified
           by Microseconds.
@@ -76,9 +76,9 @@ typedef struct {
 
 /**
   Macro that returns the number of 100 ns units for a specified number of milliseconds.
-  Useful for managing EFI timer events.
+  This is useful for managing EFI timer events.
 
-  @param  Milliseconds           Number of milliseconds.
+  @param  Milliseconds           The number of milliseconds.
 
   @return The number of 100 ns units equivalent to the number of milliseconds specified
           by Milliseconds.
@@ -88,9 +88,9 @@ typedef struct {
 
 /**
   Macro that returns the number of 100 ns units for a specified number of seconds.
-  Useful for managing EFI timer events.
+  This is useful for managing EFI timer events.
 
-  @param  Seconds                Number of seconds.
+  @param  Seconds                The number of seconds.
 
   @return The number of 100 ns units equivalent to the number of seconds specified
           by Seconds.
@@ -123,8 +123,8 @@ typedef struct {
   If TableGuid is NULL, then ASSERT().
   If Table is NULL, then ASSERT().
 
-  @param  TableGuid       Pointer to table's GUID type..
-  @param  Table           Pointer to the table associated with TableGuid in the EFI System Table.
+  @param  TableGuid       The pointer to table's GUID type..
+  @param  Table           The pointer to the table associated with TableGuid in the EFI System Table.
 
   @retval EFI_SUCCESS     A configuration table matching TableGuid was found.
   @retval EFI_NOT_FOUND   A configuration table matching TableGuid could not be found.
@@ -191,7 +191,7 @@ EfiCreateProtocolNotifyEvent(
   @param  Registration          A pointer to a memory location to receive the registration value.
 
   @retval EFI_SUCCESS           A named event was created.
-  @retval EFI_OUT_OF_RESOURCES  There are not enough resource to create the named event.
+  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to create the named event.
 
 **/
 EFI_STATUS
@@ -211,10 +211,10 @@ EfiNamedEventListen (
   created with EfiNamedEventListen().
   If Name is NULL, then ASSERT().
 
-  @param  Name                  Supplies GUID name of the event.
+  @param  Name                  Supplies the GUID name of the event.
 
   @retval EFI_SUCCESS           A named event was signaled.
-  @retval EFI_OUT_OF_RESOURCES  There are not enough resource to signal the named event.
+  @retval EFI_OUT_OF_RESOURCES  There are not enough resources to signal the named event.
 
 **/
 EFI_STATUS
@@ -252,7 +252,7 @@ EfiGetCurrentTpl (
   If Priority is not a valid TPL value, then ASSERT().
 
   @param  Lock       A pointer to the lock data structure to initialize.
-  @param  Priority   EFI TPL associated with the lock.
+  @param  Priority   The EFI TPL associated with the lock.
 
   @return The lock.
 
@@ -493,7 +493,7 @@ LookupUnicodeString (
                                that matches the language specified by Language.
   @param  Iso639Language       Specifies the supported language code format. If it is TRUE, then
                                Language and SupportedLanguages follow ISO 639-2 language code format.
-                               Otherwise, they follow RFC 4646 language code format.
+                               Otherwise, they follow the RFC 4646 language code format.
 
 
   @retval  EFI_SUCCESS            The Unicode string that matches the language specified by Language
@@ -639,8 +639,8 @@ FreeUnicodeStringTable (
   If Name is NULL, then ASSERT().
   If Guid is NULL, then ASSERT().
 
-  @param[in]  Name  Pointer to a Null-terminated Unicode string.
-  @param[in]  Guid  Pointer to an EFI_GUID structure
+  @param[in]  Name  The pointer to a Null-terminated Unicode string.
+  @param[in]  Guid  The pointer to an EFI_GUID structure.
 
   @retval NULL   The variable could not be retrieved.
   @retval NULL   There are not enough resources available for the variable contents.
@@ -663,7 +663,7 @@ GetVariable (
 
   If Name is NULL, then ASSERT().
 
-  @param[in]  Name  Pointer to a Null-terminated Unicode string.
+  @param[in]  Name  The pointer to a Null-terminated Unicode string.
 
   @retval NULL   The variable could not be retrieved.
   @retval NULL   There are not enough resources available for the variable contents.
@@ -839,8 +839,8 @@ EfiSignalEventLegacyBoot (
 
   @param  LegacyBootEvent   Returns the EFI event returned from gBS->CreateEvent(Ex).
 
-  @retval EFI_SUCCESS       Event was created.
-  @retval Other             Event was not created.
+  @retval EFI_SUCCESS       The event was created.
+  @retval Other             The event was not created.
 
 **/
 EFI_STATUS
@@ -864,8 +864,8 @@ EfiCreateEventLegacyBoot (
   @param  NotifyContext     The content to pass to NotifyFunction when the event is signaled.
   @param  LegacyBootEvent   Returns the EFI event returned from gBS->CreateEvent(Ex).
 
-  @retval EFI_SUCCESS       Event was created.
-  @retval Other             Event was not created.
+  @retval EFI_SUCCESS       The event was created.
+  @retval Other             The event was not created.
 
 **/
 EFI_STATUS
@@ -890,8 +890,8 @@ EfiCreateEventLegacyBootEx (
 
   @param  ReadyToBootEvent   Returns the EFI event returned from gBS->CreateEvent(Ex).
 
-  @retval EFI_SUCCESS       Event was created.
-  @retval Other             Event was not created.
+  @retval EFI_SUCCESS       The event was created.
+  @retval Other             The event was not created.
 
 **/
 EFI_STATUS
@@ -915,8 +915,8 @@ EfiCreateEventReadyToBoot (
   @param  NotifyContext     The content to pass to NotifyFunction when the event is signaled.
   @param  ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex).
 
-  @retval EFI_SUCCESS       Event was created.
-  @retval Other             Event was not created.
+  @retval EFI_SUCCESS       The event was created.
+  @retval Other             The event was not created.
 
 **/
 EFI_STATUS
@@ -940,7 +940,7 @@ EfiCreateEventReadyToBootEx (
   If FvDevicePathNode is NULL, then ASSERT().
   If NameGuid is NULL, then ASSERT().
   
-  @param  FvDevicePathNode  Pointer to a FV device path node to initialize
+  @param  FvDevicePathNode  The pointer to a FV device path node to initialize
   @param  NameGuid          FV file name to use in FvDevicePathNode
 
 **/
@@ -963,7 +963,7 @@ EfiInitializeFwVolDevicepathNode (
   the differences from the caller.
   If FvDevicePathNode is NULL, then ASSERT().
 
-  @param  FvDevicePathNode  Pointer to FV device path to check.
+  @param  FvDevicePathNode  The pointer to FV device path to check.
 
   @retval NULL              FvDevicePathNode is not valid.
   @retval Other             FvDevicePathNode is valid and pointer to NameGuid was returned.
@@ -987,8 +987,8 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   If Format is NULL, then ASSERT().
   If Format is not aligned on a 16-bit boundary, then ASSERT().
 
-  @param Format   Null-terminated Unicode format string.
-  @param ...      Variable argument list whose contents are accessed based 
+  @param Format   A null-terminated Unicode format string.
+  @param ...      The variable argument list whose contents are accessed based 
                   on the format string specified by Format.
   
   @return Number of Unicode characters printed to ConOut.
@@ -1013,8 +1013,8 @@ Print (
   If Format is NULL, then ASSERT().
   If Format is not aligned on a 16-bit boundary, then ASSERT().
 
-  @param Format   Null-terminated Unicode format string.
-  @param ...      Variable argument list whose contents are accessed based 
+  @param Format   A null-terminated Unicode format string.
+  @param ...      The variable argument list whose contents are accessed based 
                   on the format string specified by Format.
   
   @return Number of Unicode characters printed to StdErr.
@@ -1038,8 +1038,8 @@ ErrorPrint (
   PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.
   If Format is NULL, then ASSERT().
 
-  @param Format   Null-terminated ASCII format string.
-  @param ...      Variable argument list whose contents are accessed based 
+  @param Format   A null-terminated ASCII format string.
+  @param ...      The variable argument list whose contents are accessed based 
                   on the format string specified by Format.
   
   @return Number of ASCII characters printed to ConOut.
@@ -1063,8 +1063,8 @@ AsciiPrint (
   PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.
   If Format is NULL, then ASSERT().
 
-  @param Format   Null-terminated ASCII format string.
-  @param ...      Variable argument list whose contents are accessed based 
+  @param Format   A null-terminated ASCII format string.
+  @param ...      The variable argument list whose contents are accessed based 
                   on the format string specified by Format.
   
   @return Number of ASCII characters printed to ConErr.
@@ -1109,7 +1109,7 @@ AsciiErrorPrint (
                        an optional parameter that may be NULL.  If it is NULL, 
                        then the background color of the current ConOut device
                        in the EFI_SYSTEM_TABLE is used.
-  @param  Format       Null-terminated Unicode format string.  See Print Library 
+  @param  Format       A null-terminated Unicode format string.  See Print Library 
                        for the supported format string syntax.
   @param  ...          Variable argument list whose contents are accessed based on 
                        the format string specified by Format.         
@@ -1158,9 +1158,9 @@ PrintXY (
                        an optional parameter that may be NULL.  If it is NULL, 
                        then the background color of the current ConOut device
                        in the EFI_SYSTEM_TABLE is used.
-  @param  Format       Null-terminated ASCII format string.  See Print Library 
+  @param  Format       A null-terminated ASCII format string.  See Print Library 
                        for the supported format string syntax.
-  @param  ...          Variable argument list whose contents are accessed based on 
+  @param  ...          The variable argument list whose contents are accessed based on 
                        the format string specified by Format.         
 
   @return  The number of ASCII characters printed.
@@ -1194,7 +1194,7 @@ AsciiPrintXY (
   @param  DriverBindingHandle  The handle that DriverBinding is to be installed onto.  If this
                                parameter is NULL, then a new handle is created.
 
-  @retval EFI_SUCCESS           The protocol installation is completed successfully.
+  @retval EFI_SUCCESS           The protocol installation completed successfully.
   @retval EFI_OUT_OF_RESOURCES  There was not enough system resources to install the protocol.
   @retval Others                Status from gBS->InstallMultipleProtocolInterfaces().
 
@@ -1231,8 +1231,8 @@ EfiLibInstallDriverBinding (
   @param  DriverConfiguration  A Driver Configuration Protocol instance that this driver is producing.
   @param  DriverDiagnostics    A Driver Diagnostics Protocol instance that this driver is producing.
 
-  @retval EFI_SUCCESS           The protocol installation is completed successfully.
-  @retval EFI_OUT_OF_RESOURCES  There was not enough memory in pool to install all the protocols.
+  @retval EFI_SUCCESS           The protocol installation completed successfully.
+  @retval EFI_OUT_OF_RESOURCES  There was not enough memory in the pool to install all the protocols.
 
 **/
 EFI_STATUS
@@ -1268,7 +1268,7 @@ EfiLibInstallAllDriverProtocols (
   @param  ComponentName        A Component Name Protocol instance that this driver is producing.
   @param  ComponentName2       A Component Name 2 Protocol instance that this driver is producing.
 
-  @retval EFI_SUCCESS           The protocol installation is completed successfully.
+  @retval EFI_SUCCESS           The protocol installation completed successfully.
   @retval EFI_OUT_OF_RESOURCES  There was not enough memory in pool to install all the protocols.
 
 **/
@@ -1309,7 +1309,7 @@ EfiLibInstallDriverBindingComponentName2 (
   @param  DriverDiagnostics     A Driver Diagnostics Protocol instance that this driver is producing.
   @param  DriverDiagnostics2    A Driver Diagnostics Protocol 2 instance that this driver is producing.
 
-  @retval EFI_SUCCESS           The protocol installation is completed successfully.
+  @retval EFI_SUCCESS           The protocol installation completed successfully.
   @retval EFI_OUT_OF_RESOURCES  There was not enough memory in pool to install all the protocols.
 
 **/
diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
index c0720a3764..3ec5680011 100644
--- a/MdePkg/Include/Library/UefiRuntimeLib.h
+++ b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -2,11 +2,11 @@
   Provides library functions for each of the UEFI Runtime Services.
   Only available to DXE and UEFI module types.
 
-Copyright (c) 2006 - 2009, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+Copyright (c) 2006 - 2010, Intel Corporation.  All rights reserved.<BR>
+This program and the accompanying materials are licensed and made available under 
+the terms and conditions of the BSD License that accompanies this distribution.  
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
 
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -120,7 +120,7 @@ EfiSetTime (
   @param  Time     The current alarm setting. Type EFI_TIME is defined in the GetTime()
                    function description.
 
-  @retval  EFI_SUCCESS           The alarm settings were returned.
+  @retval  EFI_SUCCESS            The alarm settings were returned.
   @retval  EFI_INVALID_PARAMETER  Enabled is NULL.
   @retval  EFI_INVALID_PARAMETER  Pending is NULL.
   @retval  EFI_INVALID_PARAMETER  Time is NULL.
@@ -442,7 +442,7 @@ EfiSetVirtualAddressMap (
   @param  DebugDisposition   Supplies type information for the pointer being converted.
   @param  ListHead           Head of linked list to convert.
 
-  @retval  EFI_SUCCESS  Success to execute the function.
+  @retval  EFI_SUCCESS  Successfully executed the function.
   @retval  !EFI_SUCCESS Failed to execute the function.
 
 **/
@@ -478,7 +478,7 @@ EfiConvertList (
                                 CapsuleHeaderArray. This parameter is only referenced if
                                 the capsules are defined to persist across system reset.
 
-  @retval EFI_SUCCESS           Valid capsule was passed. If CAPSULE_FLAGS_PERSIT_ACROSS_RESET is not set,
+  @retval EFI_SUCCESS           A valid capsule was passed. If CAPSULE_FLAGS_PERSIT_ACROSS_RESET is not set,
                                 the capsule has been successfully processed by the firmware.
   @retval EFI_INVALID_PARAMETER CapsuleSize is NULL, or an incompatible set of flags were
                                 set in the capsule header.
@@ -524,7 +524,7 @@ EfiUpdateCapsule (
                                 Undefined on input.
   @param  ResetType             Returns the type of reset required for the capsule update.
 
-  @retval EFI_SUCCESS           Valid answer returned.
+  @retval EFI_SUCCESS           A valid answer was returned.
   @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL.
   @retval EFI_UNSUPPORTED       The capsule type is not supported on this platform, and
                                 MaximumCapsuleSize and ResetType are undefined.
@@ -563,11 +563,11 @@ EfiQueryCapsuleCapabilities (
   @param  RemainingVariableStorageSize
                                 Returns the remaining size of the storage space
                                 available for the EFI variables associated with the
-                                attributes specified..
+                                attributes specified.
   @param  MaximumVariableSize   Returns the maximum size of the individual EFI
                                 variables associated with the attributes specified.
 
-  @retval EFI_SUCCESS           Valid answer returned.
+  @retval EFI_SUCCESS           A valid answer was returned.
   @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied.
   @retval EFI_UNSUPPORTED       EFI_UNSUPPORTED The attribute is not supported on this platform, and the
                                 MaximumVariableStorageSize,