11 files changed, 45 insertions, 45 deletions
diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
index 5907a516e9..9d9f503dbc 100644
--- a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  This is the shell application
 #
-#  Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>
+#  Copyright (c) 2009- 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
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index 5a676b0e3a..3058cd1237 100644
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Sample UEFI Application Reference EDKII Module
 #
 #  This is a simple shell application
 #
-#  Copyright (c) 2009-2010, Intel Corporation.  All rights reserved. <BR>
+#  Copyright (c) 2009- 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
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010005
diff --git a/ShellPkg/Application/ShellLibTestApp/SA3.inf b/ShellPkg/Application/ShellLibTestApp/SA3.inf
index 46cef22e52..ce9ee79b38 100644
--- a/ShellPkg/Application/ShellLibTestApp/SA3.inf
+++ b/ShellPkg/Application/ShellLibTestApp/SA3.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
 #  Sample UEFI Application Reference EDKII Module
 #
 #  This is a simple shell application
 #
-#  Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>
+#  Copyright (c) 2009- 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
@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010005
diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
index 1fcc6c5471..a00216c12f 100644
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #  This is the shell sorting testing application
 #
-#  Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>
+#  Copyright (c) 2009- 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
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
index d689a861ca..14a8519986 100644
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Provides interface to shell functionality for shell commands and applications.
 #
 # Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
@@ -25,7 +25,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   BaseFileHandleLib.c
 
 [Packages]
@@ -46,5 +46,5 @@
 [Guids]
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED
 
-[Pcd.common]
+[Pcd]
   gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize # ALWAYS_CONSUMED
diff --git a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
index dc7b12365a..3da8e76477 100644
--- a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
+++ b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #   Library used for sorting routines.
 #
-#  Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>
+#  Copyright (c) 2009- 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
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
@@ -25,7 +25,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   BaseSortLib.c
 
 [Packages]
@@ -42,4 +42,4 @@
 
 [Guids]
 
-[Pcd.common]
+[Pcd]
diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
index 8cb3b59b91..f0f901ec7d 100644
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 #  Provides interface to shell functionality for shell commands and applications.
 #
 #  Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
@@ -25,7 +25,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   UefiShellCEntryLib.c
 
 [Packages]
@@ -43,5 +43,5 @@
 
 [Guids]
 
-[Pcd.common]
+[Pcd]
 
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index 5aefe00893..61ad97a8cb 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
 # Provides interface to shell functionality for shell commands and applications.
 #
 # Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved. <BR>
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   UefiShellLib.c
   UefiShellLib.h
 
@@ -63,6 +63,6 @@
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED
   gEfiShellEnvironment2ExtGuid                  # ALWAYS_CONSUMED
 
-[Pcd.common]
+[Pcd]
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED
   gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED
diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
index f8f1bb43a8..73fd571794 100644
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 #   Library used for sorting routines.
 #
-#  Copyright (c) 2009, Intel Corporation. All rights reserved. <BR>
+#  Copyright (c) 2009 - 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
@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010006
@@ -25,7 +25,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   UefiSortLib.c
 
 [Packages]
@@ -46,4 +46,4 @@
 
 [Guids]
 
-[Pcd.common]
+[Pcd]
diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index ed70d6bfe5..915f4c2517 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -2,7 +2,7 @@
 #
 # This Package provides all definitions for EFI and UEFI Shell
 #
-# Copyright (c) 2009, Intel Corporation.
+# Copyright (c) 2009 - 2010, Intel Corporation.
 #
 # All rights reserved.
 # This program and the accompanying materials are licensed and made available under
@@ -23,10 +23,10 @@
   PACKAGE_VERSION                = 0.2
 
 
-[Includes.common]
+[Includes]
   Include
 
-[LibraryClasses.common]
+[LibraryClasses]
   ##  @libraryclass  Provides most Shell APIs.
   #                  Only available for Shell applications
   ##
@@ -46,11 +46,11 @@
   SortLib|Include/Library/Sortlib.h
 
 
-[Guids.common]
+[Guids]
   gEfiShellEnvironment2ExtGuid    = {0xd2c18636, 0x40e5, 0x4eb5, {0xa3, 0x1b, 0x36, 0x69, 0x5f, 0xd4, 0x2c, 0x87}}
   gEfiShellPkgTokenSpaceGuid	  = {0x171e9188, 0x31d3, 0x40f5, {0xb1, 0x0c, 0x53, 0x9b, 0x2d, 0xb9, 0x40, 0xcd}}
 
-[Protocols.common]
+[Protocols]
   gEfiShellProtocolGuid           = {0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e}}
   gEfiShellParametersProtocolGuid = {0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca}}
   gEfiShellEnvironment2Guid       = {0x47c7b221, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 86c6c82829..e9d45ffd3d 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
-#/** @file
+## @file
 # Shell Package
 #
-# Copyright (c) 2007 - 2008, Intel Corporation
+# Copyright (c) 2007 - 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
@@ -11,7 +11,7 @@
 #    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#**/
+##
 
 [Defines]
   PLATFORM_NAME                  = Shell
@@ -23,7 +23,7 @@
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
 
-[LibraryClasses.common]
+[LibraryClasses]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
@@ -43,9 +43,9 @@
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
   SortLib|ShellPkg/Library/BaseSortLib/BaseSortLib.inf
 
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
 
-[Components.common]
+[Components]
   ShellPkg/Application/ShellExecTestApp/SA.inf
   ShellPkg/Application/ShellLibTestApp/SA3.inf
   ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf