Topics

[PATCH 1/1] BaseTools: Update license of UserManuals files


Yuwei Chen
 

Hi, Liming

Agree with you. I will remove the BaseTools\UserManuals folder as developers have the way to get the help message.

Thanks
Yuwei

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
gaoliming
Sent: Monday, September 28, 2020 10:37 PM
To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@...>
Cc: Feng, Bob C <bob.c.feng@...>
Subject: 回复: [edk2-devel] [PATCH 1/1] BaseTools: Update license of
UserManuals files

Yuwei:
Another option is to remove those manual files. Those manual files are very
old. They are out of maintain. I suggest to remove them all. The developer
can type --help to find tool help message.

Thanks
Liming
-----邮件原件-----
发件人: bounce+27952+65678+4905953+8761045@groups.io
<bounce+27952+65678+4905953+8761045@groups.io> 代表 Yuwei Chen
发送时间: 2020年9月28日 16:51
收件人: devel@edk2.groups.io
抄送: Bob Feng <bob.c.feng@...>; Liming Gao
<gaoliming@...>
主题: [edk2-devel] [PATCH 1/1] BaseTools: Update license of UserManuals
files

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2890

All files in BaseTools\UserManuals directory still use old BSD license.
Update to new SPDX-License-Identifier: BSD-2-Clause-Patent license.

Signed-off-by: Yuwei Chen <yuwei.chen@...>
Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
---
BaseTools/UserManuals/Build_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf | 4 ++-
-
BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf | 4
++--
BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/Trim_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/UtilityManPage_template.rtf | 4 ++--
BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf | 4 ++--
20 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
b/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
index 4b8f78abd297..3246f2b7190e 100644
--- a/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
@@ -351,11 +351,11 @@ ent working directory if it contains a module
description file and specify the p
\fs18\cf1\insrsid11224689 \hich\af43\dbch\af13\loch\f43 , Intel
Corporation. All rights reserved.
\par
\par \hich\af43\dbch\af13\loch\f43 This program and the accompanying
materials are licensed and made available under the terms and -\par
\hich\af43\dbch\af13\loch\f43 conditions of the BSD License which
accompanies this distribution. The full text of the license may be
+\par \hich\af43\dbch\af13\loch\f43 conditions of the
+BSD-2-Clause-Patent
License which accompanies this distribution. The full text of the
license
may
be
\par \hich\af43\dbch\af13\loch\f43 found at:
\par \hich\af43\dbch\af13\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af13\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER
THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+\par \hich\af43\dbch\af13\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER
THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, WITHOUT
WARRANTIES \par \hich\af43\dbch\af13\loch\f43 OR
RE\hich\af43\dbch\af13\loch\f43 PRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
b/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
index adc3695f44d1..6865ebdcbe80 100644
--- a/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
@@ -163,11 +163,11 @@ ec File1.efi File2.efi \hich\f43 \endash
\loch\f43 b Legacy.bin
\fs18\cf1\insrsid10945130 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
1999 - 20}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid143575
\hich\af43\dbch\af31505\loch\f43 11}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid10945130
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the
term\hich\af43\dbch\af31505\loch\f43 s and conditions of the BSD
License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the
term\hich\af43\dbch\af31505\loch\f43 s and conditions of the
BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT
WARRANTIES\hich\af43\dbch\af31505\loch\f43 OR REPRESENTATIONS OF
ANY
KIND, EITHER EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
index e111894b0830..35eab2f0ef36 100644
--- a/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
@@ -188,11 +188,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid1192848
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid6386813 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid11760870
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials -\par \hich\af43\dbch\af31505\loch\f43 are
licensed and made available under the terms and conditions of the BSD
License
+\par \hich\af43\dbch\af31505\loch\f43 are licensed and made available
under the terms and conditions of the BSD-2-Clause-Patent License
\par \hich\af43\dbch\af31505\loch\f43 which accompanies this
distribution.
The full text of the license may be found at \par
\hich\af43\dbch\af31505\loch\f43
http:\hich\af43\dbch\af31505\loch\f43
//opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid11760870
\par diff --git a/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
index 2cce9d5d46b4..fcb0ae3b7ae3 100644
--- a/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
@@ -218,11 +218,11 @@ inary PI dependency expression into the output
test.depex.}{\rtlch\fcs1 \af0\afs
\fs18\cf1\insrsid11362432 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid1516182
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation.
A\hich\af43\dbch\af31505\loch\f43 ll rights reserved.

\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/lic\hich\af43\dbch\af31505\loch\f43
enses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1516182
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid1516182
diff --git a/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
index 9192bb699e2d..e31c4189d2d8 100644
--- a/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
@@ -296,10 +296,10 @@ Build\\Nt32\\Debug_MyTools. ActivePlatform is
C:\\work\\EdkII\\Nt32Pkg\\Nt32Pkg
\fs18\cf1\insrsid5513321 \hich\af41\dbch\af13\loch\f41 Copyright (c)
1999
- }{\rtlch\fcs1 \af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid13310497
\hich\af41\dbch\af13\loch\f41 201}{\rtlch\fcs1 \af41\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid9519395
\hich\af41\dbch\af13\loch\f41 1}{\rtlch\fcs1 \af41\afs18 \ltrch\fcs0
\fs18\cf1\insrsid5513321 \hich\af41\dbch\af13\loch\f41 , Intel
Corporation.
All rights reserved.
\par \hich\af41\dbch\af13\loch\f41 This program and the accompanying
materials are licensed and made available -\par
\hich\af41\dbch\af13\loch\f41 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af41\dbch\af13\loch\f41 under the terms and conditions of
+the
BSD-2-Clause-Patent License which accompanies this \par
\hich\af41\dbch\af13\loch\f41 distribution. The full text of the
license may be found at \par }\pard \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1
\af41\afs18 \ltrch\fcs0 \fs18\insrsid5513321
\hich\af41\dbch\af13\loch\f41
htt\hich\af41\dbch\af13\loch\f41
p://opensource.org/licenses/bsd-license.php}{\rtlch\fcs1
-\af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid5513321
\hich\af41\dbch\af13\loch\f41 . THE PROGRAM IS DISTRIBUTED UNDER THE
BSD LICENSE ON AN "AS IS" BASIS,WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid5513321
\hich\af41\dbch\af13\loch\f41 . THE PROGRAM IS DISTRIBUTED UNDER THE
BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS,WITHOUT
WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }\pard \ltrpar\ql
\li60\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin60\itap0
{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid5513321 \par
}{\*\themedata
504b030414000600080000002100828abc13fa0000001c020000130000005b4
36f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d
8

72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74
231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
diff --git a/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
index 7f0c34043c3d..38b58d20deda 100644
--- a/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
@@ -207,11 +207,11 @@
edk2-buildtools-devel@lists\hich\af43\dbch\af31505\loch\f43
.sourceforge.n et}{\r
\fs18\cf1\insrsid2566036 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid7959743
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid11368657
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid2566036 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accomp\hich\af43\dbch\af31505\loch\f43 anies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which
accomp\hich\af43\dbch\af31505\loch\f43 anies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid2566036
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS
\hich\af43\dbch\af31505\loch\f43 OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
index aed26c05ab1e..1d8bb8ad66f8 100644
--- a/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
@@ -282,11 +282,11 @@
edk2-buildtools-devel@lists.\hich\af43\dbch\af31505\loch\f43
sourceforge.net}{\r
\fs18\cf1\insrsid4195908 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - 201}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid16349543
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid4195908 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompa\hich\af43\dbch\af31505\loch\f43 nies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which
accompa\hich\af43\dbch\af31505\loch\f43 nies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid4195908
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
index f4235b77fbce..837702c85d31 100644
--- a/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
@@ -248,11 +248,11 @@ hiibinpackage SampleStr.hpk
SampleVfr.hpk}{\rtlch\fcs1 \ab\af0\afs18 \ltrch\fcs0 \par
}\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af0\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\langn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid15604690 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid8459339
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
distr\hich\af43\dbch\af31505\loch\f43 ibution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid8459339
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid8459339
diff --git
a/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
index c16b06e19561..d1833133dda1 100644
--- a/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
@@ -142,11 +142,11 @@ e found patchable PCD information, which
includes PcdName, Offset in EFI image a \par }\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af0\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\langn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid8260129 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2008 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid9178819
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licen\hich\af43\dbch\af31505\loch\f43 sed
and made available -\par \hich\af43\dbch\af31505\loch\f43 under the
terms and conditions of the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9178819
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid9178819
diff --git a/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
index fea5009beb7c..334e015d2388 100644
--- a/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
@@ -276,11 +276,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11342878 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid4944739
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid9642788
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11342878 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
dist\hich\af43\dbch\af31505\loch\f43 ribution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid11342878
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git
a/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
b/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
index 5ed136550685..127e2ba973da 100644
--- a/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
+++ b/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
@@ -474,13 +474,13 @@ Distribution Package (.dist) for install and
create, along with the Package Info
\fs18\cf1\insrsid9138298 \hich\af39\dbch\af31505\loch\f39 \hich\f39
Copyright\'a9\loch\f39 2011}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\cf1\revised\revauth1\revdttm1196637062\insrsid2038300
\hich\af39\dbch\af31505\loch\f39 - 2017}{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 Intel Corporation. All rights
reserved}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid9138298 .
\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 This
progra\hich\af39\dbch\af31505\loch\f39
-m 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:}{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0
+m and the accompanying materials are licensed and made available
+under
the terms and conditions of the BSD-2-Clause-Patent License which
accompanies this distribution. The full text of the license may be
found
at:}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\f0\fs18\cf1\insrsid9138298 \line }{\rtlch\fcs1 \af39\afs18
\ltrch\fcs0
\fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 }{\field{\*\fldinst {\rtlch\fcs1
\af39\afs18 \ltrch\fcs0 \fs18\insrsid9138298
\hich\af39\dbch\af31505\loch\f39
HYPERLINK
"http://opensource.org/licenses/bsd-license.ph\hich\af39\dbch\af31505\
loc
h\f39 p"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\insrsid2707436
{\*\datafield

00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bac
e118c8200aa004ba90b7600000068007400740070003a002f002f006f007000
65006e0073006f0075007200630065002e006f00720067002f006c006900630
065006e007300650073002f006200730064002d006c006900630065006e007
300

65002e007000680070000000795881f43b1d7f48af2c825dc48527630000000
0a5ab0000334900}}}{\fldrslt {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\ul\cf2\insrsid9138298 \hich\af39\dbch\af31505\loch\f39
http://opensource.org/licenses/bsd-license.php}}}\sectd \ltrsect
\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\cf1\insrsid9138298 \hich\af39\dbch\af31505\loch\f39
}{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid9138298 -\par \line
}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED UNDER
THE
BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\par \line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
+\fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED UNDER
THE
BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, WITHOUT
WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af39\afs16 \ltrch\fcs0 \fs16\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 Revision 1.}{\rtlch\fcs1 \af39\afs16
\ltrch\fcs0
\deleted\fs16\cf1\revauthdel1\revdttmdel1196637062\insrsid10246519\del
r
sid2038300
\hich\af39\dbch\af31505\loch\f39 5}{\rtlch\fcs1 \af39\afs16
\ltrch\fcs0
\fs16\cf1\revised\revauth1\revdttm1196637062\insrsid2038300
\hich\af39\dbch\af31505\loch\f39 6}{\rtlch\fcs1 \af39\afs16
\ltrch\fcs0
\fs16\cf1\insrsid9138298
diff --git a/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
b/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
index e4f493f3e368..0c3033136c0f 100644
--- a/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
@@ -234,11 +234,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0

\deleted\fs18\cf1\lang1033\langfe2052\revauthdel1\revdttmdel1191392171
\langfenp2052\insrsid11874792\delrsid12003746
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid5140827 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials -\par \hich\af43\dbch\af31505\loch\f43 are
license\hich\af43\dbch\af31505\loch\f43 d and made available under the
terms and conditions of the BSD License
+\par \hich\af43\dbch\af31505\loch\f43 are
license\hich\af43\dbch\af31505\loch\f43 d and made available under the
terms and conditions of the BSD-2-Clause-Patent License \par
\hich\af43\dbch\af31505\loch\f43 which accompanies this
distribution.
The full text of the license may be found at \par
\hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN\hich\af43\dbch\af31505\loch\f43 "AS IS"
BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON
AN\hich\af43\dbch\af31505\loch\f43 "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid5140827
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
b/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
index 80bcb2c2298d..a9b9b147197e 100644
--- a/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
@@ -132,11 +132,11 @@ e.}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\f0\fs18\cf1\insrsid14894574
\par }\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af31507\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\langn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid14894574 \hich\af43\dbch\af31505\loch\f43 Copyright
(c) 2010, Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and
made\hich\af43\dbch\af31505\loch\f43
available
-\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
of the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS"\hich\af43\dbch\af31505\loch\f43
BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS
IS"\hich\af43\dbch\af31505\loch\f43 BASIS, \par }\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14894574
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid14894574
diff --git a/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
b/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
index 0fe568a5117c..86bb90426774 100644
--- a/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
@@ -200,11 +200,11 @@ The action was completed as
requested.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \kerning2\i
\ltrch\fcs0 \fs18\cf1\insrsid11539687
\hich\af39\dbch\af31505\loch\f39 Copyright (c) 1999 - }{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0
\fs18\cf1\insrsid5577864 \hich\af39\dbch\af31505\loch\f39
201}{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid11229351
\hich\af39\dbch\af31505\loch\f39 1}{\rtlch\fcs1 \af39\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11539687 \hich\af39\dbch\af31505\loch\f39 , Intel
Corporation. All rights reserved.
\par \hich\af39\dbch\af31505\loch\f39 This program and the
accompanying materials are licensed and made available -\par
\hich\af39\dbch\af31505\loch\f39 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af39\dbch\af31505\loch\f39 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af39\dbch\af31505\loch\f39 distribution. The full text of the
license may be found at \par \hich\af39\dbch\af31505\loch\f39
http://opensource.org/licenses/bsd-license.ph\hich\af39\dbch\af31505\l
och
\f39 p
\par
-\par \hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,WITHOUT WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\par \hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS,WITHOUT
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
\par }\pard \ltrpar\ql
\li60\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin60\itap0
{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid11539687 \par
}{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
b/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
index e3965dd2c336..394aa9742d0b 100644
--- a/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
@@ -214,11 +214,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid1639664 \hich\af43\dbch\af31505\loch\f43 Copyright
\hich\af43\dbch\af31505\loch\f43 (c) 2007 - }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0 \fs18\cf1\insrsid14895404 \hich\af43\dbch\af31505\loch\f43
201}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid7558875
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid1639664 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1639664
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid1639664
diff --git a/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
b/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
index 68cefeb9d1e7..60b9a18bf309 100644
--- a/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
@@ -190,11 +190,11 @@
edk2-buildtools-devel@...\hich\af43\dbch\af31505\loch
\f4
3 t}{\r
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid5856265
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid6034337 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6454980
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
dis\hich\af43\dbch\af31505\loch\f43 tribution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
b/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
index 4dbc118718a3..e469d6286429 100644
--- a/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
@@ -219,11 +219,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid8606769
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid8651272 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6643493
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
htt\hich\af43\dbch\af31505\loch\f43
p://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6643493
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid6643493
diff --git a/BaseTools/UserManuals/UtilityManPage_template.rtf
b/BaseTools/UserManuals/UtilityManPage_template.rtf
index 08e19805210f..0a280869eb91 100644
--- a/BaseTools/UserManuals/UtilityManPage_template.rtf
+++ b/BaseTools/UserManuals/UtilityManPage_template.rtf
@@ -78,11 +78,11 @@ depends on(optional) - None. if not needed \par
}\pard \ltrpar\ql
\li-1440\ri0\sb400\sa60\sl-340\slmult0\nowidctlpar\tx1440\wrapdefault\
faa
uto\rin0\lin-1440\itap0 {\rtlch\fcs1 \ab\af258\afs28 \ltrch\fcs0
\b\f258\fs28\cf17\insrsid5246601 \hich\af258\dbch\af31505\loch\f258
License
\par }\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \f43\fs18\insrsid5246601
\hich\af43\dbch\af31505\loch\f43 Copyright (c) 1999 - 2007, Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and
ma\hich\af43\dbch\af31505\loch\f43 de available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \f43\fs18\insrsid5246601
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
b/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
index 2b056f8f2660..402433fcbbc4 100644
--- a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
@@ -220,11 +220,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1204842
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid12476259
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and conditions
+of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490
\hich\af43\dbch\af31505\loch\f43 WITH\hich\af43\dbch\af31505\loch\f43
OUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
OR
IMPLIED.
\par }\pard \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1
\af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid14166490 diff --git
a/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
b/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
index 88c6a84b4ea2..9fc617a71160 100644
--- a/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
@@ -178,11 +178,11 @@ tool, 2) a name for the tool, and 3) the path to
the tool executable. An example
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available under the terms
andconditions of the B\hich\af43\dbch\af31505\loch\f43 -SD License
which accompanies this distribution. The full text of the
license
may befound at:}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid14511453\delrsid14511453
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
+SD-2-Clause-Patent License which accompanies this distribution. The
+full
text of the license may befound at:}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453\delrsid14511453
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453 \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
\par }\pard \ltrpar\ql
\li360\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0\pararsid13
8571
51 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14511453
\hich\af43\dbch\af31505\loch\f43
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
BASIS, WITHOUT WARRANTIES}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD-2-CLAUSE-PATENT
LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0 \fs18\cf1\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 OR REPRESENTATIONS OF
ANY\hich\af43\dbch\af31505\loch\f43 KIND, EITHER EXPRESS OR IMPLIED.
\par }\pard \ltrpar\ql
\li360\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid14511453\charrsid138
5
7151
\par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14511453
--
2.27.0.windows.1










Bob Feng
 

Liming,

I think some information is still valid and useful but not in the tool's help message, so I think we can just update license this time.

Thanks,
Bob

-----Original Message-----
From: Chen, Christine <yuwei.chen@...>
Sent: Tuesday, September 29, 2020 10:52 AM
To: devel@edk2.groups.io; gaoliming@...
Cc: Feng, Bob C <bob.c.feng@...>
Subject: RE: [edk2-devel] [PATCH 1/1] BaseTools: Update license of UserManuals files

Hi, Liming

Agree with you. I will remove the BaseTools\UserManuals folder as developers have the way to get the help message.

Thanks
Yuwei

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
gaoliming
Sent: Monday, September 28, 2020 10:37 PM
To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@...>
Cc: Feng, Bob C <bob.c.feng@...>
Subject: 回复: [edk2-devel] [PATCH 1/1] BaseTools: Update license of
UserManuals files

Yuwei:
Another option is to remove those manual files. Those manual files
are very old. They are out of maintain. I suggest to remove them all.
The developer can type --help to find tool help message.

Thanks
Liming
-----邮件原件-----
发件人: bounce+27952+65678+4905953+8761045@groups.io
<bounce+27952+65678+4905953+8761045@groups.io> 代表 Yuwei Chen
发送时间: 2020年9月28日 16:51
收件人: devel@edk2.groups.io
抄送: Bob Feng <bob.c.feng@...>; Liming Gao
<gaoliming@...>
主题: [edk2-devel] [PATCH 1/1] BaseTools: Update license of
UserManuals files

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2890

All files in BaseTools\UserManuals directory still use old BSD license.
Update to new SPDX-License-Identifier: BSD-2-Clause-Patent license.

Signed-off-by: Yuwei Chen <yuwei.chen@...>
Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
---
BaseTools/UserManuals/Build_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf | 4
++-
-
BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf | 4
++--
BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/Trim_Utility_Man_Page.rtf | 4
++--
BaseTools/UserManuals/UtilityManPage_template.rtf | 4 ++--
BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf | 4 ++--
BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf | 4 ++--
20 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
b/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
index 4b8f78abd297..3246f2b7190e 100644
--- a/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/Build_Utility_Man_Page.rtf
@@ -351,11 +351,11 @@ ent working directory if it contains a module
description file and specify the p
\fs18\cf1\insrsid11224689 \hich\af43\dbch\af13\loch\f43 , Intel
Corporation. All rights reserved.
\par
\par \hich\af43\dbch\af13\loch\f43 This program and the
accompanying materials are licensed and made available under the
terms and -\par
\hich\af43\dbch\af13\loch\f43 conditions of the BSD License which
accompanies this distribution. The full text of the license may be
+\par \hich\af43\dbch\af13\loch\f43 conditions of the
+BSD-2-Clause-Patent
License which accompanies this distribution. The full text of the
license
may
be
\par \hich\af43\dbch\af13\loch\f43 found at:
\par \hich\af43\dbch\af13\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af13\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER
THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+\par \hich\af43\dbch\af13\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER
THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, WITHOUT
WARRANTIES \par \hich\af43\dbch\af13\loch\f43 OR
RE\hich\af43\dbch\af13\loch\f43 PRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
b/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
index adc3695f44d1..6865ebdcbe80 100644
--- a/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/EfiRom_Utility_Man_Page.rtf
@@ -163,11 +163,11 @@ ec File1.efi File2.efi \hich\f43 \endash
\loch\f43 b Legacy.bin
\fs18\cf1\insrsid10945130 \hich\af43\dbch\af31505\loch\f43
Copyright
(c)
1999 - 20}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid143575
\hich\af43\dbch\af31505\loch\f43 11}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid10945130
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the
term\hich\af43\dbch\af31505\loch\f43 s and conditions of the BSD
License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the
term\hich\af43\dbch\af31505\loch\f43 s and conditions of the
BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT
WARRANTIES\hich\af43\dbch\af31505\loch\f43 OR REPRESENTATIONS OF
ANY
KIND, EITHER EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
index e111894b0830..35eab2f0ef36 100644
--- a/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenCrc32_Utility_Man_Page.rtf
@@ -188,11 +188,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid1192848
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid6386813 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid11760870
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials -\par \hich\af43\dbch\af31505\loch\f43 are
licensed and made available under the terms and conditions of the
BSD License
+\par \hich\af43\dbch\af31505\loch\f43 are licensed and made
+available
under the terms and conditions of the BSD-2-Clause-Patent License
\par \hich\af43\dbch\af31505\loch\f43 which accompanies this
distribution.
The full text of the license may be found at \par
\hich\af43\dbch\af31505\loch\f43
http:\hich\af43\dbch\af31505\loch\f43
//opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid11760870
\par diff --git
a/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
index 2cce9d5d46b4..fcb0ae3b7ae3 100644
--- a/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenDepex_Utility_Man_Page.rtf
@@ -218,11 +218,11 @@ inary PI dependency expression into the output
test.depex.}{\rtlch\fcs1 \af0\afs
\fs18\cf1\insrsid11362432 \hich\af43\dbch\af31505\loch\f43
Copyright
(c)
2007 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid1516182
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation.
A\hich\af43\dbch\af31505\loch\f43 ll rights reserved.

\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/lic\hich\af43\dbch\af31505\loch\f43
enses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1516182
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid1516182
diff --git a/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
index 9192bb699e2d..e31c4189d2d8 100644
--- a/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFds_Utility_Man_Page.rtf
@@ -296,10 +296,10 @@ Build\\Nt32\\Debug_MyTools. ActivePlatform is
C:\\work\\EdkII\\Nt32Pkg\\Nt32Pkg
\fs18\cf1\insrsid5513321 \hich\af41\dbch\af13\loch\f41 Copyright
(c)
1999
- }{\rtlch\fcs1 \af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid13310497
\hich\af41\dbch\af13\loch\f41 201}{\rtlch\fcs1 \af41\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid9519395
\hich\af41\dbch\af13\loch\f41 1}{\rtlch\fcs1 \af41\afs18 \ltrch\fcs0
\fs18\cf1\insrsid5513321 \hich\af41\dbch\af13\loch\f41 , Intel
Corporation.
All rights reserved.
\par \hich\af41\dbch\af13\loch\f41 This program and the
accompanying materials are licensed and made available -\par
\hich\af41\dbch\af13\loch\f41 under the terms and conditions of the
BSD License which accompanies this
+\par \hich\af41\dbch\af13\loch\f41 under the terms and conditions
+of the
BSD-2-Clause-Patent License which accompanies this \par
\hich\af41\dbch\af13\loch\f41 distribution. The full text of the
license may be found at \par }\pard \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1
\af41\afs18 \ltrch\fcs0 \fs18\insrsid5513321
\hich\af41\dbch\af13\loch\f41
htt\hich\af41\dbch\af13\loch\f41
p://opensource.org/licenses/bsd-license.php}{\rtlch\fcs1
-\af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid5513321
\hich\af41\dbch\af13\loch\f41 . THE PROGRAM IS DISTRIBUTED UNDER THE
BSD LICENSE ON AN "AS IS" BASIS,WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\af41\afs18 \ltrch\fcs0 \fs18\cf1\insrsid5513321
\hich\af41\dbch\af13\loch\f41 . THE PROGRAM IS DISTRIBUTED UNDER THE
BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS,WITHOUT
WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }\pard \ltrpar\ql
\li60\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin60\itap0
{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid5513321 \par
}{\*\themedata
504b030414000600080000002100828abc13fa0000001c020000130000005b4
36f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d
8

72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74
231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
diff --git a/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
index 7f0c34043c3d..38b58d20deda 100644
--- a/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFfs_Utility_Man_Page.rtf
@@ -207,11 +207,11 @@
edk2-buildtools-devel@lists\hich\af43\dbch\af31505\loch\f43
.sourceforge.n et}{\r
\fs18\cf1\insrsid2566036 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid7959743
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid11368657
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid2566036 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accomp\hich\af43\dbch\af31505\loch\f43 anies
this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which
accomp\hich\af43\dbch\af31505\loch\f43 anies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid2566036
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS
\hich\af43\dbch\af31505\loch\f43 OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
index aed26c05ab1e..1d8bb8ad66f8 100644
--- a/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFv_Utility_Man_Page.rtf
@@ -282,11 +282,11 @@
edk2-buildtools-devel@lists.\hich\af43\dbch\af31505\loch\f43
sourceforge.net}{\r
\fs18\cf1\insrsid4195908 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2007 - 201}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid16349543
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid4195908 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompa\hich\af43\dbch\af31505\loch\f43 nies
this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which
accompa\hich\af43\dbch\af31505\loch\f43 nies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid4195908
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
index f4235b77fbce..837702c85d31 100644
--- a/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenFw_Utility_Man_Page.rtf
@@ -248,11 +248,11 @@ hiibinpackage SampleStr.hpk
SampleVfr.hpk}{\rtlch\fcs1 \ab\af0\afs18 \ltrch\fcs0 \par
}\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af0\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\lan
gn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid15604690 \hich\af43\dbch\af31505\loch\f43
Copyright
(c)
2007 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid8459339
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
distr\hich\af43\dbch\af31505\loch\f43 ibution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid8459339
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid8459339
diff --git
a/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
index c16b06e19561..d1833133dda1 100644
--- a/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenPatchPcdTable_Utility_Man_Page.rtf
@@ -142,11 +142,11 @@ e found patchable PCD information, which
includes PcdName, Offset in EFI image a \par }\pard\plain
\ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af0\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\lan
gn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid8260129 \hich\af43\dbch\af31505\loch\f43 Copyright
(c)
2008 - 2011}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid9178819
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licen\hich\af43\dbch\af31505\loch\f43 sed
and made available -\par \hich\af43\dbch\af31505\loch\f43 under the
terms and conditions of the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9178819
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid9178819
diff --git a/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
b/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
index fea5009beb7c..334e015d2388 100644
--- a/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/GenSec_Utility_Man_Page.rtf
@@ -276,11 +276,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11342878 \hich\af43\dbch\af31505\loch\f43
Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid4944739
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid9642788
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11342878 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
dist\hich\af43\dbch\af31505\loch\f43 ribution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid11342878
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git
a/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
b/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
index 5ed136550685..127e2ba973da 100644
--- a/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
+++ b/BaseTools/UserManuals/Intel_UEFI_Packaging_Tool_Man_Page.rtf
@@ -474,13 +474,13 @@ Distribution Package (.dist) for install and
create, along with the Package Info
\fs18\cf1\insrsid9138298 \hich\af39\dbch\af31505\loch\f39 \hich\f39
Copyright\'a9\loch\f39 2011}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\cf1\revised\revauth1\revdttm1196637062\insrsid2038300
\hich\af39\dbch\af31505\loch\f39 - 2017}{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 Intel Corporation. All rights
reserved}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid9138298 .
\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 This
progra\hich\af39\dbch\af31505\loch\f39
-m 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:}{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0
+m and the accompanying materials are licensed and made available
+under
the terms and conditions of the BSD-2-Clause-Patent License which
accompanies this distribution. The full text of the license may be
found
at:}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\f0\fs18\cf1\insrsid9138298 \line }{\rtlch\fcs1 \af39\afs18
\ltrch\fcs0
\fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 }{\field{\*\fldinst {\rtlch\fcs1
\af39\afs18 \ltrch\fcs0 \fs18\insrsid9138298
\hich\af39\dbch\af31505\loch\f39
HYPERLINK
"http://opensource.org/licenses/bsd-license.ph\hich\af39\dbch\af3150
5\
loc
h\f39 p"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\insrsid2707436
{\*\datafield

00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bac
e118c8200aa004ba90b7600000068007400740070003a002f002f006f007000
65006e0073006f0075007200630065002e006f00720067002f006c006900630
065006e007300650073002f006200730064002d006c006900630065006e007
300

65002e007000680070000000795881f43b1d7f48af2c825dc48527630000000
0a5ab0000334900}}}{\fldrslt {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\ul\cf2\insrsid9138298 \hich\af39\dbch\af31505\loch\f39
http://opensource.org/licenses/bsd-license.php}}}\sectd \ltrsect
\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
\fs18\cf1\insrsid9138298 \hich\af39\dbch\af31505\loch\f39
}{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid9138298 -\par \line
}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED UNDER
THE
BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\par \line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0
+\fs18\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED UNDER
THE
BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, WITHOUT
WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af39\afs16 \ltrch\fcs0 \fs16\cf1\insrsid9138298
\hich\af39\dbch\af31505\loch\f39 Revision 1.}{\rtlch\fcs1
\af39\afs16
\ltrch\fcs0
\deleted\fs16\cf1\revauthdel1\revdttmdel1196637062\insrsid10246519\del
r
sid2038300
\hich\af39\dbch\af31505\loch\f39 5}{\rtlch\fcs1 \af39\afs16
\ltrch\fcs0
\fs16\cf1\revised\revauth1\revdttm1196637062\insrsid2038300
\hich\af39\dbch\af31505\loch\f39 6}{\rtlch\fcs1 \af39\afs16
\ltrch\fcs0
\fs16\cf1\insrsid9138298
diff --git a/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
b/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
index e4f493f3e368..0c3033136c0f 100644
--- a/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/LzmaCompress_Utility_Man_Page.rtf
@@ -234,11 +234,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0

\deleted\fs18\cf1\lang1033\langfe2052\revauthdel1\revdttmdel1191392171
\langfenp2052\insrsid11874792\delrsid12003746
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid5140827 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials -\par \hich\af43\dbch\af31505\loch\f43 are
license\hich\af43\dbch\af31505\loch\f43 d and made available under
the terms and conditions of the BSD License
+\par \hich\af43\dbch\af31505\loch\f43 are
license\hich\af43\dbch\af31505\loch\f43 d and made available under
the terms and conditions of the BSD-2-Clause-Patent License \par
\hich\af43\dbch\af31505\loch\f43 which accompanies this
distribution.
The full text of the license may be found at \par
\hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN\hich\af43\dbch\af31505\loch\f43 "AS IS"
BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON
AN\hich\af43\dbch\af31505\loch\f43 "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid5140827
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git
a/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
b/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
index 80bcb2c2298d..a9b9b147197e 100644
--- a/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/PatchPcdValue_Utility_Man_Page.rtf
@@ -132,11 +132,11 @@ e.}{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\f0\fs18\cf1\insrsid14894574
\par }\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1
\af31507\afs24\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af31505\cgrid\lan
gn
p
1033\langfenp2052 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid14894574 \hich\af43\dbch\af31505\loch\f43
Copyright
(c) 2010, Intel Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and
made\hich\af43\dbch\af31505\loch\f43
available
-\par \hich\af43\dbch\af31505\loch\f43 under the terms and
conditions of the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS"\hich\af43\dbch\af31505\loch\f43
BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS
IS"\hich\af43\dbch\af31505\loch\f43 BASIS, \par }\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14894574
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid14894574
diff --git a/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
b/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
index 0fe568a5117c..86bb90426774 100644
--- a/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/SplitFile_Utility_Man_Page.rtf
@@ -200,11 +200,11 @@ The action was completed as
requested.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \kerning2\i
\ltrch\fcs0 \fs18\cf1\insrsid11539687
\hich\af39\dbch\af31505\loch\f39 Copyright (c) 1999 - }{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0
\fs18\cf1\insrsid5577864 \hich\af39\dbch\af31505\loch\f39
201}{\rtlch\fcs1
\af39\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid11229351
\hich\af39\dbch\af31505\loch\f39 1}{\rtlch\fcs1 \af39\afs18
\ltrch\fcs0
\fs18\cf1\insrsid11539687 \hich\af39\dbch\af31505\loch\f39 , Intel
Corporation. All rights reserved.
\par \hich\af39\dbch\af31505\loch\f39 This program and the
accompanying materials are licensed and made available -\par
\hich\af39\dbch\af31505\loch\f39 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af39\dbch\af31505\loch\f39 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af39\dbch\af31505\loch\f39 distribution. The full text of the
license may be found at \par \hich\af39\dbch\af31505\loch\f39
http://opensource.org/licenses/bsd-license.ph\hich\af39\dbch\af31505
\l
och
\f39 p
\par
-\par \hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,WITHOUT WARRANTIES OR
REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+\par \hich\af39\dbch\af31505\loch\f39 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS,WITHOUT
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
\par }\pard \ltrpar\ql
\li60\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin60\itap0
{\rtlch\fcs1
\af0\afs18 \ltrch\fcs0 \f0\fs18\cf1\insrsid11539687 \par
}{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
b/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
index e3965dd2c336..394aa9742d0b 100644
--- a/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/TargetTool_Utility_Man_Page.rtf
@@ -214,11 +214,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid1639664 \hich\af43\dbch\af31505\loch\f43 Copyright
\hich\af43\dbch\af31505\loch\f43 (c) 2007 - }{\rtlch\fcs1
\af43\afs18
\ltrch\fcs0 \fs18\cf1\insrsid14895404
\hich\af43\dbch\af31505\loch\f43
201}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid7558875
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid1639664 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1639664
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid1639664
diff --git
a/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
b/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
index 68cefeb9d1e7..60b9a18bf309 100644
--- a/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/TianoCompress_Utility_Man_Page.rtf
@@ -190,11 +190,11 @@
edk2-buildtools-devel@...\hich\af43\dbch\af31505\lo
ch
\f4
3 t}{\r
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid5856265
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid6034337 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6454980
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43
dis\hich\af43\dbch\af31505\loch\f43 tribution. The full text of the
license
may be found at
\par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a

9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c
2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
diff --git a/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
b/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
index 4dbc118718a3..e469d6286429 100644
--- a/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/Trim_Utility_Man_Page.rtf
@@ -219,11 +219,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid8606769
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid8651272 \hich\af43\dbch\af31505\loch\f43
1}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6643493
\hich\af43\dbch\af31505\loch\f43 , Intel Corporation. All rights
reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
htt\hich\af43\dbch\af31505\loch\f43
p://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid6643493
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.

\par }{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \f0\fs18\insrsid6643493
diff --git a/BaseTools/UserManuals/UtilityManPage_template.rtf
b/BaseTools/UserManuals/UtilityManPage_template.rtf
index 08e19805210f..0a280869eb91 100644
--- a/BaseTools/UserManuals/UtilityManPage_template.rtf
+++ b/BaseTools/UserManuals/UtilityManPage_template.rtf
@@ -78,11 +78,11 @@ depends on(optional) - None. if not needed
\par }\pard \ltrpar\ql
\li-1440\ri0\sb400\sa60\sl-340\slmult0\nowidctlpar\tx1440\wrapdefaul
t\
faa
uto\rin0\lin-1440\itap0 {\rtlch\fcs1 \ab\af258\afs28 \ltrch\fcs0
\b\f258\fs28\cf17\insrsid5246601 \hich\af258\dbch\af31505\loch\f258
License
\par }\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \f43\fs18\insrsid5246601
\hich\af43\dbch\af31505\loch\f43 Copyright (c) 1999 - 2007, Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and
ma\hich\af43\dbch\af31505\loch\f43 de available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
\hich\af43\dbch\af31505\loch\f43 WITHOUT WARRANTIES OR
REPRESENTATIONS
OF ANY KIND, EITHER EXPRESS OR IMPLIED.
\par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \f43\fs18\insrsid5246601
\par }{\*\themedata
504b030414000600080000002100e9de0fbfff0000001c020000130000005b43
6f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
diff --git a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
b/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
index 2b056f8f2660..402433fcbbc4 100644
--- a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf
@@ -220,11 +220,11 @@
edk2-buildtools-devel@...}{\rtlch\fcs1 \af0\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43
Copyright
(c)
2007 - }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid1204842
\hich\af43\dbch\af31505\loch\f43 201}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid12476259
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available -\par
\hich\af43\dbch\af31505\loch\f43 under the terms and conditions of
the BSD License which accompanies this
+\par \hich\af43\dbch\af31505\loch\f43 under the terms and
+conditions of
the BSD-2-Clause-Patent License which accompanies this \par
\hich\af43\dbch\af31505\loch\f43 distribution. The full text of the
license may be found at \par \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
-\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+\par \hich\af43\dbch\af31505\loch\f43 THE PROGRAM IS DISTRIBUTED
UNDER THE BSD-2-CLAUSE-PATENT LICENSE ON AN "AS IS" BASIS, \par
}\pard \ltrpar\ql
\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490
\hich\af43\dbch\af31505\loch\f43
WITH\hich\af43\dbch\af31505\loch\f43
OUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
OR
IMPLIED.
\par }\pard \ltrpar\ql
\li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1
\af1\afs20 \ltrch\fcs0 \f1\fs20\insrsid14166490 diff --git
a/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
b/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
index 88c6a84b4ea2..9fc617a71160 100644
--- a/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
+++ b/BaseTools/UserManuals/VolInfo_Utility_Man_Page.rtf
@@ -178,11 +178,11 @@ tool, 2) a name for the tool, and 3) the path
to the tool executable. An example
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 1}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453 \hich\af43\dbch\af31505\loch\f43 , Intel
Corporation. All rights reserved.
\par
\par \hich\af43\dbch\af31505\loch\f43 This program and the
accompanying materials are licensed and made available under the
terms andconditions of the B\hich\af43\dbch\af31505\loch\f43 -SD
License which accompanies this distribution. The full text of the
license
may befound at:}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid14511453\delrsid14511453
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
+SD-2-Clause-Patent License which accompanies this distribution.
+The full
text of the license may befound at:}{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453\delrsid14511453
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0
\fs18\cf1\insrsid14511453 \hich\af43\dbch\af31505\loch\f43
http://opensource.org/licenses/bsd-license.php
\par
\par }\pard \ltrpar\ql
\li360\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0\pararsid
13
8571
51 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14511453
\hich\af43\dbch\af31505\loch\f43
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
BASIS, WITHOUT WARRANTIES}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD-2-CLAUSE-PATENT
LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES}{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 }{\rtlch\fcs1 \af43\afs18
\ltrch\fcs0 \fs18\cf1\insrsid13857151
\hich\af43\dbch\af31505\loch\f43 OR REPRESENTATIONS OF
ANY\hich\af43\dbch\af31505\loch\f43 KIND, EITHER EXPRESS OR IMPLIED.
\par }\pard \ltrpar\ql
\li360\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0
{\rtlch\fcs1
\af43\afs18 \ltrch\fcs0
\fs18\cf1\lang1033\langfe2052\langfenp2052\insrsid14511453\charrsid1
38
5
7151
\par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0
\fs18\cf1\insrsid14511453
--
2.27.0.windows.1