diff -r 04563a1be003 Doc/library/pickle.rst
--- a/Doc/library/pickle.rst	Wed Jun 15 22:44:25 2011 -0400
+++ b/Doc/library/pickle.rst	Wed Jun 15 22:54:04 2011 -0400
@@ -456,8 +456,10 @@
 
    .. note::
 
-      If :meth:`__getstate__` returns a false value, the :meth:`__setstate__`
-      method will not be called upon unpickling.
+      For protocol versions 0 and 1 if :meth:`__getstate__` returns a false
+      value, the :meth:`__setstate__` method will not be called upon unpickling.
+      For versions 2 and above :meth:`__setstate__` isn't called only if
+      :meth:`__getstate__` returns ``None``.
 
 
 Refer to the section :ref:`pickle-state` for more information about how to use