Browse Source

Documentation now licensed under the CC BY-SA 4.0 license (Issue #2890)

Ask Solem 9 years ago
parent
commit
ef107f05e0
2 changed files with 13 additions and 12 deletions
  1. 3 3
      LICENSE
  2. 10 9
      docs/copyright.rst

+ 3 - 3
LICENSE

@@ -40,9 +40,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
 =========

+ 10 - 9
docs/copyright.rst

@@ -11,17 +11,18 @@ Copyright |copy| 2009-2015, 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>`_