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 25d392348bbe7d28baf83c5ccd95185ed9677a88..ade5dfa561dd8935f53c7d5794192a5f0687d6a6 100644 (file)
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -318,7 +318,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 28523fa870b5c60a232fdd61b4496c02eb463aec..8fe20710d275d25aa4ac0be77387557763fbf52f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -282,6 +282,12 @@ Tests
 
 - Issue #8193: Fix test_zlib failure with zlib 1.2.4.
 
+Documentation
+-------------
+
+- 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 2.6.5?
 ===========================