Merge branch 'master' into commoncrypto-cipher-backend

* master:
  expand tox backend example
  On OS X at build time compile the CC bindings
  fix docs
  update docs for name attribute
  revert fixture decorator for now, switch to append. no more globals
  docs for explicit backend selection and document name attribute of backend
  modify backend selection to allow multiple backends via comma delimiter
  better name for the variable
  don't mutate _ALL_BACKENDS
  pass posargs via tox so --backend can be used for tox envs
  support --backend as a pytest flag to limit to one backend for testing

1 files changed, 10 insertions, 0 deletions

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 8e32c368..4bb1461d 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -250,6 +250,16 @@ each supported Python version and run the tests. For example:
 You may not have all the required Python versions installed, in which case you
 will see one or more ``InterpreterNotFound`` errors.
 
+
+Explicit Backend Selection
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+While testing you may want to run tests against a subset of the backends that
+cryptography supports. Explicit backend selection can be done via the
+``--backend`` flag. This flag should be passed to ``py.test`` with a comma
+delimited list of backend names. To use it with ``tox`` you must pass it as
+``tox -- --backend=openssl``.
+
 Building Documentation
 ~~~~~~~~~~~~~~~~~~~~~~