Merged revisions 81788 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81788 | tarek.ziade | 2010-06-06 22:05:20 +0200 (Sun, 06 Jun 2010) | 1 line

  Fixed #8909: now the doc details the size of the bitmap used in distutils' bdist_wininst
........

diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index c7b756bed16408b8a4d2f97d1f75ef2778ea77fc..ab37c0f7a80ecd23071a98b391c9eb4c3b9777a6 100644 (file)
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -322,7 +322,7 @@ the :option:`--no-target-compile` and/or the :option:`--no-target-optimize`
 option.
 
 By default the installer will display the cool "Python Powered" logo when it is
-run, but you can also supply your own bitmap which must be a Windows
+run, but you can also supply your own 152x161 bitmap which must be a Windows
 :file:`.bmp` file with the :option:`--bitmap` option.
 
 The installer will also display a large title on the desktop background window

diff --git a/Misc/NEWS b/Misc/NEWS
index a8c430cd056ee8b8fde49844df5327e4b923f741..a8998fbaa48c83484ec6c43d97e4758af22981c8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1421,6 +1421,9 @@ Documentation
 - Update python manual page (options -B, -O0, -s, environment variables
   PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
 
+- Issue #8909: Added the size of the bitmap used in the installer created by
+  distutils' bdist_wininst. Patch by Anatoly Techtonik.
+
 Tests
 -----