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).
[...]
> 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)
Thomas
