Skip to content

Commit

Permalink
Clarify license in docs, cleanup index
Browse files Browse the repository at this point in the history
  • Loading branch information
hynek committed Jul 20, 2022
1 parent 9d26ca9 commit 70deda6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ If you prefer videos over reading, check out `Markus Holtermann <https://twitter
Project Information
===================

- **License**: dual-licensed under `Apache License, version 2 <https://choosealicense.com/licenses/apache/>`_ and `MIT <https://choosealicense.com/licenses/mit/>`_
- **License**: *dual* `Apache License, version 2 and MIT <https://www.structlog.org/en/stable/license.html>`_
- **PyPI**: https://pypi.org/project/structlog/
- **Source Code**: https://github.com/hynek/structlog
- **Documentation**: https://www.structlog.org/
Expand Down
5 changes: 3 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,13 @@ API Reference

api


.. include:: ../README.rst
:start-after: -begin-meta-


.. stop Sphinx from complaints about orphaned docs, we link them elsewhere
.. toctree::
:maxdepth: 1
:hidden:

license
changelog
Expand Down
4 changes: 4 additions & 0 deletions docs/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ License and Hall of Fame

``structlog`` is licensed both under the `Apache License, Version 2 <https://choosealicense.com/licenses/apache/>`_ and the `MIT license <https://choosealicense.com/licenses/mit/>`_.

Any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.

---

The reason for that is to be both protected against patent claims by own contributors and still allow the usage within GPLv2 software.
For more legal details, see `this issue <https://github.com/pyca/cryptography/issues/1209>`_ on the bug tracker of PyCA's ``cryptography`` project.

Expand Down

0 comments on commit 70deda6

Please sign in to comment.