[Python-checkins] cpython (merge 3.4 -> 3.4): merge

[georg.brandl]

https://hg.python.org/cpython/rev/b710559c9def
changeset:   92956:b710559c9def
branch:      3.4
parent:      92949:fb65b9ed8023
parent:      92953:7276bc0b0318
user:        Georg Brandl <georg at python.org>
date:        Sat Oct 11 15:08:18 2014 +0200
summary:
  merge

files:
  Doc/c-api/init.rst         |   4 +++-
  Doc/library/allos.rst      |   1 -
  Doc/library/index.rst      |   1 +
  Doc/library/intro.rst      |   6 ++----
  Doc/library/modules.rst    |   1 -
  Doc/library/superseded.rst |  14 ++++++++++++++
  6 files changed, 20 insertions(+), 7 deletions(-)


diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- 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
--- 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
--- 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
--- 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
--- 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
--- /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

-- 
Repository URL: https://hg.python.org/cpython