From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jordan.l.justen@intel.com>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 (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 0F1F121D0DE51
 for <edk2-devel@lists.01.org>; Tue, 18 Jul 2017 16:48:45 -0700 (PDT)
Received: from orsmga001.jf.intel.com ([10.7.209.18])
 by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 18 Jul 2017 16:50:39 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.40,378,1496127600"; d="scan'208";a="1152865345"
Received: from unknown (HELO localhost) ([10.254.183.174])
 by orsmga001.jf.intel.com with ESMTP; 18 Jul 2017 16:50:38 -0700
MIME-Version: 1.0
To: Michael D Kinney <michael.d.kinney@intel.com>,  edk2-devel@lists.01.org
Message-ID: <150042183834.7417.17999724057527326477@jljusten-skl>
From: Jordan Justen <jordan.l.justen@intel.com>
In-Reply-To: <20170718211701.37196-6-michael.d.kinney@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>, Andrew Fish <afish@apple.com>
References: <20170718211701.37196-1-michael.d.kinney@intel.com>
 <20170718211701.37196-6-michael.d.kinney@intel.com>
User-Agent: alot/0.5.1
Date: Tue, 18 Jul 2017 16:50:38 -0700
Subject: Re: [Patch 5/6] 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  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jul 2017 23:48:45 -0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On 2017-07-18 14:17:00, Michael D Kinney wrote:
> 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 <leif.lindholm@linaro.org>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Contributions.txt | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> =

> diff --git a/Contributions.txt b/Contributions.txt
> index 06c60d8e17..e2e3437981 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
> @@ -27,6 +26,7 @@ To make a contribution to a TianoCore project, follow t=
hese 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-lic=
ense.html

As I noted before I think this would look more consistent:

"""
5. It is preferred that contributions are submitted using the same
   copyright license as the base project. When that is not possible,
   then contributions using the following licenses can be accepted:
   * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
   * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
   * MIT: http://opensource.org/licenses/MIT
   * Python-2.0: http://opensource.org/licenses/Python-2.0
   * Zlib: http://opensource.org/licenses/Zlib

   For documentation:
   * FreeBSD Documentation License
     https://www.freebsd.org/copyright/freebsd-doc-license.html
"""

I also asked if other documentation licenses were evaluated, such as
the 'good' licenses that Red Hat noted for Fedora:

https://fedoraproject.org/wiki/Licensing:Main?rd=3DLicensing#Documentation_=
Licenses

Anyway, the bullet format would lend itself to expanding the list in
the future.

-Jordan

>  =

>     Contributions of code put into the public domain can also be
>     accepted.
> @@ -35,10 +35,10 @@ To make a contribution to a TianoCore project, follow=
 these steps.
>     review will be required.
>  =

>  =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
>  =

> -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
> +INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DO=
CUMENTATION"),
>  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 +51,20 @@ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICA=
BLE LICENSE
>  AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
>  USE THE CONTENT.
>  =

> -Unless otherwise indicated, all Content made available on the TianoCore
> +Unless otherwise indicated, all Content (except Documentation) made avai=
lable 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.
>  =

> +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).
>  =

>  You accept and agree to the following terms and conditions for Your
>  present and future Contributions submitted to TianoCore site. Except
> -- =

> 2.13.1.windows.2
>=20