merge with 3.2

diff --cc Doc/using/cmdline.rst
Simple merge

diff --cc Misc/python.man
Simple merge

diff --cc Modules/main.c
index 6b2d0f5fa84411ce66e6ff85ba2e6738d26df5b1,54cfe4a65ddd75e07e8c63dc5e55e8c6a6802d15..1282f4697be02a3c835896d52c7ff33f8df695be
--- 1/Modules/main.c
--- 2/Modules/main.c
+++ b/Modules/main.c
@@@ -98,16 -96,16 +98,16 @@@ PYTHONSTARTUP: file executed on interac
  PYTHONPATH   : '%c'-separated list of directories prefixed to the\n\
                 default module search path.  The result is sys.path.\n\
  ";
 -static char *usage_5 = "\
 -PYTHONHOME   : alternate <prefix> directory (or <prefix>%c<exec_prefix>).\n\
 -               The default module search path uses %s.\n\
 -PYTHONCASEOK : ignore case in 'import' statements (Windows).\n\
 -PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
 +static char *usage_5 =
 +"PYTHONHOME   : alternate <prefix> directory (or <prefix>%c<exec_prefix>).\n"
 +"               The default module search path uses %s.\n"
 +"PYTHONCASEOK : ignore case in 'import' statements (Windows).\n"
 +"PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
  ";
  static char *usage_6 = "\
- PYTHONHASHSEED: if this variable is set to ``random``, the effect is the same \n\
-    as specifying the :option:`-R` option: a random value is used to seed the\n\
-    hashes of str, bytes and datetime objects.  It can also be set to an integer\n\
+ PYTHONHASHSEED: if this variable is set to 'random', the effect is the same\n\
+    as specifying the -R option: a random value is used to seed the hashes of\n\
+    str, bytes and datetime objects.  It can also be set to an integer\n\
     in the range [0,4294967295] to get hash values with a predictable seed.\n\
  ";