Automatically disable wxDialupManager for wxMac and wxCocoa,

[wxWidgets.git] / wxPython / docs / MigrationGuide.txt

diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt
index b9156e62c25890e480f2579a210a1e489c621323..0ade0dcccfa1eb987b0c00605c529f522d8c4101 100644 (file)
--- a/wxPython/docs/MigrationGuide.txt
+++ b/wxPython/docs/MigrationGuide.txt
@@ -849,11 +849,11 @@ directly in site-packages.  This is done to help facilitate having
 multiple versions of wxPython installed side-by-side.  Why would you
 want to do this?  One possible scenario is you have an app that
 requires wxPython 2.4 but you want to use the newest 2.5 to do your
 multiple versions of wxPython installed side-by-side.  Why would you
 want to do this?  One possible scenario is you have an app that
 requires wxPython 2.4 but you want to use the newest 2.5 to do your

-development with.  Or perhaps you want to be able to test your app
+own development with.  Or perhaps you want to be able to test your app

 with several different versions of wxPython to ensure compatibility.
 Before everyone panics, rest asured that if you only install one
 with several different versions of wxPython to ensure compatibility.
 Before everyone panics, rest asured that if you only install one

-version of wxPython then you should notice no difference in how
-things work.
+version of wxPython then you should notice no difference in how things
+work.

 
 In addition to installing wxPython into a "versioned" subdirectory of
 site-packages, a file named `wx.pth` is optionally installed that will
 
 In addition to installing wxPython into a "versioned" subdirectory of
 site-packages, a file named `wx.pth` is optionally installed that will


@@ -874,10 +874,10 @@ runtime so your applications can select which version of wxPython they
 would like to to have imported.  You use it like this::
 
       import wxversion
 would like to to have imported.  You use it like this::
 
       import wxversion

-      wxversion.require("2.4")
+      wxversion.select("2.4")

       import wx
 
       import wx
 

-Then eventhough a 2.5 version of wxPython may be the default the
+Then even though a 2.5 version of wxPython may be the default the

 application that does the above the first time that wx is imported
 will actually get a 2.4 version.  **NOTE:** There isn't actually a 2.4
 version of wxPython that supports this, but there will be.
 application that does the above the first time that wx is imported
 will actually get a 2.4 version.  **NOTE:** There isn't actually a 2.4
 version of wxPython that supports this, but there will be.