summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-07-08 18:53:59 -0400
committerEli Collins <elic@assurancetechnologies.com>2011-07-08 18:53:59 -0400
commit1ad4449dd053d5c19a7a9d432f556c34cd062971 (patch)
tree1e91f29cf4c7d79523f0c92ef86806349039af7b /docs
parent0f7d0b578a2121d324c8279f8f4e86d91e519b8e (diff)
downloadpasslib-1ad4449dd053d5c19a7a9d432f556c34cd062971.tar.gz
minor doc fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/lib/passlib.hash.sha512_crypt.rst4
-rw-r--r--docs/modular_crypt_format.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/lib/passlib.hash.sha512_crypt.rst b/docs/lib/passlib.hash.sha512_crypt.rst
index 86378ea..90f0812 100644
--- a/docs/lib/passlib.hash.sha512_crypt.rst
+++ b/docs/lib/passlib.hash.sha512_crypt.rst
@@ -5,8 +5,8 @@
.. currentmodule:: passlib.hash
SHA-512 Crypt and SHA-256 Crypt were developed in 2008 by Ulrich Drepper [#f1]_
-as a successor to :class:`~passlib.hash.md5_crypt`. They includes fixes
-and advancements such as variable rounds, and use of NIST-approved cryptgraphic primitives.
+as a successor to :class:`~passlib.hash.md5_crypt`. They include fixes
+and advancements such as variable rounds, and use of NIST-approved cryptographic primitives.
SHA-256 / SHA-512 Crypt are currently the default password hash for many systems
(notably Linux), and have no known weaknesses.
diff --git a/docs/modular_crypt_format.rst b/docs/modular_crypt_format.rst
index da01d9c..38a46d8 100644
--- a/docs/modular_crypt_format.rst
+++ b/docs/modular_crypt_format.rst
@@ -64,7 +64,7 @@ by the modular crypt format hashes found in passlib:
Despite this, as Unix systems have branched off,
new hashes have been developed which used larger
- identifying strings (eg ``$sha1$`` for :class:`sha1_crypt`);
+ identifying strings (eg ``$sha1$`` for :class:`~passlib.hash.sha1_crypt`);
so in general identifier strings should not be assumed to use a single character.
3. Hashes should contain only ascii letters ``a``-``z`` and ``A``-``Z``,