1 files changed, 5 insertions, 1 deletions
diff --git a/python/google/protobuf/message.py b/python/google/protobuf/message.py
index 6ec2f8be..37b0af14 100755
--- a/python/google/protobuf/message.py
+++ b/python/google/protobuf/message.py
@@ -177,7 +177,11 @@ class Message(object):
     raise NotImplementedError
 
   def ParseFromString(self, serialized):
-    """Like MergeFromString(), except we clear the object first."""
+    """Parse serialized protocol buffer data into this message.
+
+    Like MergeFromString(), except we clear the object first and
+    do not return the value that MergeFromString returns.
+    """
     self.Clear()
     self.MergeFromString(serialized)