merge 3.4 (#23167)

2015-01-04 16:30:13 -06:00 · 2015-01-04 16:30:13 -06:00 · dc5fdc5bb3
parent f8693416b5 b461000a3f
commit dc5fdc5bb3
1 changed files with 1 additions and 1 deletions
--- 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