On 2017-07-18 14:17:00, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=629 > > 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 <[email protected]> > Cc: Andrew Fish <[email protected]> > Cc: Jordan Justen <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney <[email protected]> > --- > 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 @@ > - > ====================== > = Code Contributions = > ====================== > @@ -27,6 +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
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=Licensing#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. > > ======================================== > -= TianoCore Contribution Agreement 1.0 = > += TianoCore Contribution Agreement 1.1 = > ======================================== > > -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION, > +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 > @@ -51,14 +51,20 @@ 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 made available on the TianoCore > +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. > > +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 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
