[Python-modules-commits] [celery] 09/11: Update license.

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository celery.

commit 3efb36ba8df1489027ab2226743b978548de3ed7
Author: Brian May <bam at debian.org>
Date:   Thu Nov 19 09:08:48 2015 +1100

    Update license.
    
    This was applied upstream.
    
    3.1 branch:
    https://github.com/celery/celery/commit/9a51e325b29d82834fdbd809a28a64b21c7ee64d
    
    master branch:
    https://github.com/celery/celery/commit/ef107f05e042876efaab7c75f71262727a8387e3
---
 LICENSE            |  6 +++---
 docs/copyright.rst | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index aeb3da0..130ab40 100644
--- a/LICENSE
+++ b/LICENSE
@@ -39,9 +39,9 @@ Documentation License
 
 The documentation portion of Celery (the rendered contents of the
 "docs" directory of a software distribution or checkout) is supplied
-under the Creative Commons Attribution-Noncommercial-Share Alike 3.0
-United States License as described by
-http://creativecommons.org/licenses/by-nc-sa/3.0/us/
+under the "Creative Commons Attribution-ShareAlike 4.0
+International" (CC BY-SA 4.0) License as described by
+http://creativecommons.org/licenses/by-sa/4.0/
 
 Footnotes
 =========
diff --git a/docs/copyright.rst b/docs/copyright.rst
index bfffb30..ba1c30c 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -11,17 +11,18 @@ Copyright |copy| 2009-2014, Ask Solem.
 
 All rights reserved.  This material may be copied or distributed only
 subject to the terms and conditions set forth in the `Creative Commons
-Attribution-Noncommercial-Share Alike 3.0 United States License
-<http://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_.  You must
-give the original author credit.  You may not use this work for
-commercial purposes.  If you alter, transform, or build upon this
-work, you may distribute the resulting work only under the same or
-similar license to this one.
+Attribution-ShareAlike 4.0 International`
+<http://creativecommons.org/licenses/by-nc-sa/3.0/us/>`_ license.
+
+You may share and adapt the material, even for commercial purposes, but
+you must give the original author credit.
+If you alter, transform, or build upon this
+work, you may distribute the resulting work only under the same license or
+a license compatible to this one.
 
 .. note::
 
    While the *Celery* documentation is offered under the
-   Creative Commons *attribution-nonconmmercial-share alike 3.0 united
-   states* license, the Celery *software* is offered under the
-   less restrictive
+   Creative Commons *Attribution-ShareAlike 4.0 International* license
+   the Celery *software* is offered under the
    `BSD License (3 Clause) <http://www.opensource.org/licenses/BSD-3-Clause>`_

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git