merge 3.4 (#23110)

benjaminp · benjaminp · commit 7a120ecdf4ae · 2014-12-24T10:51:10.000-06:00
diff --git 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()
 
