From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3024121CB02E4 for ; Tue, 18 Jul 2017 14:15:13 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2017 14:17:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,378,1496127600"; d="scan'208";a="1174111887" Received: from mdkinney-mobl1.amr.corp.intel.com ([10.24.14.249]) by fmsmga001.fm.intel.com with ESMTP; 18 Jul 2017 14:17:06 -0700 From: Michael D Kinney To: edk2-devel@lists.01.org Cc: Leif Lindholm , Andrew Fish , Jordan Justen Date: Tue, 18 Jul 2017 14:17:01 -0700 Message-Id: <20170718211701.37196-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170718211701.37196-1-michael.d.kinney@intel.com> References: <20170718211701.37196-1-michael.d.kinney@intel.com> Subject: [Patch 6/6] edk2: Reformat TianoCore Contribution Agreement 1.1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jul 2017 21:15:13 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=629 Update formatting of Contributions.txt to line wrap at 80 columns. Cc: Leif Lindholm Cc: Andrew Fish Cc: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- Contributions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Contributions.txt b/Contributions.txt index e2e3437981..fe53d1bade 100644 --- a/Contributions.txt +++ b/Contributions.txt @@ -26,7 +26,7 @@ To make a contribution to a TianoCore project, follow these steps. * MIT: http://opensource.org/licenses/MIT * Python-2.0: http://opensource.org/licenses/Python-2.0 * Zlib: http://opensource.org/licenses/Zlib - For documentation: https://www.freebsd.org/copyright/freebsd-doc-license.html + For documentation: https://www.freebsd.org/copyright/freebsd-doc-license.html Contributions of code put into the public domain can also be accepted. @@ -38,22 +38,22 @@ To make a contribution to a TianoCore project, follow these steps. = TianoCore Contribution Agreement 1.1 = ======================================== -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCUMENTATION"), -INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE -PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE -TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE -TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR -REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE -CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED -BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS +INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION +("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE +TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT +IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND +INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES +INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR +USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND +CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR +REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. -Unless otherwise indicated, all Content (except Documentation) made available on the TianoCore -site is provided to you under the terms and conditions of the BSD -License ("BSD"). A copy of the BSD License is available at +Unless otherwise indicated, all Content (except Documentation) made available +on the TianoCore site is provided to you under the terms and conditions of +the BSD License ("BSD"). A copy of the BSD License is available at http://opensource.org/licenses/bsd-license.php or when applicable, in the associated License.txt file. -- 2.13.1.windows.2