summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-01-04 22:30:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-01-04 22:30:13 (GMT)
commitdc5fdc5bb36f0ecd64fa8caa9edb16946c982469 (patch)
tree9ab104fbecf42c416790287d243e713f062476ab
parentf8693416b5a597627d1f208419b656f13bd7efb8 (diff)
parentb461000a3f8270f28384968d4122fbf102644d01 (diff)
downloadcpython-dc5fdc5bb36f0ecd64fa8caa9edb16946c982469.zip
cpython-dc5fdc5bb36f0ecd64fa8caa9edb16946c982469.tar.gz
cpython-dc5fdc5bb36f0ecd64fa8caa9edb16946c982469.tar.bz2
merge 3.4 (#23167)
-rw-r--r--Doc/library/marshal.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst
index 124eb61..af43944 100644
--- a/Doc/library/marshal.rst
+++ b/Doc/library/marshal.rst
@@ -106,7 +106,7 @@ In addition, the following constants are defined:
format, version 1 shares interned strings and version 2 uses a binary format
for floating point numbers.
Version 3 adds support for object instancing and recursion.
- The current version is 3.
+ The current version is 4.
.. rubric:: Footnotes