summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <james@b-list.org>2018-03-25 18:43:21 -0700
committerTim Graham <timograham@gmail.com>2018-06-29 20:00:58 -0400
commit48b327aef1095a8978ba8d320d706949c1ec41da (patch)
treec7b773d9fe5d1efecf2ded0b56f929768fc9e3a6
parent38cada7c94f5f73d2d47a0a730ea5d71d266fa2c (diff)
Fixed #29261 -- Doc'd the reason for LICENSE.python.
-rw-r--r--LICENSE.python11
-rw-r--r--docs/faq/general.txt15
2 files changed, 26 insertions, 0 deletions
diff --git a/LICENSE.python b/LICENSE.python
index 870259c410..d517733429 100644
--- a/LICENSE.python
+++ b/LICENSE.python
@@ -1,3 +1,14 @@
+Django is licensed under the three-clause BSD license; see the file
+LICENSE for details.
+
+Django includes code from the Python standard library, which is licensed under
+the Python license, a permissive open source license. The copyright and license
+is included below for compliance with Python's terms.
+
+----------------------------------------------------------------------
+
+Copyright (c) 2001-present Python Software Foundation; All Rights Reserved
+
A. HISTORY OF THE SOFTWARE
==========================
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 2d89f97360..2bc0712977 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -71,6 +71,21 @@ Django was originally developed at World Online, the Web department of a
newspaper in Lawrence, Kansas, USA. Django's now run by an international
`team of volunteers <https://www.djangoproject.com/foundation/teams/>`_.
+How is Django licensed?
+=======================
+
+Django is distributed under `the 3-clause BSD license
+<https://github.com/django/django/blob/master/LICENSE>`_. This is an open
+source license granting broad permissions to modify and redistribute Django.
+
+Why does Django include Python's license file?
+==============================================
+
+Django includes code from the Python standard library. Python is distributed
+under a permissive open source license. `A copy of the Python license
+<https://github.com/django/django/blob/master/LICENSE.python>`_ is
+included with Django for compliance with Python's terms.
+
Which sites use Django?
=======================