aboutsummaryrefslogtreecommitdiffstats
path: root/docs/development
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-11-16 09:08:42 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-11-16 09:08:42 -0800
commit5951f46be60095a74546b318432417e51bfe0aab (patch)
treef408903ac40c545acd89e4f599d75b37271f5865 /docs/development
parent5ee8ce0e4d4480a0c6b9823f9909cd1c17b53ec7 (diff)
downloadcryptography-5951f46be60095a74546b318432417e51bfe0aab.tar.gz
cryptography-5951f46be60095a74546b318432417e51bfe0aab.tar.bz2
cryptography-5951f46be60095a74546b318432417e51bfe0aab.zip
Update the license header for every source file, as well as the documentation.
Fixes #1209
Diffstat (limited to 'docs/development')
-rw-r--r--docs/development/custom-vectors/cast5/generate_cast5.py15
-rw-r--r--docs/development/submitting-patches.rst9
2 files changed, 11 insertions, 13 deletions
diff --git a/docs/development/custom-vectors/cast5/generate_cast5.py b/docs/development/custom-vectors/cast5/generate_cast5.py
index 6a4acdad..20f35179 100644
--- a/docs/development/custom-vectors/cast5/generate_cast5.py
+++ b/docs/development/custom-vectors/cast5/generate_cast5.py
@@ -1,15 +1,6 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
from __future__ import absolute_import, division, print_function
diff --git a/docs/development/submitting-patches.rst b/docs/development/submitting-patches.rst
index 54005d27..ff650c4f 100644
--- a/docs/development/submitting-patches.rst
+++ b/docs/development/submitting-patches.rst
@@ -25,7 +25,14 @@ configuration. You can also run the ``tox`` job with ``tox -e pep8``.
`Write comments as complete sentences.`_
-Every code file must start with the boilerplate notice of the Apache License.
+Every code file must start with the boilerplate licensing notice:
+
+.. code-block:: python
+
+ # This file is dual licensed under the terms of the Apache License, Version
+ # 2.0, and the BSD License. See the LICENSE file in the root of this repository
+ # for complete details.
+
Additionally, every Python code file must contain
.. code-block:: python