merge 3.4 (#23110)

2014-12-24 10:51:10 -06:00 · 2014-12-24 10:51:10 -06:00 · 7a120ecdf4
parent e4db76967d b33bb89b1a
commit 7a120ecdf4
1 changed files with 3 additions and 0 deletions
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@ -251,6 +251,9 @@ Process-wide parameters
   Use :c:func:`Py_DecodeLocale` to decode a bytes string to get a
   :c:type:`wchar_*` string.

+   The path argument is copied internally, so the caller may free it after the
+   call completes.
+

 .. c:function:: const char* Py_GetVersion()