From c5dd095a9b75b72ab7a7c9790dcf6d62fc050331 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 11 Oct 2014 14:32:34 +0200
Subject: [PATCH 1/3] Closes #21675: fix ordering of description in library
 intro

---
 Doc/library/intro.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Doc/library/intro.rst b/Doc/library/intro.rst
index a0f2d6324f6..e3283cac994 100644
--- a/Doc/library/intro.rst
+++ b/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

From e8ea355b728fa2ae3fa060eeea477ebfa159a5f5 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 11 Oct 2014 14:36:02 +0200
Subject: [PATCH 2/3] Closes #21687: delimiter in Py_SetPath is platform
 dependent

---
 Doc/c-api/init.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 0587e15d9f3..59af41bd5aa 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -236,7 +236,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

From dbf834440423ce1e52c6175071fcb7538eab75f9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 11 Oct 2014 14:47:11 +0200
Subject: [PATCH 3/3] Closes #18959: move optparse and imp to new "superseded
 modules" chapter

---
 Doc/library/allos.rst      |  1 -
 Doc/library/index.rst      |  1 +
 Doc/library/modules.rst    |  1 -
 Doc/library/superseded.rst | 14 ++++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 Doc/library/superseded.rst

diff --git a/Doc/library/allos.rst b/Doc/library/allos.rst
index bf917174479..f7105d8af8e 100644
--- a/Doc/library/allos.rst
+++ b/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
diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 81289a56c51..277feb194ad 100644
--- a/Doc/library/index.rst
+++ b/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
diff --git a/Doc/library/modules.rst b/Doc/library/modules.rst
index d89ef106281..6b2a40a1b71 100644
--- a/Doc/library/modules.rst
+++ b/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
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
new file mode 100644
index 00000000000..50a5983236e
--- /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