浏览代码

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

Ask Solem 10 年之前
父节点
当前提交
9a51e325b2
共有 2 个文件被更改,包括 13 次插入12 次删除
  1. 3 3
      LICENSE
  2. 10 9
      docs/copyright.rst

+ 3 - 3
LICENSE

@@ -39,9 +39,9 @@ Documentation License
 
 
 The documentation portion of Celery (the rendered contents of the
 The documentation portion of Celery (the rendered contents of the
 "docs" directory of a software distribution or checkout) is supplied
 "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
 Footnotes
 =========
 =========

+ 10 - 9
docs/copyright.rst

@@ -11,17 +11,18 @@ Copyright |copy| 2009-2014, Ask Solem.
 
 
 All rights reserved.  This material may be copied or distributed only
 All rights reserved.  This material may be copied or distributed only
 subject to the terms and conditions set forth in the `Creative Commons
 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::
 .. note::
 
 
    While the *Celery* documentation is offered under the
    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>`_
    `BSD License (3 Clause) <http://www.opensource.org/licenses/BSD-3-Clause>`_