Merged revisions 81790 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81790 | tarek.ziade | 2010-06-06 22:18:42 +0200 (Sun, 06 Jun 2010) | 9 lines
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 e58937d..74cc80a 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -321,7 +321,7 @@
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 df3474a..d809640 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -774,6 +774,9 @@
- 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.
+
What's New in Python 3.1.1?
===========================