summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-07 17:34:24 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-07 17:34:24 (GMT)
commitac8f78a1a9b5b4366f9534637b2b7a9e07038daf (patch)
tree2563ead3803f625448fa4484b088a134d7a1569f /Doc
parent61d28d6a740dac9705ae5b1efc7cb67a9a110bf1 (diff)
parent645a0dd6f79004652c52ae9d7246d1b219772588 (diff)
downloadcpython-ac8f78a1a9b5b4366f9534637b2b7a9e07038daf.zip
cpython-ac8f78a1a9b5b4366f9534637b2b7a9e07038daf.tar.gz
cpython-ac8f78a1a9b5b4366f9534637b2b7a9e07038daf.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/init.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 94f8c05..7507e3b 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -29,7 +29,7 @@ Initializing and finalizing the interpreter
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