From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 3614421CB0301 for ; Mon, 17 Jul 2017 16:59:38 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP; 17 Jul 2017 17:01:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,376,1496127600"; d="scan'208";a="1152500167" Received: from unknown (HELO localhost) ([10.254.183.174]) by orsmga001.jf.intel.com with ESMTP; 17 Jul 2017 17:01:30 -0700 MIME-Version: 1.0 To: Michael D Kinney , edk2-devel@lists.01.org Message-ID: <150033609015.22153.12281945845971208669@jljusten-skl> From: Jordan Justen In-Reply-To: <20170717212829.36548-3-michael.d.kinney@intel.com> Cc: Andrew Fish , Leif Lindholm References: <20170717212829.36548-1-michael.d.kinney@intel.com> <20170717212829.36548-3-michael.d.kinney@intel.com> User-Agent: alot/0.5.1 Date: Mon, 17 Jul 2017 17:01:30 -0700 Subject: Re: [Patch 2/2] edk2: Update to Tiano 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: Mon, 17 Jul 2017 23:59:38 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2017-07-17 14:28:29, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=3D629 > Why doesn't the commit message mention the purpose of the 1.0 to 1.1 change? > Cc: Leif Lindholm > Cc: Andrew Fish > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > = > diff --git a/AppPkg/Contributions.txt b/CONTRIBUTIONS.txt Why is this not named Contributions.txt? I think CONTRIBUTIONS would be common for open source, and EDK II would prefer Contributions.txt, but CONTRIBUTIONS.txt looks like some sort of hybrid. :) > similarity index 79% > rename from AppPkg/Contributions.txt > rename to CONTRIBUTIONS.txt > index f87cbd73c6..0c9c2be6e7 100644 > --- a/AppPkg/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 > I think you should add a blank line above 'For documentation' and move the url to the next line with a bullet. Can you explain why the different license is required? Maybe that should be in the commit message? Fedora has a wiki page about documentation licensing options: https://fedoraproject.org/wiki/Licensing:Main?rd=3DLicensing#Documentation_= Licenses Were any of these other options considered? If someone contributed a document using the BSD license, would it be rejected? > = > -=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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > -=3D Change Description / Commit Message / Patch Email =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=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > - [snip] > -* "Signed-off-by" is the contributor's signature identifying them > - by their real/legal name and their email address. > - Why is this all removed? This was one area we could point contributors when they don't know how to contribute a patch. > =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"), We should reflow the text to be < 80 columns. Leif mentioned that this makes it more obvious what the changes are. Okay, how about splitting patch 2 into 4 patches. 1. Move the existing Contributions.txt to the root with no changes. 2. Remove all the info about how to properly submit a patch. (I actually don't think we should make this change.) 3. Add the new 1.1 text so it is obvious what changed, even if lines go above 80 columns. 4. Reflow the long lines. > 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). Do we need this change? It seemed better before. At the least, I think you'd want a space before that parentheses. -Jordan