merge 3.4

This commit is contained in:
Benjamin Peterson 2015-07-06 11:28:40 -05:00
commit 2dd6e477df
1 changed files with 1 additions and 1 deletions

View File

@ -26,7 +26,7 @@ avoid confusion, the terms used here are "pickling" and "unpickling".
.. warning::
The :mod:`pickle` module is secure against erroneous or maliciously
The :mod:`pickle` module is not secure against erroneous or maliciously
constructed data. Never unpickle data received from an untrusted or
unauthenticated source.