Merge with 3.2.

diff --cc Doc/library/subprocess.rst
index 3faf60fa75b305a4c6e36fb12ae74e0e699521c4,5677738456874207eaf1f158bae8f6be68eb13b0..ab5668caf516172759a2c95e550e5167cc6a99a1
--- 1/Doc/library/subprocess.rst
--- 2/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@@ -255,10 -244,10 +255,10 @@@ This module defines one class called :c
  Convenience Functions
  ^^^^^^^^^^^^^^^^^^^^^
  
- This module also defines four shortcut functions:
+ This module also defines the following shortcut functions:
  
  
 -.. function:: call(*popenargs, **kwargs)
 +.. function:: call(*popenargs, timeout=None, **kwargs)
  
     Run command with arguments.  Wait for command to complete, then return the
     :attr:`returncode` attribute.