From 40d841f6a8f84e75409178e19e69b95e01bada0f Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 18 May 2010 05:04:32 +0000
Subject: Sync EDKII BaseTools to BaseTools project r1971

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10502 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Conf/XMLSchema/DistributionPackage.xsd     | 6 +++---
 BaseTools/Conf/XMLSchema/FarManifest.xsd             | 4 ++--
 BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd | 4 ++--
 BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd   | 4 ++--
 BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd      | 4 ++--
 BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd        | 4 ++--
 BaseTools/Conf/XMLSchema/NamingConvention.xsd        | 4 ++--
 BaseTools/Conf/XMLSchema/SurfaceArea.xsd             | 4 ++--
 BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig       | 4 ++--
 BaseTools/Conf/XMLSchema/WorkspaceContent.xsd        | 2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'BaseTools/Conf/XMLSchema')

diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
index 23cce9555b..b7cda67cda 100644
--- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
+++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Filename: DistributionPackage.xsd
 
-Copyright (c) 2008, Intel Corp.  All rights reserved.
+Copyright (c) 2008, 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 may be found at 
@@ -230,7 +230,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 							code provided in the distribution file. Alternatively, this may
 							point to a filename that contains the License. The file (included
 							in the content zip file) will be stored in the same location as
-							the distribution package’s .pkg file. </xs:documentation>
+							the distribution package's .pkg file. </xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element minOccurs="1" maxOccurs="1" name="Abstract"
diff --git a/BaseTools/Conf/XMLSchema/FarManifest.xsd b/BaseTools/Conf/XMLSchema/FarManifest.xsd
index 6e7573464a..6e8c34ae9a 100644
--- a/BaseTools/Conf/XMLSchema/FarManifest.xsd
+++ b/BaseTools/Conf/XMLSchema/FarManifest.xsd
@@ -2,8 +2,8 @@
 <!--
 Filename: FarManifest.xsd
 
-Copyright (c) 2007, Intel Corp.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
 
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
index d40561e4f7..eeb48d9a8a 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
@@ -3,8 +3,8 @@
   <!--
     Filename: FrameworkDataAttributes.xsd
     
-    Copyright (c) 2007, Intel Corp.
-    All rights reserved. This program and the accompanying materials
+    Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
index 12bba93d40..e094c1b626 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
@@ -3,8 +3,8 @@
   <!--
     Filename: FrameworkDataElements.xsd
     
-    Copyright (c) 2007, Intel Corp.
-    All rights reserved. This program and the accompanying materials
+    Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
index 18db60888a..9a46a02a2e 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
@@ -3,8 +3,8 @@
   <!--
     Filename: FrameworkDataTypes.xsd
     
-    Copyright (c) 2007, Intel Corp.
-    All rights reserved. This program and the accompanying materials
+    Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd b/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
index 6927c7bcca..e2745af378 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
@@ -3,9 +3,9 @@
   <!--
     Filename: FrameworkHeaders.xsd
     
-    Copyright (c) 2007, Intel Corp.
+    Copyright (c) 2007, Intel Corporation. All rights reserved.
 
-    All rights reserved. This program and the accompanying materials
+    This program and the accompanying materials
     are licensed and made available under the terms and conditions of the BSD License
     which may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/NamingConvention.xsd b/BaseTools/Conf/XMLSchema/NamingConvention.xsd
index 809f1a8485..8a76639777 100644
--- a/BaseTools/Conf/XMLSchema/NamingConvention.xsd
+++ b/BaseTools/Conf/XMLSchema/NamingConvention.xsd
@@ -3,8 +3,8 @@
   <!--
     Filename: NamingConvention.xsd
     
-    Copyright (c) 2007, Intel Corp.
-    All rights reserved. This program and the accompanying materials
+    Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd b/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
index f95de26b1a..c941be81e7 100644
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
+++ b/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
@@ -3,8 +3,8 @@
   <!--
     Filename: SurfaceArea.xsd
     
-    Copyright (c) 2007, Intel Corp.
-    All rights reserved. This program and the accompanying materials
+    Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
     
diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig b/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
index c2fdaf8293..5d86b98fe7 100644
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
+++ b/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2007, Intel Corp.
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2007, 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 may be found at http://opensource.org/licenses/bsd-license.php
 
diff --git a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd b/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
index 8809792ac4..1c9491a5e6 100644
--- a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
+++ b/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
@@ -2,7 +2,7 @@
 <!--
     Filename: WorkspaceContent.xsd
     
-    Copyright (c) 2008, Intel Corp.  All rights reserved.
+    Copyright (c) 2008, 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 may be found at 
-- 
cgit v1.2.3