Merge with stable

3 files changed, 51 insertions, 1 deletions

diff --git a/docs/lib/passlib.hash.rst b/docs/lib/passlib.hash.rst
index c4d7574..8fbea1d 100644
--- a/docs/lib/passlib.hash.rst
+++ b/docs/lib/passlib.hash.rst
@@ -123,7 +123,6 @@ they can be used compatibly along side other modular crypt format hashes.
     :maxdepth: 1
 
     passlib.hash.apr_md5_crypt
-    passlib.hash.bcrypt_sha256
     passlib.hash.phpass
     passlib.hash.pbkdf2_digest
     passlib.hash.cta_pbkdf2_sha1
diff --git a/docs/lib/passlib.pwd.rst b/docs/lib/passlib.pwd.rst
new file mode 100644
index 0000000..48441df
--- /dev/null
+++ b/docs/lib/passlib.pwd.rst
@@ -0,0 +1,48 @@
+.. module:: passlib.pwd
+	:synopsis: password generation helpers
+
+=================================================
+:mod:`passlib.pwd` -- password generation helpers
+=================================================
+
+.. versionadded:: 1.7
+
+.. todo::
+    This module is still a work in progress, it's API may change
+    before release. See module source for detailed todo list.
+
+Generation
+==========
+.. warning::
+
+    Before using these routines, be sure your system's RNG state is safe,
+    and that you use a sufficiently high ``entropy`` value for
+    the intended purpose.
+
+.. autofunction:: generate(size=None, entropy=None, count=None, preset=None, charset=None, wordset=None, spaces=True)
+
+.. rst-class:: html-toggle
+
+Generator Backends
+------------------
+The following classes are used by the :func:`generate` function behind the scenes,
+to perform word- and phrase- generation. They are useful for folks who want
+a little more information about the password generation process, and/or
+want to use a preconfigured generator.
+
+.. autoclass:: SecretGenerator
+.. autoclass:: WordGenerator
+.. autoclass:: PhraseGenerator
+
+Analysis
+========
+.. warning::
+
+    *Disclaimer:*
+    There can be no accurate estimate of the quality of a password,
+    because it depends on too many conditions that are unknowable from just
+    looking at the password. This code attempts to rule out the worst passwords,
+    and identify potentially-weak passwords, but should be used only as a guide.
+
+.. autofunction:: strength
+.. autofunction:: classify
diff --git a/docs/lib/passlib.utils.pbkdf2.rst b/docs/lib/passlib.utils.pbkdf2.rst
index f8eb89f..7fa9f98 100644
--- a/docs/lib/passlib.utils.pbkdf2.rst
+++ b/docs/lib/passlib.utils.pbkdf2.rst
@@ -26,7 +26,10 @@ PKCS#5 Key Derivation Functions
 Helper Functions
 ================
 .. autofunction:: norm_hash_name
+.. autofunction:: get_hash_info
+
 .. autofunction:: get_prf
+.. autofunction:: get_keyed_prf
 
 ..
     given how this module is expanding in scope,