[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/694110bc91d8
changeset:   74296:694110bc91d8
parent:      74293:0fe63bb20e74
parent:      74295:69527695eff8
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Jan 07 18:34:24 2012 +0100
summary:
  merge with 3.2

files:
  Doc/c-api/init.rst |  2 +-
  1 files changed, 1 insertions(+), 1 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
@@ -29,7 +29,7 @@
 
    Initialize the Python interpreter.  In an application embedding  Python, this
    should be called before using any other Python/C API functions; with the
-   exception of :c:func:`Py_SetProgramName` and :c:func:`Py_SetPath`.  This initializes
+   exception of :c:func:`Py_SetProgramName`, :c:func:`Py_SetPythonHome` and :c:func:`Py_SetPath`.  This initializes
    the table of loaded modules (``sys.modules``), and creates the fundamental
    modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`.  It also initializes
    the module search path (``sys.path``). It does not set ``sys.argv``; use

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