roll back 3.4.x branch

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 9c3ec73e4b81a76cf137cb5f969b9662a61376b1..381150816faa6b9f8e7bb087401a1ddcff2de944 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -272,11 +272,6 @@ unix: remove use of parentheses in nethack man page usage that confused a
        man page conversion tool
 winCE: disable processing of double-click messages if the first click
        causes map to scroll
-win32tty: work around problem where display symbols were wrong or unrecognizable
-       on systems where the default language for non-Unicode programs was not 
-       set to "US English" - courtesy Ray Chason
-win32tty: work around problem where some characters did not show up if the
-       console code page was other than 437
 Windows, probably MSDOS and OS/2: attempting to use very first false rumor
        for cookie fortune or random engraving could produce garbled text
        when rumors.tru had CR+LF line ends instead of Unix-style LF lines
@@ -300,18 +295,8 @@ support ^R (and ^L in numpad mode) to request display repaint during direction
        choosing and location choosing prompting modes
 intelligent pets will use keys to unlock doors
 destroyed drawbridge leaves some iron chains
-obsolete config file keywords: GRAPHICS, OBJECTS, TRAPS, EFFECTS
-deprecated options: IBMGraphics, DECGraphics, boulder
-new options: symset, roguesymset for choosing a symbol set from the symbols file
-new config file keyword: SYMBOLS for overriding character symbol values by name
 
 
 Platform- and/or Interface-Specific New Features
 ------------------------------------------------
 
-
-Code Cleanup and Reorganization
--------------------------------
-drawing symbols for DECGraphics, IBMGraphics, MACgraphics are now stored in an
-       external symbol file that can be changed without rebuilding
-  

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 85e60de786afd22d9fdf5e1aa2f49f6833034e05..6fe0f6d4298883619b813e6ffc91e0036656150f 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -175,6 +175,11 @@ win32gui: made auto-arrange windows on/off option (it was reset automatically
 win32gui: fix a possible crash with AltGr-4 WM_KEYDOWN handling
 win32gui: use whatever alternate tile set is loaded in the menus
 win32tty: prevent early error messages from flashing by too fast and not seen
+win32tty: work around problem where display symbols were wrong or unrecognizable
+       on systems where the default language for non-Unicode programs was not 
+       set to "US English" - courtesy Ray Chason
+win32tty: work around problem where some characters did not show up if the
+       console code page was other than 437
 platforms that support hangup: SAFERHANGUP to avoid losing objects in transit
        between lists when hangup occurs, and also avoid cheats due to
        well-timed hangups to stop a long melee
@@ -227,6 +232,10 @@ add ability to sort the list when viewing known spells with '+' command
 describe magic cancellation from worn armor in enlightment/end-of-game feedback
 add atmospheric sound messages for temples
 sometimes give announcement message when monsters teleport to hero's vicinity
+obsolete config file keywords: GRAPHICS, OBJECTS, TRAPS, EFFECTS
+deprecated options: IBMGraphics, DECGraphics, boulder
+new options: symset, roguesymset for choosing a symbol set from the symbols file
+new config file keyword: SYMBOLS for overriding character symbol values by name
 
 
 Platform- and/or Interface-Specific New Features
@@ -259,5 +268,6 @@ remove remains of sync_hunger, which has been ifdef'd out for years
 new mextra structure housing pointers to mname, egd, epri, eshk, emin, edog
 consolidate vault.h, epri.h, eshk.h, emin.h and edog.h into new mextra.h
 new oextra structure housing pointers to oname, omonst, omid, olong, and omailcmd
-
+drawing symbols for DECGraphics, IBMGraphics, MACgraphics are now stored in an
+       external symbol file that can be changed without rebuilding