aboutsummaryrefslogtreecommitdiffstats
path: root/docs/contributing.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-12-17 07:35:34 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2013-12-17 07:35:34 -0800
commit875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0 (patch)
tree71372f15c53afdd4bf2459e9a4774f3d526075a5 /docs/contributing.rst
parent4eec0bb4e1d79f107f40b3856f2c9ec76c3eef88 (diff)
parenta4aa420cc6c0203d201a0f418af68d1f11abbcf5 (diff)
downloadcryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.gz
cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.bz2
cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.zip
Merge branch 'master' into no-more-generator
Conflicts: tests/hazmat/primitives/utils.py
Diffstat (limited to 'docs/contributing.rst')
-rw-r--r--docs/contributing.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 100f13f5..cb9c7283 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -28,6 +28,7 @@ devastating, ``cryptography`` has a strict code review policy:
* If somehow the tests get into a failing state on ``master`` (such as by a
backwards incompatible release of a dependency) no pull requests may be
merged until this is rectified.
+* All merged patches must have 100% test coverage.
The purpose of these policies is to minimize the chances we merge a change
which jeopardizes our users' security.
@@ -78,7 +79,7 @@ whether the signature was valid.
APIs at the :doc:`/hazmat/primitives/index` layer should always take an
explicit backend, APIs at the recipes layer should automatically use the
-:func:`~cryptography.hazmat.bindings.default_backend`, but optionally allow
+:func:`~cryptography.hazmat.backends.default_backend`, but optionally allow
specifying a different backend.
C bindings