Avoid using code name in comments.

Signed-off-by: niruiyu Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12552 6f19259b-4bc3-4df7-8a09-765794883524
2011-10-19 05:44:28 +00:00
parent bb9f4ead2a
commit 8598a1ed33
29 changed files with 72 additions and 80 deletions
--- a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -27,7 +27,7 @@ Abstract:

 //
 // Tiano added a couple of return types. These are owned by UEFI specification
-// and Tiano can not use them. Thus for UEFI 2.0/R8.6 support we moved the values
+// and Tiano can not use them. Thus for UEFI 2.0 support we moved the values
 // to a UEFI OEM extension range to conform to UEFI specification.
 //
 #if (EFI_SPECIFICATION_VERSION < 0x00020000)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -229,7 +229,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification by 
  declaring a GUID for the legacy boot event class. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to 
  work both ways.

 Arguments:
@@ -308,7 +308,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification and use 
  the ready to boot event class defined in UEFI 2.0. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to 
  work both ways.

 Arguments:
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -1124,8 +1124,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification by 
  declaring a GUID for the legacy boot event class. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
@@ -1154,8 +1153,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification and use 
  the ready to boot event class defined in UEFI 2.0. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  @param LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -1699,8 +1699,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification by 
  declaring a GUID for the legacy boot event class. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
@@ -1729,8 +1728,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification and use 
  the ready to boot event class defined in UEFI 2.0. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -174,8 +174,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification by 
  declaring a GUID for the legacy boot event class. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
@@ -204,8 +203,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification and use 
  the ready to boot event class defined in UEFI 2.0. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -691,7 +691,7 @@ EfiMain (
 #endif

 //
-// Guids not present in R8.6 code base
+// Guids not present in EDK code base
 //

 //
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -119,7 +119,7 @@ EfiMain (
 }

 //
-// Guids not present in R8.6 code base
+// Guids not present in EDK code base
 //

 //
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -438,7 +438,7 @@ EfiMain (
 }

 //
-// Guids not present in R8.6 code base
+// Guids not present in EDK code base
 //

 //
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -16,9 +16,9 @@ Module Name:
  
 Abstract: 

-  This file is supposed to be used by a .dxe file. To write common .dxs file for R8.x 
-  and R9, a header file named AutoGen.h musted be present. In R8.x-GlueLib code base, 
-  this AutoGen.h plays the role as the AutoGen.h in R9. Here the AutoGen.h isn't auto-generated 
+  This file is supposed to be used by a .dxe file. To write common .dxs file for EDK
+  and EDKII, a header file named AutoGen.h musted be present. In EDK-GlueLib code base, 
+  this AutoGen.h plays the role as the AutoGen.h in EDKII. Here the AutoGen.h isn't auto-generated 
  by any tool.

 --*/
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -104,7 +104,7 @@ typedef EFI_GUID GUID;
 #define TPL_HIGH_LEVEL                                EFI_TPL_HIGH_LEVEL

 //
-// Typos in R8.x
+// Typos in EDK
 //
 #define gEfiHobMemoryAllocModuleGuid        gEfiHobMemeryAllocModuleGuid
 #define gEfiHobMemoryAllocStackGuid         gEfiHobMemeryAllocStackGuid
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -26,7 +26,7 @@ Abstract:
 #include "EdkIIGlueProcessorBind.h"

 //
-// Declarations of dependencies among EdkII Glue Library instances and R8 Libraries
+// Declarations of dependencies among EDKII Glue Library instances and EDK Libraries
 // Pay attention to the order of following #define structures
 //

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -16,7 +16,7 @@ Module Name:
  
 Abstract: 

-  This file is used by .dxs file. To write common .dxs for R8.x and R9, a 
+  This file is used by .dxs file. To write common .dxs for EDK and EDKII, a 
  header file named DxeDepex.h musted be present. 

 --*/
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -49,7 +49,7 @@ Abstract:
 #include "EdkIIGlueProcessorBind.h"

 //
-// Some Status Code data type definitions are in TianoSpecTypes.h in R8.5
+// Some Status Code data type definitions are in TianoSpecTypes.h in EDK
 //
 #if (TIANO_RELEASE_VERSION <= 0x00080005)
 #include "TianoSpecTypes.h"
@@ -57,7 +57,7 @@ Abstract:
 #include "EfiStatusCode.h"

 //
-// R8.x Library headers used by EdkII Glue Libraries
+// EDK Library headers used by EdkII Glue Libraries
 //
 #include "LinkedList.h"
 #include "EfiCommonLib.h"
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -238,7 +238,7 @@ Abstract:
 #endif

 //
-// R8.x Library headers used by EdkII Glue Libraries
+// EDK Library headers used by EDKII Glue Libraries
 //
 #include "EfiDriverLib.h"
 #include "EfiCapsule.h"
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -142,7 +142,7 @@ Abstract:

 #if (TIANO_RELEASE_VERSION > 0x00080005) 
 //
-// Need due to R8.5 Tiano contamination of UEFI enumes. 
+// Need due to EDK Tiano contamination of UEFI enumes. 
 // There is a UEFI library that does things the new way and the old way
 // This is why these definitions are need in Uefi.h
 //
@@ -151,7 +151,7 @@ Abstract:
 #endif

 //
-// R8.x Library headers used by EdkII Glue Libraries
+// EDK Library headers used by EdkII Glue Libraries
 //
 #include "TianoSpecTypes.h"
 #include "TianoSpecApi.h"
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -24,7 +24,7 @@ Abstract:
 #define __EDKII_GLUE_DEBUG_LIB_H__

 //
-// To use EdkII code, these R8.x macros are undefined
+// To use EDKII code, these EDK macros are undefined
 //
 #undef ASSERT
 #undef DEBUG
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -16,7 +16,7 @@ Module Name:
  
 Abstract: 

-  This file is used by .dxs file. To write common .dxs for R8.x and R9, a 
+  This file is used by .dxs file. To write common .dxs for EDK and EDKII, a 
  header file named PeimDepex.h musted be present. 

 --*/
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2011, 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -54,7 +54,7 @@ COMPONENT_TYPE  = LIBRARY
  EdkIIGlueBaseMemoryLib
  EdkIIGlueUefiLib
 #
-# R8.x Library, GUID needed: gEfiHobListGuid
+# EDK Library, GUID needed: gEfiHobListGuid
 #  
  EdkFrameworkGuidLib

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2011, 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -61,7 +61,7 @@ COMPONENT_TYPE  = LIBRARY
 # when EFI_SPECIFICATION_VERSION < 0x00020000, gRT is used
 # 
  EdkIIGlueUefiRuntimeServicesTableLib
-# R8.x lib
+# EDK lib
  EfiProtocolLib
 # Possibly, gEfiCallerIdGuid might be used.
  EdkGuidLib
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2011, 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -66,7 +66,7 @@ COMPONENT_TYPE  = LIBRARY
  EdkIIGlueBaseLib
  EdkIIGlueUefiBootServicesTableLib
 #
-# R8.x Library
+# EDK Library
 #  
  EfiProtocolLib

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2011, 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -56,7 +56,7 @@ COMPONENT_TYPE  = LIBRARY
  EdkIIGlueBaseLib
  EdkIIGlueBaseMemoryLib
 #
-# R8.x
+# EDK Library
 #
  EdkFrameworkGuidLib
 #
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf
@@ -1,6 +1,6 @@
 #/*++
 #
-# Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2011, 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -63,7 +63,7 @@ COMPONENT_TYPE  = LIBRARY
 # when EFI_SPECIFICATION_VERSION < 0x00020000, gRT is used
 # 
  EdkIIGlueUefiRuntimeServicesTableLib
-# R8.x lib
+# EDK lib
  EfiProtocolLib
 # Possibly, gEfiCallerIdGuid might be used.
  EdkGuidLib
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -19,7 +19,7 @@ Abstract:

  Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the
  oldconflicts with library functions and supporting implementations of the old 
-  (R8.5/EFI 1.10) and new (EdkII/UEFI 2.0) way.
+  (EFI 1.10) and new (EdkII/UEFI 2.0) way.

 --*/

--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c
@@ -1,6 +1,6 @@
 /*++

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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
 which accompanies this distribution.  The full text of the license may be found at
@@ -211,8 +211,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification by 
  declaring a GUID for the legacy boot event class. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)
@@ -290,8 +289,7 @@ Routine Description:
  This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was
  added and now it's possible to not voilate the UEFI specification and use 
  the ready to boot event class defined in UEFI 2.0. This library supports
-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 
-  work both ways.
+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 Arguments:
  ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)