OvmfPkg: Change License.txt from 2-Clause BSD to BSD+Patent

[mirror_edk2.git] / Contributions.txt

diff --git a/Contributions.txt b/Contributions.txt
index 5e47c3de834535671fa624fa6ef324820056ebd6..14547ebdb7697ad82ef8ca43f228ce87be1231ab 100644 (file)
--- a/Contributions.txt
+++ b/Contributions.txt
@@ -68,8 +68,8 @@ Patch content inline or attached
 === Notes for sample patch email ===\r
 \r
 * The first line of commit message is taken from the email's subject\r
-  line following [Repository/Branch PATCH]. The remaining portion of the commit message\r
-  is the email's content until the '---' line.\r
+  line following [Repository/Branch PATCH]. The remaining portion of the\r
+  commit message is the email's content until the '---' line.\r
 * git format-patch is one way to create this format\r
 \r
 === Definitions for sample patch email ===\r
@@ -98,28 +98,28 @@ Patch content inline or attached
 = TianoCore Contribution Agreement 1.1 =\r
 ========================================\r
 \r
-INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCUMENTATION"),\r
-INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE\r
-PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE\r
-TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE\r
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR\r
-REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE\r
-CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS\r
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\r
-BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\r
+INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION\r
+("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE\r
+TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT\r
+IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND\r
+INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES\r
+INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR\r
+USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND\r
+CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR\r
+REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\r
 AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\r
 AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT\r
 USE THE CONTENT.\r
 \r
-Unless otherwise indicated, all Content (except Documentation) made available on the TianoCore\r
-site is provided to you under the terms and conditions of the BSD\r
-License ("BSD"). A copy of the BSD License is available at\r
+Unless otherwise indicated, all Content (except Documentation) made available\r
+on the TianoCore site is provided to you under the terms and conditions of the\r
+BSD License ("BSD"). A copy of the BSD License is available at\r
 http://opensource.org/licenses/bsd-license.php\r
 or when applicable, in the associated License.txt file.\r
 \r
 Unless otherwise indicated, all Documentation made available on the\r
 TianoCore site is provided to you under the terms and conditions of the\r
-FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is\r
+FreeBSD Documentation License ("FreeBSD"). A copy of the license is\r
 available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,\r
 when applicable, in the associated License.txt file.\r
 \r
@@ -144,7 +144,7 @@ title, and interest in and to Your Contributions.
   of such entity.\r
 * "Contribution" shall mean any original work of authorship,\r
   including any modifications or additions to an existing work,\r
-  that is intentionally submitted by You to the TinaoCore site for\r
+  that is intentionally submitted by You to the TianoCore site for\r
   inclusion in, or documentation of, any of the Content. For the\r
   purposes of this definition, "submitted" means any form of\r
   electronic, verbal, or written communication sent to the\r