merge
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 0587e15..59af41b 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -236,7 +236,9 @@
: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
diff --git a/Doc/library/allos.rst b/Doc/library/allos.rst
index bf91717..f7105d8 100644
--- a/Doc/library/allos.rst
+++ b/Doc/library/allos.rst
@@ -16,7 +16,6 @@
io.rst
time.rst
argparse.rst
- optparse.rst
getopt.rst
logging.rst
logging.config.rst
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 81289a5..277feb1 100644
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -73,4 +73,5 @@
misc.rst
windows.rst
unix.rst
+ superseded.rst
undoc.rst
diff --git a/Doc/library/intro.rst b/Doc/library/intro.rst
index a0f2d63..e3283ca 100644
--- a/Doc/library/intro.rst
+++ b/Doc/library/intro.rst
@@ -30,10 +30,8 @@
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
diff --git a/Doc/library/modules.rst b/Doc/library/modules.rst
index d89ef10..6b2a40a 100644
--- a/Doc/library/modules.rst
+++ b/Doc/library/modules.rst
@@ -12,7 +12,6 @@
.. toctree::
- imp.rst
zipimport.rst
pkgutil.rst
modulefinder.rst
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
new file mode 100644
index 0000000..50a5983
--- /dev/null
+++ b/Doc/library/superseded.rst
@@ -0,0 +1,14 @@
+.. _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