Merge 3.5

This commit is contained in:
Yury Selivanov 2015-06-04 11:10:36 -04:00
commit df43379c7d
1 changed files with 2 additions and 2 deletions

View File

@ -585,7 +585,7 @@ always available.
.. note:: .. note::
This function has been added on a provisional basis (see :pep:`411` This function has been added on a provisional basis (see :pep:`411`
for details.) Use it only for debug purposes. for details.) Use it only for debugging purposes.
.. data:: hash_info .. data:: hash_info
@ -1106,7 +1106,7 @@ always available.
.. note:: .. note::
This function has been added on a provisional basis (see :pep:`411` This function has been added on a provisional basis (see :pep:`411`
for details.) Use it only for debug purposes. for details.) Use it only for debugging purposes.
.. data:: stdin .. data:: stdin