diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-07 09:25:52 +0100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-07 09:25:52 +0100 |
| commit | 9ba175847c90a9db8ca09f42631bb699b23a87cb (patch) | |
| tree | 5d75772cb9f77564a6824ae25c8e14a597fff077 | |
| parent | 4a779f069d0280f2ad531526086e898a1c05e7d7 (diff) | |
| parent | fda9247969f47ef2e250539b662957ab58cf4566 (diff) | |
| download | cryptography-9ba175847c90a9db8ca09f42631bb699b23a87cb.tar.gz cryptography-9ba175847c90a9db8ca09f42631bb699b23a87cb.tar.bz2 cryptography-9ba175847c90a9db8ca09f42631bb699b23a87cb.zip | |
Merge pull request #1460 from alex/document-contributing
Refs #1209 -- clearly state the licensing requirements in the docs
| -rw-r--r-- | docs/development/submitting-patches.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/development/submitting-patches.rst b/docs/development/submitting-patches.rst index fe2df431..54005d27 100644 --- a/docs/development/submitting-patches.rst +++ b/docs/development/submitting-patches.rst @@ -8,6 +8,9 @@ Submitting patches * Larger changes should be discussed on `our mailing list`_ before submission. * New features and significant bug fixes should be documented in the :doc:`/changelog`. +* You must have legal permission to distribute any code you contribute to + ``cryptography``, and it must be available under both the BSD and Apache + Software License Version 2.0 licenses. If you believe you've identified a security issue in ``cryptography``, please follow the directions on the :doc:`security page </security>`. |