summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-06 14:41:07 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-06 14:41:07 (GMT)
commitc0a446a7d9d44ee50ece960cbb5e81e72a9e5d33 (patch)
treecb18f8476261c0fee883f710d506d66d4f747781 /Doc
parent02eae6b1f23d1c5ea87816f1f8d15cdab2dfaf0a (diff)
parentb8fd26256ec712e0d0ede8cbf5697780fbc641a6 (diff)
downloadcpython-c0a446a7d9d44ee50ece960cbb5e81e72a9e5d33.zip
cpython-c0a446a7d9d44ee50ece960cbb5e81e72a9e5d33.tar.gz
cpython-c0a446a7d9d44ee50ece960cbb5e81e72a9e5d33.tar.bz2
merge 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/pickle.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
index e34f2b3..b116f96 100644
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -26,9 +26,9 @@ avoid confusion, the terms used here are "pickling" and "unpickling".
.. warning::
- The :mod:`pickle` module is not intended to be secure against erroneous or
- maliciously constructed data. Never unpickle data received from an untrusted
- or unauthenticated source.
+ The :mod:`pickle` module is secure against erroneous or maliciously
+ constructed data. Never unpickle data received from an untrusted or
+ unauthenticated source.
Relationship to other Python modules