merge 8.5

1 files changed, 4 insertions, 4 deletions

diff --git a/changes b/changes
index 9f08bb5..6864ebe 100644
--- a/changes
+++ b/changes
@@ -3731,7 +3731,7 @@ broken on the Mac and Windows. Added the ability to set the title of a
 menu when it gets torn off and override Tk's automatic generation of
 the title.  On the Macintosh, whenever a menu
 label contains three dots in a row "...", the menu will instead
-display the elipses character 'É'.  (SRP)
+display the elipses character '…'.  (SRP)
 
 3/27/97 (bug fixes) When a menu had an error executing a postcommand,
 the error information was getting lost. On Windows, a set of
@@ -6492,7 +6492,7 @@ Several documentation and release notes improvements
 
 2008-03-21 (bug fix)[1863007,1920030] Export Ttk stubs table (english)
 
-2008-03-26 (bug fix)[1922466] crash  in [. configure -cursor] (gavilán)
+2008-03-26 (bug fix)[1922466] crash  in [. configure -cursor] (gavilán)
 
 2008-03-27 (platform support)[1921166] Solaris 64bit build fixes (steffen)
 
@@ -6678,7 +6678,7 @@ in screen distances, reducing precision loss (ferrieux)
 
 2009-12-06 (bug fix)[2548661] crash in GetFontFamilyName (riefenstahl)
 
-2009-12-06 (bug fix)[2864685] Compiz menu item animation (gavilan,thoyts)
+2009-12-06 (bug fix)[2864685] Compiz menu item animation (gavilán,thoyts)
 
 2009-12-09 (bug fix)[2902573] Update Safe Tk to new Safe Base (kurpies)
 
@@ -6852,7 +6852,7 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2012-08-24 (bug fix)[3558535] file dialog filtering (fellows)
 
-2012-08-25 (bug fix)[3554026,3561016] crash with tearoff menus (gavilan)
+2012-08-25 (bug fix)[3554026,3561016] crash with tearoff menus (gavilán)
 
 2012-08-28 (bug fix)[3562426] Context menu goes off screen (nijtmans)