qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Thomas Huth <thuth@redhat.com>
Cc: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
	Eric Blake <eblake@redhat.com>
Subject: Re: [Qemu-devel] [qemu-web PATCH v2] Add license files for GPLv2+ and CC-BY-SA-4.0
Date: Mon, 17 Dec 2018 12:18:12 +0000	[thread overview]
Message-ID: <20181217121812.GF30264@redhat.com> (raw)
In-Reply-To: <294b4695-8eeb-da79-f40c-74b57f6ca629@redhat.com>

On Mon, Dec 17, 2018 at 11:57:27AM +0100, Thomas Huth wrote:
> On 2018-12-07 17:54, Daniel P. Berrangé wrote:
> > The intent is that from this point onwards, content for this repository
> > is dual-licensed under the GPLv2+ and CC-BY-SA-4.0
> 
> Thanks for taking care of this!
> 
> Some remarks / questions below...
> 
> [...]
> > ---
> >  LICENSE-CC-BY-3.0.md     | 324 +++++++++++++++++++++++++++++++++++
> >  LICENSE-CC-BY-SA-4.0.md  | 356 +++++++++++++++++++++++++++++++++++++++
> >  LICENSE-GPL.md           | 346 +++++++++++++++++++++++++++++++++++++
> >  LICENSE.md               |  18 ++
> >  _includes/copyright.html |   7 +-
> >  5 files changed, 1047 insertions(+), 4 deletions(-)
> >  create mode 100644 LICENSE-CC-BY-3.0.md
> >  create mode 100644 LICENSE-CC-BY-SA-4.0.md
> >  create mode 100644 LICENSE-GPL.md
> >  create mode 100644 LICENSE.md
> > 
> > diff --git a/LICENSE-CC-BY-3.0.md b/LICENSE-CC-BY-3.0.md
> > new file mode 100644
> > index 0000000..42693c3
> > --- /dev/null
> > +++ b/LICENSE-CC-BY-3.0.md
> > @@ -0,0 +1,324 @@
> > +---
> > +permalink: /license-cc-by-3.0/
> > +title: Creative Commons Attribution 3.0 Unported
> > +---
> > +
> > +Creative Commons Legal Code
> > +
> > +Attribution 3.0 Unported
> > +
> > +    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
> > +    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
> > +    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
> > +    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
> > +    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
> > +    DAMAGES RESULTING FROM ITS USE.
> > +
> > +License
> > +
> > +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
> > +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
> > +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
> > +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
> > +
> > +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
> > +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
> > +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
> > +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
> > +CONDITIONS.
> > +
> > +1. Definitions
> > +
> > + a. "Adaptation" means a work based upon the Work, or upon the Work and
> > +    other pre-existing works, such as a translation, adaptation,
> > +    derivative work, arrangement of music or other alterations of a
> > +    literary or artistic work, or phonogram or performance and includes
> > +    cinematographic adaptations or any other form in which the Work may be
> > +    recast, transformed, or adapted including in any form recognizably
> > +    derived from the original, except that a work that constitutes a
> > +    Collection will not be considered an Adaptation for the purpose of
> > +    this License. For the avoidance of doubt, where the Work is a musical
> > +    work, performance or phonogram, the synchronization of the Work in
> > +    timed-relation with a moving image ("synching") will be considered an
> > +    Adaptation for the purpose of this License.
> [...]
> 
> You did not use <pre>-tags for the CC-BY-3.0 license, only for the other
> two. Thus the pre-formatting gets completely lost in the web browser
> here, making the text quite hard to read. I'd suggest to use <pre> here,
> too (I can add the tags before committing in case you don't want to respin).

Yes, my bad. Please do add the <pre> yourself.

> [...]
> > diff --git a/LICENSE.md b/LICENSE.md
> > new file mode 100644
> > index 0000000..ba73300
> > --- /dev/null
> > +++ b/LICENSE.md
> > @@ -0,0 +1,18 @@
> > +---
> > +permalink: /license
> > +title: QEMU website licensing
> > +---
> > +
> > +Except where otherwise noted, the content in this repository is provided under
> > +a choice of two licenses:
> 
> I'd maybe replace "in this repository" with "on this website", since
> it's not quite obvious for the normal user that the website is stored in
> a git repository, too. (If you agree, I can fix this also up in case you
> don't want to respin)

Yes, it is fine if you change that when pushing.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

  reply	other threads:[~2018-12-17 12:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-07 16:54 [Qemu-devel] [qemu-web PATCH v2] Add license files for GPLv2+ and CC-BY-SA-4.0 Daniel P. Berrangé
2018-12-07 17:03 ` Eric Blake
2018-12-17 10:57 ` Thomas Huth
2018-12-17 12:18   ` Daniel P. Berrangé [this message]
2018-12-17 13:23     ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181217121812.GF30264@redhat.com \
    --to=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).