From 510f154ea26776aab01f6cfe295b21bb6b2a2aa8 Mon Sep 17 00:00:00 2001
From: Hess Chen <hesheng.chen@intel.com>
Date: Fri, 19 Jun 2015 00:05:25 +0000
Subject: [PATCH] BaseTools/Upt: Update help message

Update help message of UPT to remove Intel(R) from the string.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: lhauch <larry.hauch@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17662 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Source/Python/UPT/Logger/StringTable.py | 8 ++++----
 BaseTools/Source/Python/UPT/UPT.py                | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/BaseTools/Source/Python/UPT/Logger/StringTable.py b/BaseTools/Source/Python/UPT/Logger/StringTable.py
index a3cf29329c..5cc7b1496f 100644
--- a/BaseTools/Source/Python/UPT/Logger/StringTable.py
+++ b/BaseTools/Source/Python/UPT/Logger/StringTable.py
@@ -32,7 +32,7 @@ import gettext
 _ = gettext.gettext
 
 MSG_USAGE_STRING = _("\n"
-    "Intel(r) UEFI Packaging Tool (Intel(r) UEFIPT)\n"
+    "UEFI Packaging Tool (UEFIPT)\n"
     "%prog [options]"
     )
 
@@ -40,12 +40,12 @@ MSG_USAGE_STRING = _("\n"
 # Version and Copyright
 #
 MSG_VERSION_NUMBER = _("1.0")
-MSG_VERSION = _("Intel(r) UEFI Packaging Tool (Intel(r) UEFIPT) - Revision " + \
+MSG_VERSION = _("UEFI Packaging Tool (UEFIPT) - Revision " + \
                 MSG_VERSION_NUMBER)
-MSG_COPYRIGHT = _("Copyright (c) 2011 Intel Corporation All Rights Reserved.")
+MSG_COPYRIGHT = _("Copyright (c) 2011 - 2015 Intel Corporation All Rights Reserved.")
 MSG_VERSION_COPYRIGHT = _("\n  %s\n  %s" % (MSG_VERSION, MSG_COPYRIGHT))
 MSG_USAGE = _("%s [options]\n%s" % ("UPT", MSG_VERSION_COPYRIGHT))
-MSG_DESCRIPTION = _("The Intel(r) UEFIUPT is used to create, " + \
+MSG_DESCRIPTION = _("The UEFIUPT is used to create, " + \
                     "install or remove a UEFI Distribution Package.")
 
 
diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/UPT/UPT.py
index 23aff1c46d..e7b0a8f264 100644
--- a/BaseTools/Source/Python/UPT/UPT.py
+++ b/BaseTools/Source/Python/UPT/UPT.py
@@ -2,7 +2,7 @@
 #
 # This file is the main entry for UPT 
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2015, 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 
@@ -50,13 +50,6 @@ from Library import GlobalData
 from Core.IpiDb import IpiDatabase
 from BuildVersion import gBUILD_VERSION
 
-##
-# Version and Copyright
-#
-#VersionNumber = "1.0"
-#__version__ = "Revision " + VersionNumber
-#__copyright__ = "Copyright (c) 2011 Intel Corporation All Rights Reserved."
-
 ## CheckConflictOption
 #
 # CheckConflictOption
-- 
2.39.2