Hi Mike, On 04/15/19 22:38, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=1656 > > Change the web page documentation to state that the preferred license > of the EDK II is the BSD+Patent License. > > Cc: Andrew Fish <af...@apple.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Leif Lindholm <leif.lindh...@linaro.org> > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > --- > edk2/index.md | 3 +-- > legalese.md | 3 ++- > ovmf/index.md | 2 +- > site/index.md | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-)
can you please remind me where I can clone the website repo, and at what *individual* URLs I can look at these four rendered pages? (Pre-patch state is fine too.) Thanks! Laszlo > diff --git a/edk2/index.md b/edk2/index.md > index 2596fb3..6c6c6ea 100644 > --- a/edk2/index.md > +++ b/edk2/index.md > @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich, cross-platform firmware > development > environment for the UEFI and PI specifications. > > #### License information: > -[BSD](http://www.opensource.org/licenses/bsd-license.php) > - > +[BSD+Patent]((https://opensource.org/licenses/BSDplusPatent) > > #### Source repositories: > * edk2 main repository - > [https://github.com/tianocore/edk2](https://github.com/tianocore/edk2) > diff --git a/legalese.md b/legalese.md > index 9a2c8b2..03965b6 100644 > --- a/legalese.md > +++ b/legalese.md > @@ -6,7 +6,8 @@ title: Legal > > ## Licenses for TianoCore Contributions > > -The preferred license for TianoCore is > [BSD-2-Clause]({{wiki}}/BSD-License){:target="_blank"}. The [TianoCore > contributors > agreement](https://raw.githubusercontent.com/tianocore/edk2/master/Contributions.txt){:target="_blank"} > describes acceptable licenses for community contributions. > +The preferred license for TianoCore is > [BSD+Patent]({{wiki}}/BSD-Plus-Patent-License){:target="_blank"}. When that > is not possible, then contributions using > +the following licenses can be accepted: > * BSD (2-clause): > [http://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause){:target="_blank"} > * BSD (3-clause): > [http://opensource.org/licenses/BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause){:target="_blank"} > * MIT: > [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT){:target="_blank"} > diff --git a/ovmf/index.md b/ovmf/index.md > index 843ad71..97c0cf3 100644 > --- a/ovmf/index.md > +++ b/ovmf/index.md > @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to enable UEFI support for > Virtual > Machines. OVMF contains a sample UEFI firmware for [QEMU] and [KVM]. > > License information: > - [BSD](http://www.opensource.org/licenses/bsd-license.php) > + [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent) > > More information: > [OVMF FAQ]({{wiki}}/OVMF FAQ), > diff --git a/site/index.md b/site/index.md > index 9684422..dd3ffcc 100644 > --- a/site/index.md > +++ b/site/index.md > @@ -7,7 +7,7 @@ title: TianoCore web site > Our website is open source. Let us know if you have site content or > other website improvements! > > -License information: > [BSD](http://www.opensource.org/licenses/bsd-license.php){:target="_blank"} > +License information: > [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent){:target="_blank"} > > Source repository: > <https://github.com/tianocore/tianocore.github.io>{:target="_blank"} > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39174): https://edk2.groups.io/g/devel/message/39174 Mute This Topic: https://groups.io/mt/31192884/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
