commit 458c09bdb2be4d39b8897db790349cc89faf3e6c
author Alex Stapleton <alexs@prol.etari.at> Wed Apr 23 20:58:37 2014 +0100
committer Alex Stapleton <alexs@prol.etari.at> Fri Apr 25 21:30:57 2014 +0100
tree fbd057d6ff05747cceb2138b4625bcff49e48fd6
parent 28091767ff7fdf80cb1d3ae45915949dfe9793b5

Rename OpenSSLSerializationBackend

docs/hazmat/backends/interfaces.rst

diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index 0349901..11ff930 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -276,7 +276,7 @@
             provider.
 
 
-.. class:: OpenSSLSerializationBackend
+.. class:: TraditionalOpenSSLSerializationBackend
 
     .. versionadded:: 0.3
 
@@ -290,8 +290,8 @@
         :param bytes password: The password to use if this data is encrypted.
             Should be None if the data is not encrypted.
 
-        :return: A new instance of
-            :class:`~cryptography.hazmat.primitives.serialization.OpenSSLPrivateKey`
+        :return: A new instance of the appropriate private key or public key
+            that the serialized data contains.
 
         :raises ValueError: If the data could not be deserialized correctly.
 

docs/spelling_wordlist.txt

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index 02b9f9e..aae52ae 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -25,6 +25,7 @@
 introspectability
 invariants
 iOS
+metadata
 pickleable
 plaintext
 pseudorandom