[Python-checkins] cpython: Put version* directives at the right scope

Sun May 29 18:14:28 CEST 2011

http://hg.python.org/cpython/rev/24cb2fab8c89
changeset: 70490:24cb2fab8c89
user: Éric Araujo <merwok at netwok.org>
date: Sun May 29 03:27:48 2011 +0200
summary:
 Put version* directives at the right scope
files:
 Doc/library/crypt.rst | 20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -29,6 +29,8 @@
 Hashing Methods
 ---------------
 
+.. versionadded:: 3.3
+
 The :mod:`crypt` module defines the list of hashing methods (not all methods
 are available on all platforms):
 
@@ -37,33 +39,26 @@
 A Modular Crypt Format method with 16 character salt and 86 character
 hash. This is the strongest method.
 
- .. versionadded:: 3.3
-
 .. data:: METHOD_SHA256
 
 Another Modular Crypt Format method with 16 character salt and 43
 character hash.
 
- .. versionadded:: 3.3
-
 .. data:: METHOD_MD5
 
 Another Modular Crypt Format method with 8 character salt and 22
 character hash.
 
- .. versionadded:: 3.3
-
 .. data:: METHOD_CRYPT
 
 The traditional method with a 2 character salt and 13 characters of
 hash. This is the weakest method.
 
- .. versionadded:: 3.3
-
 
 Module Attributes
 -----------------
 
+.. versionadded:: 3.3
 
 .. attribute:: methods
 
@@ -71,8 +66,6 @@
 ``crypt.METHOD_*`` objects. This list is sorted from strongest to
 weakest, and is guaranteed to have at least ``crypt.METHOD_CRYPT``.
 
- .. versionadded:: 3.3
-
 
 Module Functions
 ----------------
@@ -108,9 +101,8 @@
 different sizes in the *salt*, it is recommended to use the full crypted
 password as salt when checking for a password.
 
-.. versionchanged:: 3.3
- Before version 3.3, *salt* must be specified as a string and cannot
- accept ``crypt.METHOD_*`` values (which don't exist anyway).
+ .. versionchanged:: 3.3
+ Accept ``crypt.METHOD_*`` values in addition to strings for *salt*.
 
 
 .. function:: mksalt(method=None)
@@ -124,7 +116,7 @@
 16 random characters from the set ``[./a-zA-Z0-9]``, suitable for
 passing as the *salt* argument to :func:`crypt`.
 
-.. versionadded:: 3.3
+ .. versionadded:: 3.3
 
 Examples
 --------
-- 
Repository URL: http://hg.python.org/cpython
