From: Robin Dunn Date: Fri, 15 Oct 2004 21:14:43 +0000 (+0000) Subject: DocsDemo --> docs-demos X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1683c9502018ab793ecad7c320a758a022dbb795 DocsDemo --> docs-demos git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/distrib/README.win32.txt b/wxPython/distrib/README.win32.txt index 14560f5fe5..291d65906b 100644 --- a/wxPython/distrib/README.win32.txt +++ b/wxPython/distrib/README.win32.txt @@ -3,10 +3,10 @@ wxPython win32 README The self-installer pacakge you have just installed contains the Python extension modules, python modules and pakcages needed to run wxPython -applications. If you selected "Make this install be the default -wxPython" then this version will be the one that is imported when apps -do "import wx". See the following wiki page for more information -about managing multiple installs: +applications. If you selected the "Make this install be the default +wxPython" option in the installer then this version will be the one +that is imported when apps do "import wx". See the following wiki +page for more information about managing multiple installs: http://wiki.wxpython.org/index.cgi/MultiVersionInstalls @@ -21,9 +21,10 @@ page for using wxversion. This installer does *not* include the wxPython documentation, the wxPython demo and other sample applications are provided as part of wxPython. Those are available in a separate installer named -wxPython2.5-DocsDemo-*.exe that should also be located from wherever -you downloaded this package from. The DocsDemo installer will also -install Start Menu shortcuts for the tool scripts mentioned above. +wxPython2.5-win32-docs-demos-*.exe which should also be located from +wherever you downloaded this package from. The Docs and Demos +installer will also create Start Menu shortcuts for the tool scripts +mentioned above. diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index b593deef95..659862226a 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -315,11 +315,11 @@ end. ISS_DocDemo_Template = r''' [Setup] -AppName = wxPython%(SHORTVER)s-DocsDemo +AppName = wxPython%(SHORTVER)s-docs-demos AppVerName = wxPython Docs and Demos %(VERSION)s -OutputBaseFilename = wxPython%(SHORTVER)s-win32-DocsDemo-%(VERSION)s +OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s AppCopyright = Copyright © 2004 Total Control Software -DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs Demos and Tools +DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools AlwaysCreateUninstallIcon = yes AdminPrivilegesRequired = no