From nobody Fri Dec 27 20:34:03 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1500529473702423.2863198208727; Wed, 19 Jul 2017 22:44:33 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3FCE421D0DE48; Wed, 19 Jul 2017 22:42:25 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 8ADAD21D0B657 for ; Wed, 19 Jul 2017 22:42:22 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP; 19 Jul 2017 22:44:18 -0700 Received: from vwlee-mobl5.amr.corp.intel.com (HELO mdkinney-MOBL1.amr.corp.intel.com) ([10.254.81.214]) by orsmga004.jf.intel.com with ESMTP; 19 Jul 2017 22:44:17 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,382,1496127600"; d="scan'208";a="109947239" From: Michael D Kinney To: edk2-devel@lists.01.org Date: Wed, 19 Jul 2017 22:44:07 -0700 Message-Id: <20170720054411.18928-5-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170720054411.18928-1-michael.d.kinney@intel.com> References: <20170720054411.18928-1-michael.d.kinney@intel.com> Subject: [edk2] [Patch V3 4/8] edk2: Update to 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: , Cc: Jordan Justen , Andrew Fish , Leif Lindholm MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D629 Update the TianoCore Contribution Agreement from Version 1.0 to Version 1.1 to cover open source documentation associated with the TianoCore project. Version 1.0 covers source code files. Version 1.1 is a backwards compatible extension that add support for document files in both source form and compiled form. The edk2 repository is updated so the same contribution agreement is used by developers that work on TianoCore related source code or TianoCore related documents. Links to RFC and Wiki on the GitBook documentation process * https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html * https://github.com/tianocore-docs/edk2-TemplateSpecification/wiki Cc: Leif Lindholm Cc: Andrew Fish Cc: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- Contributions.txt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Contributions.txt b/Contributions.txt index 06c60d8e17..a6bf0103f8 100644 --- a/Contributions.txt +++ b/Contributions.txt @@ -1,4 +1,3 @@ - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D Code Contributions =3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -28,6 +27,10 @@ To make a contribution to a TianoCore project, follow th= ese steps. * Python-2.0: http://opensource.org/licenses/Python-2.0 * Zlib: http://opensource.org/licenses/Zlib =20 + For documentation: + * FreeBSD Documentation License + https://www.freebsd.org/copyright/freebsd-doc-license.html + Contributions of code put into the public domain can also be accepted. =20 @@ -35,10 +38,10 @@ To make a contribution to a TianoCore project, follow t= hese steps. review will be required. =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -=3D TianoCore Contribution Agreement 1.0 =3D +=3D TianoCore Contribution Agreement 1.1 =3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION, +INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCU= MENTATION"), 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 @@ -51,14 +54,20 @@ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABL= E LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. =20 -Unless otherwise indicated, all Content made available on the TianoCore +Unless otherwise indicated, all Content (except Documentation) made availa= ble 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. =20 +Unless otherwise indicated, all Documentation made available on the +TianoCore site is provided to you under the terms and conditions of the +FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is +available at https://www.freebsd.org/copyright/freebsd-doc-license.html or, +when applicable, in the associated License.txt file. + Certain other content may be made available under other licenses as -indicated in or with such Content. (For example, in a License.txt file.) +indicated in or with such Content (for example, in a License.txt file). =20 You accept and agree to the following terms and conditions for Your present and future Contributions submitted to TianoCore site. Except --=20 2.13.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel