Incorporate Terry's and Brian's feedback.

This commit is contained in:
Martin v. Löwis 2012-06-19 17:13:49 +02:00
parent 7bb9715cc0
commit 9fdb925c36
1 changed files with 5 additions and 3 deletions

View File

@ -96,8 +96,8 @@ Installation
with a reference counter. with a reference counter.
It contains a version resource matching the version number of the It contains a version resource matching the version number of the
pythonXY.dll with which it is distributed. Independent pythonXY.dll with which it is distributed. Independent
installations will always only overwrite newer versions of the installations will overwrite older version
launcher with older versions. Stand-alone releases use of the launcher with newer versions. Stand-alone releases use
a release level of 0x10 in FIELD3 of the CPython release on which a release level of 0x10 in FIELD3 of the CPython release on which
they are based. they are based.
@ -211,7 +211,9 @@ Configuration file
Two .ini files will be searched by the launcher - ``py.ini`` in the Two .ini files will be searched by the launcher - ``py.ini`` in the
current user's "application data" directory (i.e. the directory returned current user's "application data" directory (i.e. the directory returned
by calling the Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA) by calling the Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA,
%USERPROFILE%\AppData\Local on Vista+,
%USERPROFILE%\Local Settings\Application Data on XP)
and ``py.ini`` in the same directory as the launcher. The same .ini and ``py.ini`` in the same directory as the launcher. The same .ini
files are used for both the 'console' version of the launcher (i.e. files are used for both the 'console' version of the launcher (i.e.
py.exe) and for the 'windows' version (i.e. pyw.exe) py.exe) and for the 'windows' version (i.e. pyw.exe)