summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-06-06 20:18:42 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-06-06 20:18:42 (GMT)
commit7047eb73349c7e41ee21ff21d678b4910e5b8ea6 (patch)
treebf9b0da39e943c362f97958c2c5e6ac9b13b477d
parent0d31d58c15ad5e628d92ab3c5208ebd093ff4da7 (diff)
downloadcpython-7047eb73349c7e41ee21ff21d678b4910e5b8ea6.zip
cpython-7047eb73349c7e41ee21ff21d678b4910e5b8ea6.tar.gz
cpython-7047eb73349c7e41ee21ff21d678b4910e5b8ea6.tar.bz2
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 ........
-rw-r--r--Doc/distutils/builtdist.rst2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index c7b756b..ab37c0f 100644
--- 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 a8c430c..a8998fb 100644
--- 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
-----