merge 3.4

benjaminp · benjaminp · commit 2dd6e477df5b · 2015-07-06T11:28:40.000-05:00
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
@@ -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.
 
