summaryrefslogtreecommitdiff
path: root/docs/lib
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2013-12-28 17:20:36 -0500
committerEli Collins <elic@assurancetechnologies.com>2013-12-28 17:20:36 -0500
commit2aa0105f6471a1df4bc528639dd3ced5a1666ea5 (patch)
treeac7c49fadceb32e2242f46b29cb4fbf843f679e1 /docs/lib
parent7f14a72163cc51272905c9736e145af0f9824ebf (diff)
downloadpasslib-2aa0105f6471a1df4bc528639dd3ced5a1666ea5.tar.gz
gathered together a few more documentation updates
Diffstat (limited to 'docs/lib')
-rw-r--r--docs/lib/passlib.context.rst4
-rw-r--r--docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst2
-rw-r--r--docs/lib/passlib.hash.ldap_std.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/lib/passlib.context.rst b/docs/lib/passlib.context.rst
index 6df24ba..6d40067 100644
--- a/docs/lib/passlib.context.rst
+++ b/docs/lib/passlib.context.rst
@@ -458,8 +458,8 @@ if any invalid-but-correctable values are encountered
:class:`~passlib.hash.sha256_crypt` 's minimum of 1000).
.. versionchanged:: 1.6
- Previous releases issued a generic :exc:`UserWarning` instead
- of the more specific :exc:`PasslibConfigWarning`.
+ Previous releases used Python's builtin :exc:`UserWarning` instead
+ of the more specific :exc:`!passlib.exc.PasslibConfigWarning`.
Other Helpers
=============
diff --git a/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst b/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst
index 4b62520..270cd75 100644
--- a/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst
+++ b/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst
@@ -4,7 +4,7 @@
:class:`passlib.hash.dlitz_pbkdf2_sha1` - Dwayne Litzenberger's PBKDF2 hash
===========================================================================
-.. note::
+.. warning::
Due to a small flaw, this hash is not as strong as other PBKDF1-HMAC-SHA1
based hashes. It should probably not be used for new applications.
diff --git a/docs/lib/passlib.hash.ldap_std.rst b/docs/lib/passlib.hash.ldap_std.rst
index 0b0b13a..6440b49 100644
--- a/docs/lib/passlib.hash.ldap_std.rst
+++ b/docs/lib/passlib.hash.ldap_std.rst
@@ -38,7 +38,7 @@ Plain Hashes
============
.. warning::
- These hashes should be considered secure in any manner,
+ These hashes should not be considered secure in any way,
as they are nothing but raw MD5 & SHA-1 digests,
which are extremely vulnerable to brute-force attacks.