merge with 3.4

Doc/c-api/init.rst

@@ -239,7 +239,9 @@ Process-wide parameters
    :c:func:`Py_Initialize`, then :c:func:`Py_GetPath` won't attempt to compute a
    default search path but uses the one provided instead.  This is useful if
    Python is embedded by an application that has full knowledge of the location
-   of all modules.  The path components should be separated by semicolons.
+   of all modules.  The path components should be separated by the platform
+   dependent delimiter character, which is ``':'`` on Unix and Mac OS X, ``';'``
+   on Windows.
 
    This also causes :data:`sys.executable` to be set only to the raw program
    name (see :c:func:`Py_SetProgramName`) and for :data:`sys.prefix` and

Doc/library/allos.rst

@@ -16,7 +16,6 @@ but they are available on most other systems as well.  Here's an overview:
    io.rst
    time.rst
    argparse.rst
-   optparse.rst
    getopt.rst
    logging.rst
    logging.config.rst

Doc/library/index.rst

@@ -73,4 +73,5 @@ the `Python Package Index <http://pypi.python.org/pypi>`_.
    misc.rst
    windows.rst
    unix.rst
+   superseded.rst
    undoc.rst

Doc/library/intro.rst

@@ -30,10 +30,8 @@ requires them; yet others are available only when a particular configuration
 option was chosen at the time when Python was compiled and installed.
 
 This manual is organized "from the inside out:" it first describes the built-in
-data types, then the built-in functions and exceptions, and finally the modules,
-grouped in chapters of related modules.  The ordering of the chapters as well as
-the ordering of the modules within each chapter is roughly from most relevant to
-least important.
+functions, data types and exceptions, and finally the modules, grouped in
+chapters of related modules.
 
 This means that if you start reading this manual from the start, and skip to the
 next chapter when you get bored, you will get a reasonable overview of the

Doc/library/modules.rst

@@ -12,7 +12,6 @@ The full list of modules described in this chapter is:
 
 .. toctree::
 
-   imp.rst
    zipimport.rst
    pkgutil.rst
    modulefinder.rst

Doc/library/superseded.rst

+.. _superseded:
+
+******************
+Superseded Modules
+******************
+
+The modules described in this chapter are deprecated and only kept for
+backwards compatibility. They have been superseded by other modules.
+
+
+.. toctree::
+
+   optparse.rst
+   imp.rst