diff -Naurd ../nethack-3.4.1/doc/fixes30.0 ./doc/fixes30.0
--- ../nethack-3.4.1/doc/fixes30.0 Thu Jan 1 01:00:00 1970
+++ ./doc/fixes30.0 Mon Sep 1 14:33:32 2003
@@ -0,0 +1,164 @@
+$RCSfile: fixes30.0,v $ $Revision: 1.1.2.2 $ $Date: 2003/05/11 15:10:00 $
+
+[This is a partial list supplied by Ken Arromdee long after the fact]
+
+General Fixes and Modified Features
+-----------------------------------
+dropping a weapon, then picking it up while blind causes it to become 
+	unidentified but it remains that way after your vision returns
+when blind and feeling the floor, the objects then on the floor should
+	have their characteristics become unknown
+zapping a wand of probing at yourself works, however using a stethoscope
+	on yourself does not
+trolls that come back to life don't retain their names
+if you look at what is on the ground and there is more than a screenful,
+	quantities are not printed (i.e. "food rations")
+if pickup was off and you moved onto a spot with both engraving and objects,
+	you got told what the engraving was twice
+if a Keystone Kop threw a pie and the pie hit a shopkeeper, the shopkeeper
+	became angry
+"two handed sword" is spelled with and without a hyphen in various places
+trying to descend stairs while levitating gives a message where "You're"
+	is misspelled as "Your"
+the 'V' command gives a history that is not quite correct; it wasn't 
+	Ken Arromdee that merged PC Hack and Unix Hack; rather, PC Hack 
+	was derived from Unix Hack by Don Kneller.  It was (I think) 
+	Mike Stephenson who merged the many Hack versions.
+the uranium wand gets described as "an" uranium wand
+potions which have been both called and identified have the called instead
+	of the identified name printed out
+status line at the bottom of the screen is formatted strangely for the
+	first 10 moves; after 10 moves it becomes normal
+if you polymorph yourself into a rockmole, you are unable to dig through
+	rock
+a stethoscope or wand of probing, used on a monster, printed out a format
+	with spaces in it (such as %-3d instead of %d) causing such messages
+	to be longer than necessary
+the number printed out for damage by stethoscope or wand of probing is 
+	completely incorrect
+sometimes your dog would turn into a bat (retaining the same name and 
+	tameness) when saving and restoring,going down and back up
+	and in bones levels
+ghosts on bones levels are replaced by little dogs
+if you are polymorphed and drink a potion of healing which raises your
+	maximum monster hit points, your current hit points only are raised, so
+	you may have (for instance) 37 out of 36 hit points
+when you pick up something from a shop, the message is something like
+	"For you, kind sir, only 5 for this <garbage>" on systems where
+	pointer is not the same size as integer
+removing a leash from a dog produces garbage, and also can sometimes
+	crash the game
+when the Wizard is mentioned, you get garbage
+if you tame a wild dog, and then try to hit it, the safe-attack routine
+	says "You stop to avoid hitting .", or sometimes garbage
+when you are invisible but can see invisible, drinking at a fountain which
+	dries up causes your symbol to be erased from the screen.
+pushing an enormous rock onto a teleport trap deletes it instead of 
+	teleporting it
+sometimes returning to human form from a polymorph would leave you with 
+	only 1 current hit point left
+sometimes polymorphing would leave you with an 18/** strength
+if you used a stethoscope on a wall and a creature moved into the revealed
+	door before you did, when creature moved off, the door was replaced
+	by a wall symbol again, until you walked through it
+playing a game with fountain symbols set to one character, and restoring it
+	using a configuration file having them set to a different character,
+	leaves the fountain symbols as the old character
+problem with food poisoning and blindness where you could end up permanently 
+	blind, not even reversible by healing etc.
+you could not wish for a C-ration or K-ration due to lowercase conversion
+zapping a wand of death at yourself, and the death touch of a demon
+	prince, killed you even if you were polymorphed into an undead,
+	but bouncing death rays didn't
+if you threw an object in a shop, it landed on the floor still unpaid
+	zapping a wand of cancellation at yourself turned all your objects to
+	-1 instead of +0; -1 was only needed for wands (since cancelling wands 
+	to +0 allowed a sneaky way of getting infinite wishes)
+#remove command is incorrectly described as removing a cursed
+	object, but it actually removes only iron balls
+at least some messages given for special abilities when you are polymorphed
+	printed out the monster type even if you were blind
+wishing for a scroll of mail, with MAIL undefined, is permitted but
+	reading the scroll gave an "impossible" error message; change it to
+	read: "This seems to be junk mail directed to the finder of the Eye 
+	of Larn."
+if you were blind, effects of scrolls, et al, still said things such as
+	"Your mace glows green for a moment," "Your left ring glows white"
+the message "The xan pricks your ___ leg" still mentions the type of
+	monster (xan) when you are blind
+polymorphing could change your gender, but when the game ended you were 
+	still described as a "Cave-man" or "Priest" instead of 
+	"Cave-woman" or "Priestess"
+if you got rocks by using a pick-axe on an enormous rock, the rocks 
+	started out blessed
+if you escaped from a shop by throwing your iron ball to the exit, the ball
+	would stay unpaid
+any object thrown in a shop stayed unpaid, and you had to
+	pick the object up again and then drop it for it to become paid
+if you were invisible but could see invisible, when you drank from a fountain
+	that dried up, your symbol got erased from the screen
+several times colors were mentioned (i.e. black glows when you pray too much)
+	but the colors weren't always changed for hallucination
+if punished and your chain and 1 other object is on the floor, you
+	get asked if you want to pick up a specific type of object, 
+	and the chain is given as one of the possible objects
+if you polymorph into a "new man", your energy points never change
+trolls, when killed, can leave bodies or objects, but they should
+	always leave bodies so they can regenerate back to life, 
+	whether or not they left objects
+demon prince demanding bribe gets randomly relocated instead of being placed 
+	next to you
+if you polymorph another tool into a magic marker, the marker always starts
+	out dried out
+hallucination has the problem that if you do something which takes no time,
+	the monsters still change
+if you tried drinking at a fountain while levitating, you got asked if you 
+	wanted to drink, and then you weren't allowed to do it, and 
+	the fountain could still dry up
+if you were fire resistant and a magic trap produced a tower of flame, you 
+	also get a second message (a shiver...)
+when restoring a game, if there was an error, your saved game still vanishd
+	for some errors
+pets were always referred to as "him" in the leash code
+stethoscope in the up or down direction while swallowed referred to "floor" 
+	and "ceiling" instead of to the monster that swallowed you
+if you could not save a game, the screen cleared and you were told to 
+	"Continue or Quit", but if you typed C, the game thought you just 
+	gave it a Call command
+you could get told "that spellbook was a mimic" even if mimic was on a wall
+if you were turning to stone and you polymorphed yourself into a 'c', you 
+	still died from the stoning
+if you interrupted the program before it finished loading a saved game,
+	you were asked if you want your possessions identified
+"ctmp" was mistakenly used in MHITU.C when being hit by a rust monster
+	rusting your helmet but it should have been "!mtmp->mcan"
+
+
+Platform- and/or Interface-Specific Fixes
+-----------------------------------------
+PC: often the same character class, and same player name, will end up
+	getting 2 scores on the high score list
+PC: if your name contained a period and you were playing on a PC, you would
+	 have problems saving games since your save-file name still contained
+	 2 periods and would thus be illegal; change periods to underscores 
+	when figuring out what the save file should be called
+PC: if you polymorphed into a "new man", and changed your name, when you saved
+	your game the game was still saved under a filename derived from your
+	old name, and to restore that game you had to specify your old name
+
+General New Features
+--------------------
+when polymorphed into a giant you are now able to pick up and
+	throw rocks by giving infinite carrying capacity
+give the Healer a pair of gloves (the most logical piece of armor
+	for a physician to start out with)
+give the Healer a lot of money to start with (doctors are supposedly
+	rich, you see)
+have the Healer start out with the healing, cure blindness spells 
+	already known
+create a "trial mode", similar to Wizard Mode where you get a wand of wishing
+	with charges and you can't get on the high score list
+if you are standing on a trapdoor and you type a '>' symbol,
+	print "You jump down the hole." and go down to the next level
+
+
diff -Naurd ../nethack-3.4.1/doc/fixes34.0 ./doc/fixes34.0
--- ../nethack-3.4.1/doc/fixes34.0 Sun Feb 23 14:43:18 2003
+++ ./doc/fixes34.0 Mon Sep 1 14:33:32 2003
@@ -264,6 +264,9 @@
 traps detected while blind and levitating were not displayed
 when a mind flayer uses its mind attack, it should wake the victim
 shapechangers restored from disk would no longer change shape
+allow "tame" prefix when using the wizmode C-g command to create new monster(s)
+display a more appropriate name for a high priestess when using ;/ commands
+change "The water elemental is on fire" to "The water elemental is boiling"
 blind, cancelled or nonseen invisible Medusa cannot gaze at other monsters
 fix impossible when spinning web on falling rock, rolling boulder and fire traps
 rust monsters can only eat items made of rustable material
diff -Naurd ../nethack-3.4.1/doc/fixes34.2 ./doc/fixes34.2
--- ../nethack-3.4.1/doc/fixes34.2 Thu Jan 1 01:00:00 1970
+++ ./doc/fixes34.2 Mon Sep 1 14:33:32 2003
@@ -0,0 +1,180 @@
+$RCSfile: fixes34.2,v $ $Revision: 1.2.2.130 $ $Date: 2003/08/26 15:13:56 $
+
+General Fixes and Modified Features
+-----------------------------------
+avoid panic when secondary weapon is cursed while generating bones level
+don't crash when applying a figurine, candle, or bell that gets used up
+grammar bits
+two invisible monsters hitting one another should not be visible
+if only one monster in a monster-vs-monster fight is visible, show an I symbol
+	for the other one whether it is an attacker or defender
+display "It" and not "The invisible <pet>" when an invisible pet eats food.
+include a hint about expected input when prompting for musical notes
+don't report "program initialization failed" if a panic occurs after the
+	game is over
+include statue contents in end of game inventory disclosure
+treat handlessness as a major problem when deciding prayer outcome
+perform artifact touch checks when putting on accessories
+missing noun in message when horns pierce through your helmet
+don't use hcolor() for trapped chest gases when you aren't hallucinating
+the age of a potion of oil from a bones file wasn't being handled correctly
+putting gold in a container on the shop floor wasn't credited the way
+	gold already in the container when dropped was credited
+avoid integer division rounding error when calculating carrying capacity
+don't lock/unlock a door while in a pit, to be consistent with door opening
+infravision should not make invisible player "visible" (it doesn't for monsters)
+Perseus statue should always be male
+charge correctly when breaking multiple objects with the same zap, avoids
+	a dopay: not to shopkeeper impossible
+clean up funny lighting on the healer locate level
+allow all tame monsters that eat to consider food thrown to them
+the screen display wasn't always up to date after map topology changes
+jumping over a sokobon pit would result in the player next to, not in, the pit
+don't let arrow, rock or dart traps provide an infinite number of objects
+make enhanced ammo harder to break to make lesser number last longer
+dropping from height or throwing a normal container may damage contents
+some Magicbane messages treated "erinys" as plural
+initialize artifacts before processing $WIZKIT
+clean up inconsistency between various places quaff is documented
+is_damageable was using is_rottable incorrectly
+charge for use of an unpaid tinning kit
+avoid impossible when water freezes while hero is hiding under water
+avoid impossible after eating the object the hero is hiding under
+failed attempt to eat floor gold while polymorphed would lose the gold
+running that stops for closed doors should stop at mimics mimicking closed doors
+allow wishing for magenta potions (ignoring the rank name 'mage')
+fix an uninitialized memory access in non-quick dolookup
+fix were changing message that wasn't being displayed
+immediate encumbrance feedback when removing gauntlets of power
+make deliberately flying down the Castle's trap doors consistent with falling
+give more explicit feedback for exploding bag of holding
+help display for "list of game options" misformats runmode and scroll_amount
+pit created by land mine explosion doesn't start out concealed
+update map display sooner when pushed boulder triggers land mine explosion
+prevent several QBUFSZ sized buffers from overflowing and triggering fatal 
+	errors inside window port prompt routines
+make sure that leashed monsters are released prior to shopkeeper inheriting
+	dead character's inventory
+attaching long named candle to long named candelabrum caused buffer overflow
+when polymorhed, only hand/weapon attack on disenchanter should result in
+	damage to weapon, gloves, etc.
+killer should say "the" when choking on unique monster's corpse
+allow applying polearm on monster you can see via infravision
+killer reason shouldn't use "a" or "an" prefix for multiple projectiles
+	scattered by land mine explosion
+killer reason for named missile could end up with garbage instead of the name
+make killer reason for various poisioning deaths be more consistent
+poison missiles were unintentionally more likely to inflict "deadly poison"
+	than in pre-3.4.1 releases
+provide feedback when going invisible after eating a stalker
+killer on tombstone had no prefix for starvation/exhaustion case
+ensure proper message ordering for boulder trap messages
+clean up data set by join_map that is overlaid by MAPs on special levels
+clarify disclose option default in opthelp, and support "all" as old help said
+add more calls to update_inventory as the inventory changes
+don't charge for items picked up from monster's interior while swallowed
+choking while eating non-food always called the food "quick snack"
+short swords are not throwing weapons
+several sit-in-trap cases were unreachable
+curse candelabrum in bones, like other similar artifacts
+detecting a trap in a chest while confused should not exercise wisdom
+any golem statue hit with stone-to-flesh spell animates as flesh golem
+correct invalid startup gender selection
+can no longer untrap floor containers during unskilled riding
+can no longer easily set land mines and bear traps during unskilled riding
+refine cmdassist handling for armor vs accessories
+prevent monsters from level teleporting out of the quest into the main dungeon
+prevent monsters from level teleporting into the Sanctum prior to invocation
+"m," command sequence would let you see all objects at a location even when 
+	they included a cockatrice corpse which hero was unequipped to handle
+use correct pronoun for unique monsters
+hostile monsters who follow you between levels won't do so if they're fleeing
+options for font_size for map, menu, message, status, and text all had the 
+	same description of "the size of the map font" in options.c
+when dismounting by choice and unimpaired, try not to land in a known trap
+when jousting a pudding into a polymorh trap, it was possible to end up
+	with two of the new type of monster
+don't allow polymorphed player to web over the stairs
+geographical shopkeeper updates
+stethoscope use should be free the first time it's use per player move
+travel command caches last position to make non-mouse less painful
+update pit trapped time when polymorphing to or from a monster that passes_walls
+show artifact hit message which affect the monster that swallowed the hero
+revived pet corpse from bones file should not be loyal to current player
+finding a statue trap you are about to dig should stop your occupation
+try to keep saddle at the same location as the steed corpse
+never display I symbol on the mounted hero/steed location
+pit digging is no longer stopped by a sleeping monster next to you
+ensure mksobj() always attaches timer to corpse, even if called with init FALSE
+only charge for eating one stacked tin, not all at once
+add flag to makemon() to allow monster to be created adjacent to the supplied 
+	coordinates if there is already a monster at the target location
+stone-to-flesh of spot with multiple statues can animate more than one
+use of stethoscope now deliberately impacted when hero is engulfed by whirly 
+	monster but fixed so it can sometimes work on your steed there too
+typos fixed in data.base
+add looting freehand() check to able_to_loot() to prevent opening container
+	only to be told that you can't loot anything
+Schroedinger's Cat could be placed at wrong location when its box is carried
+travel while polymorphed into a grid bug should not move diagonally
+refine cmdassist handling for grid bugs
+when casting force bolt spell while engulfed go ahead and use the engulfers 
+	name in the hit message rather than "it"
+a fog cloud shouldn't pummel you with debris
+do not let an attached iron ball drag the hero through a location that the hero
+	could not move normally
+hero's appearance should change immediately after mimicing completes
+avoid some uses of "it" in killer messages
+avoid "singular of null?" warning for info lookup of obscure user input
+there was no check for iron bars in dokick() so it defaulted to "empty space"
+if you couldn't see the rat created in a sink for some reason other than
+	blindness, you would get "Eek there's it in the sink."
+digging a pit while stuck in the floor should always free the player
+quest guardians can no longer be created via stone-to-flesh on their statue
+stone-to-flesh no longer silently ignored by a statue of a unique monster
+wishing for quest guardian corpse now gives a generic corpse of the species
+prevent quest guardians from other classes from talking to you as if they 
+	were your quest guardian
+wake up shopkeeper if a shop transaction is attempted while he's immobilized 
+statues created from monsters remember more monster attributes
+
+
+Platform- and/or Interface-Specific Fixes
+-----------------------------------------
+Gnome: compilation problems on Redhat 7.2 and 8.0
+unix: Makefile.utl would put OBJDIR objects in the wrong directory
+vms: create an empty paniclog file during playground installation
+win32tty: add subkeyvalue option to alter key values; Finnish keyboard fix
+win32tty: distinguish between black/gray/white (by Quietust)
+win32gui: prevent male Valkyrie and other incorrect startup settings
+win32gui: allow numeric quantity count on item selection during loot
+win32: some code in files.c was incorrectly assuming that a file
+	descriptor return value of 0 from open() was invalid but it 
+	could be valid on win32gui where stdin, stdout, stderr aren't open;
+	now it correctly checks for return value < 0 from open() 
+tiles: high priest tile had a couple bad pixels
+tiles: bad pixels in Croesus and Yeenoghu tiles
+FreeBSD: incorrect srandom declaration
+unix: don't autosave if hangup occurs after game is over
+linux: add example use of nroff on recent Linux distros
+linux: use random() by default instead of lrand48()
+OpenBSD: time() prototype and correct default Mail program
+Gnome: compilation problems on Solaris
+unix: better error message for .nethackrc access problems
+vms: during installation, warn if dlb file creation or non-dlb playground
+	setup is missing expected data files
+
+
+General New Features
+--------------------
+debug mode level teleport menu via '?'
+
+
+Platform- and/or Interface-Specific New Features
+------------------------------------------------
+win32tty: keystroke handlers can be dynamically loaded to assist in resolving
+	internationalization issues
+win32tty: add Ray Chason's code for international keyboard handling
+Solaris (and other SystemV variants): TIMED_DELAY support
+X11: NetHack.ad is now installed and used w/o user intervention
+
diff -Naurd ../nethack-3.4.1/doc/Guidebook.mn ./doc/Guidebook.mn
--- ../nethack-3.4.1/doc/Guidebook.mn Sun Feb 23 14:43:18 2003
+++ ./doc/Guidebook.mn Mon Sep 1 14:33:32 2003
@@ -1,11 +1,11 @@
-.\" $Revision: 1.61 $ $Date: 2003/02/13 04:55:27 $
+.\" $Revision: 1.61.2.7 $ $Date: 2003/08/28 11:22:27 $
 .ds h0 "NetHack Guidebook
 .ds h1
 .ds h2 %
 .ds vr "NetHack 3.4
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "February 12, 2003
+.ds f2 "August 14, 2003
 .mt
 A Guide to the Mazes of Menace
 (Guidebook for NetHack)
@@ -573,7 +573,7 @@
 Repeat previous message.  Subsequent ^P's repeat earlier messages.
 The behavior can be varied via the msg_window option.
 .lp q
-Quaff (drink) a potion.
+Quaff (drink) something (potion, water, etc).
 .lp Q
 Select an object for your quiver.  You can then throw this using
 the `f' command.  (In versions prior to 3.3 this was the command to quit
@@ -1941,7 +1941,9 @@
 .lp "null    "
 Send padding nulls to the terminal (default off).
 .lp number_pad
-Use the number keys to move instead of [yuhjklbn] (default off).
+Use the number keys to move instead of [yuhjklbn] (default 0 or off).
+(number_pad:2 invokes the old DOS behaviour where `5' means `g', meta-`5'
+means `G',  and meta-`0' means `I'.)
 .lp objects
 Set the characters used to display object classes
 (default ``])[="(%!?+/$*`0_.'').
@@ -2132,6 +2134,8 @@
 NetHack should use this size font for the status window.
 .lp font_size_text	
 NetHack should use this size font for text windows.
+.lp fullscreen
+NetHack should try and display on the entire screen rather than in a window.
 .lp hilite_pet
 Visually distinguish pets from similar animals (default off).
 The behavior of this option depends on the type of windowing you use.
@@ -2159,6 +2163,8 @@
 .lp scroll_margin
 NetHack should scroll the display when the hero or cursor
 is this number of cells away from the edge of the window.
+.lp softkeyboard
+Display an onscreen keyboard.  Handhelds are most likely to support this option.
 .lp splash_screen
 NetHack should display an opening splash screen when it starts up (default yes).
 .lp tiled_map	
@@ -2177,11 +2183,19 @@
 .lp windowcolors
 NetHack should display windows with the specified foreground/background
 colors if it can.
+.lp wraptext
+NetHack port should wrap long lines of text if they don't fit in 
+the visible area of the window.
 .hn 2
 Platform-specific Customization options
 .pg
 Here are explanations of options that are used by specific platforms or ports 
 to customize and change the port behaviour.
+.lp altkeyhandler
+Select an alternate keystroke handler dll to load (Win32 tty NetHack only).
+The name of the handler is specified without the .dll extension and without any
+path information.
+Cannot be set with the `O' command.
 .lp altmeta
 (default on, AMIGA NetHack only).
 .lp "BIOS    "
@@ -2204,6 +2218,14 @@
 .lp soundcard
 (default on, PC NetHack only).
 Cannot be set with the `O' command.
+.lp subkeyval
+(Win32 tty NetHack only).
+May be used to alter the value of keystrokes that the operating system
+returns to NetHack to help compensate for international keyboard issues.
+OPTIONS=subkeyvalue:171/92
+will return 92 to NetHack, if 171 was originally going to be returned.
+You can use multiple subkeyvalue statements in the config file if needed.
+Cannot be set with the `O' command.
 .lp video
 Set the video mode used (PC NetHack only).
 Values are `autodetect', `default', or `vga'.
@@ -2545,42 +2567,43 @@
 center;
 c c c.
 .\"TABLE_START
-Adam Aronow	Irina Rempt-Drijfhout	Mike Gallop
-Alex Kompel	Izchak Miller	Mike Passaretti
-Andreas Dorn	J. Ali Harlow	Mike Stephenson
-Andy Church	Janet Walz	Norm Meluch
-Andy Swanson	Janne Salmijarvi	Olaf Seibert
-Ari Huttunen	Jean-Christophe Collet	Pasi Kallinen
-Barton House	Jochen Erwied	Pat Rankin
-Benson I. Margulies	John Kallen	Paul Winner
-Bill Dyer	John Rupley	Pierre Martineau
-Boudewijn Waijers	John S. Bien	Ralf Brown
-Bruce Cox	Johnny Lee	Richard Addison
-Bruce Holloway	Jon W{tte	Richard Beigel
-Bruce Mewborne	Jonathan Handler	Richard P. Hughey
-Carl Schelin	Joshua Delahunty	Rob Menke
-Chris Russo	Keizo Yamamoto	Robin Johnson
-David Cohrs	Ken Arnold	Roderick Schertler
-David Damerell	Ken Arromdee	Roland McGrath
-David Gentzel	Ken Lorber	Ron Van Iwaarden
-David Hairston	Ken Washikita	Ronnen Miller
-Dean Luick	Kevin Darcy	Ross Brown
-Del Lamb	Kevin Hugo	Sascha Wostmann
-Deron Meranda	Kevin Sitze	Scott Bigham
-Dion Nicolaas	Kevin Smolkowski	Scott R. Turner
-Dylan O'Donnell	Kevin Sweet	Stephen Spackman
-Eric Backus	Lars Huttar	Stephen White
-Eric Hendrickson	Malcolm Ryan	Steve Creps
-Eric R. Smith	Mark Gooderum	Steve Linhart
-Eric S. Raymond	Mark Modrall	Steve VanDevender
-Erik Andersen	Marvin Bressler	Teemu Suikki
-Frederick Roeber	Matthew Day	Tim Lennan
-Gil Neiger	Merlyn LeRoy	Timo Hakulinen
-Greg Laskin	Michael Allison	Tom Almy
-Greg Olson	Michael Feir	Tom West
-Gregg Wonderly	Michael Hamel	Warren Cheung
-Hao-yang Wang	Michael Sokolov	Warwick Allison
-Helge Hafting	Mike Engber	Yitzhak Sapir
+Adam Aronow	Izchak Miller	Mike Stephenson
+Alex Kompel	J. Ali Harlow	Norm Meluch
+Andreas Dorn	Janet Walz	Olaf Seibert
+Andy Church	Janne Salmijarvi	Pasi Kallinen
+Andy Swanson	Jean-Christophe Collet	Pat Rankin
+Ari Huttunen	Jochen Erwied	Paul Winner
+Barton House	John Kallen	Pierre Martineau
+Benson I. Margulies	John Rupley	Ralf Brown
+Bill Dyer	John S. Bien	Ray Chason
+Boudewijn Waijers	Johnny Lee	Richard Addison
+Bruce Cox	Jon W{tte	Richard Beigel
+Bruce Holloway	Jonathan Handler	Richard P. Hughey
+Bruce Mewborne	Joshua Delahunty	Rob Menke
+Carl Schelin	Keizo Yamamoto	Robin Johnson
+Chris Russo	Ken Arnold	Roderick Schertler
+David Cohrs	Ken Arromdee	Roland McGrath
+David Damerell	Ken Lorber	Ron Van Iwaarden
+David Gentzel	Ken Washikita	Ronnen Miller
+David Hairston	Kevin Darcy	Ross Brown
+Dean Luick	Kevin Hugo	Sascha Wostmann
+Del Lamb	Kevin Sitze	Scott Bigham
+Deron Meranda	Kevin Smolkowski	Scott R. Turner
+Dion Nicolaas	Kevin Sweet	Stephen Spackman
+Dylan O'Donnell	Lars Huttar	Stephen White
+Eric Backus	Malcolm Ryan	Steve Creps
+Eric Hendrickson	Mark Gooderum	Steve Linhart
+Eric R. Smith	Mark Modrall	Steve VanDevender
+Eric S. Raymond	Marvin Bressler	Teemu Suikki
+Erik Andersen	Matthew Day	Tim Lennan
+Frederick Roeber	Merlyn LeRoy	Timo Hakulinen
+Gil Neiger	Michael Allison	Tom Almy
+Greg Laskin	Michael Feir	Tom West
+Greg Olson	Michael Hamel	Warren Cheung
+Gregg Wonderly	Michael Sokolov	Warwick Allison
+Hao-yang Wang	Mike Engber	Yitzhak Sapir
+Helge Hafting	Mike Gallop
+Irina Rempt-Drijfhout	Mike Passaretti
 .\"TABLE_END  Do not delete this line.
 .TE
 .ed
diff -Naurd ../nethack-3.4.1/doc/Guidebook.tex ./doc/Guidebook.tex
--- ../nethack-3.4.1/doc/Guidebook.tex Sun Feb 23 14:43:18 2003
+++ ./doc/Guidebook.tex Mon Sep 1 14:33:32 2003
@@ -27,7 +27,7 @@
 \begin{document}
 %
 % input file: guidebook.mn
-% $Revision: 1.61 $ $Date: 2003/02/13 04:55:28 $
+% $Revision: 1.61.2.6 $ $Date: 2003/08/14 11:06:53 $
 %
 %.ds h0 "
 %.ds h1 %.ds h2 \%
@@ -40,7 +40,7 @@
 %.au
 \author{Eric S. Raymond\\
 (Extensively edited and expanded for 3.4)}
-\date{February 12, 2003}
+\date{August 14, 2003}
 
 \maketitle
 
@@ -757,7 +757,7 @@
 The behavior can be varied via the msg_window option.
 %.lp
 \item[\tb{q}]
-Quaff (drink) a potion.
+Quaff (drink) something (potion, water, etc).
 %.lp
 \item[\tb{Q}]
 Select an object for your quiver.  You can then throw this using
@@ -2384,7 +2384,9 @@
 Send padding nulls to the terminal (default off).
 %.lp
 \item[\ib{number\_pad}]
-Use the number keys to move instead of {\tt [yuhjklbn]} (default off).
+Use the number keys to move instead of {\tt [yuhjklbn]} (default 0 or off).
+(number\_pad:2 invokes the old DOS behaviour where `{\tt 5}' means `{\tt g}', 
+meta-`{\tt 5}' means `{\tt G}',  and meta-`{\tt 0}' means `{\tt I}'.)
 %.lp
 \item[\ib{objects}]
 Set the characters used to display object classes (default
@@ -2622,6 +2624,9 @@
 \item[\ib{font\_size\_text}]
 NetHack should use this size font for text windows.
 %.lp
+\item[\ib{fullscreen}]
+NetHack should try and display on the entire screen rather than in a window.
+%.lp
 \item[\ib{hilite\_pet}]
 Visually distinguish pets from similar animals (default off).
 The behavior of this option depends on the type of windowing you use.
@@ -2658,6 +2663,9 @@
 NetHack should scroll the display when the hero or cursor
 is this number of cells away from the edge of the window.
 %.lp
+\item[\ib{softkeyboard}]
+Display an onscreen keyboard.  Handhelds are most likely to support this option.
+%.lp
 \item[\ib{splash\_screen}]
 NetHack should display an opening splash screen when it starts up (default yes).
 %.lp
@@ -2682,6 +2690,10 @@
 \item[\ib{windowcolors}]
 NetHack should display windows with the specified foreground/background 
 colors if it can.
+%.lp
+\item[\ib{wraptext}]
+NetHack port should wrap long lines of text if they don't fit in 
+the visible area of the window.
 \elist
 
 %.hn 2
@@ -2692,6 +2704,12 @@
 or ports to customize and change the port behaviour.
 
 \blist{}
+%.lp
+\item[\ib{altkeyhandler}]
+Select an alternate keystroke handler dll to load ({\it Win32 tty\/ NetHack\/} only).
+The name of the handler is specified without the .dll extension and without any
+path information.
+Cannot be set with the `{\tt O}' command.
 %.lp 
 \item[\ib{altmeta}]
 (default on, {\it Amiga NetHack \/} only).
@@ -2716,11 +2734,20 @@
 without it) (default off, {\it OS/2, PC\/ {\rm and} ST NetHack\/} only).  
 Note:  DEC Rainbows hang if this is turned on.
 Cannot be set with the `{\tt O}' command.
-%.lp 
+%.lp
 \item[\ib{soundcard}]
 (default off, {\it PC NetHack \/} only).
 Cannot be set with the `{\tt O}' command.
 %.lp
+\item[\ib{subkeyval}]
+({\it Win32 tty NetHack \/} only).
+May be used to alter the value of keystrokes that the operating system
+returns to NetHack to help compensate for international keyboard issues.
+OPTIONS=subkeyvalue:171/92
+will return 92 to NetHack, if 171 was originally going to be returned.
+You can use multiple subkeyvalue statements in the config file if needed.
+Cannot be set with the `{\tt O}' command.
+%.lp
 \item[\ib{video}]
 Set the video mode used ({\it PC\/ NetHack\/} only).
 Values are {\it autodetect\/}, {\it default\/}, or {\it vga\/}. 
@@ -3166,42 +3193,43 @@
 \begin{center}
 \begin{tabular}{lll}
 %TABLE_START
-Adam Aronow & Irina Rempt-Drijfhout & Mike Gallop\\
-Alex Kompel & Izchak Miller & Mike Passaretti\\
-Andreas Dorn & J. Ali Harlow & Mike Stephenson\\
-Andy Church & Janet Walz & Norm Meluch\\
-Andy Swanson & Janne Salmij\"{a}rvi & Olaf Seibert\\
-Ari Huttunen & Jean-Christophe Collet & Pasi Kallinen\\
-Barton House & Jochen Erwied & Pat Rankin\\
-Benson I. Margulies & John Kallen & Paul Winner\\
-Bill Dyer & John Rupley & Pierre Martineau\\
-Boudewijn Waijers & John S. Bien & Ralf Brown\\
-Bruce Cox & Johnny Lee & Richard Addison\\
-Bruce Holloway & Jon W\{tte & Richard Beigel\\
-Bruce Mewborne & Jonathan Handler & Richard P. Hughey\\
-Carl Schelin & Joshua Delahunty & Rob Menke\\
-Chris Russo & Keizo Yamamoto & Robin Johnson\\
-David Cohrs & Ken Arnold & Roderick Schertler\\
-David Damerell & Ken Arromdee & Roland McGrath\\
-David Gentzel & Ken Lorber & Ron Van Iwaarden\\
-David Hairston & Ken Washikita & Ronnen Miller\\
-Dean Luick & Kevin Darcy & Ross Brown\\
-Del Lamb & Kevin Hugo & Sascha Wostmann\\
-Deron Meranda & Kevin Sitze & Scott Bigham\\
-Dion Nicolaas & Kevin Smolkowski & Scott R. Turner\\
-Dylan O'Donnell & Kevin Sweet & Stephen Spackman\\
-Eric Backus & Lars Huttar & Stephen White\\
-Eric Hendrickson & Malcolm Ryan & Steve Creps\\
-Eric R. Smith & Mark Gooderum & Steve Linhart\\
-Eric S. Raymond & Mark Modrall & Steve VanDevender\\
-Erik Andersen & Marvin Bressler & Teemu Suikki\\
-Frederick Roeber & Matthew Day & Tim Lennan\\
-Gil Neiger & Merlyn LeRoy & Timo Hakulinen\\
-Greg Laskin & Michael Allison & Tom Almy\\
-Greg Olson & Michael Feir & Tom West\\
-Gregg Wonderly & Michael Hamel & Warren Cheung\\
-Hao-yang Wang & Michael Sokolov & Warwick Allison\\
-Helge Hafting & Mike Engber & Yitzhak Sapir
+Adam Aronow & Izchak Miller & Mike Stephenson\\
+Alex Kompel & J. Ali Harlow & Norm Meluch\\
+Andreas Dorn & Janet Walz & Olaf Seibert\\
+Andy Church & Janne Salmij\"{a}rvi & Pasi Kallinen\\
+Andy Swanson & Jean-Christophe Collet & Pat Rankin\\
+Ari Huttunen & Jochen Erwied & Paul Winner\\
+Barton House & John Kallen & Pierre Martineau\\
+Benson I. Margulies & John Rupley & Ralf Brown\\
+Bill Dyer & John S. Bien & Ray Chason\\
+Boudewijn Waijers & Johnny Lee & Richard Addison\\
+Bruce Cox & Jon W\{tte & Richard Beigel\\
+Bruce Holloway & Jonathan Handler & Richard P. Hughey\\
+Bruce Mewborne & Joshua Delahunty & Rob Menke\\
+Carl Schelin & Keizo Yamamoto & Robin Johnson\\
+Chris Russo & Ken Arnold & Roderick Schertler\\
+David Cohrs & Ken Arromdee & Roland McGrath\\
+David Damerell & Ken Lorber & Ron Van Iwaarden\\
+David Gentzel & Ken Washikita & Ronnen Miller\\
+David Hairston & Kevin Darcy & Ross Brown\\
+Dean Luick & Kevin Hugo & Sascha Wostmann\\
+Del Lamb & Kevin Sitze & Scott Bigham\\
+Deron Meranda & Kevin Smolkowski & Scott R. Turner\\
+Dion Nicolaas & Kevin Sweet & Stephen Spackman\\
+Dylan O'Donnell & Lars Huttar & Stephen White\\
+Eric Backus & Malcolm Ryan & Steve Creps\\
+Eric Hendrickson & Mark Gooderum & Steve Linhart\\
+Eric R. Smith & Mark Modrall & Steve VanDevender\\
+Eric S. Raymond & Marvin Bressler & Teemu Suikki\\
+Erik Andersen & Matthew Day & Tim Lennan\\
+Frederick Roeber & Merlyn LeRoy & Timo Hakulinen\\
+Gil Neiger & Michael Allison & Tom Almy\\
+Greg Laskin & Michael Feir & Tom West\\
+Greg Olson & Michael Hamel & Warren Cheung\\
+Gregg Wonderly & Michael Sokolov & Warwick Allison\\
+Hao-yang Wang & Mike Engber & Yitzhak Sapir\\
+Helge Hafting & Mike Gallop\\
+Irina Rempt-Drijfhout & Mike Passaretti
 %TABLE_END  Do not delete this line.
 \end{tabular}
 \end{center}
diff -Naurd ../nethack-3.4.1/doc/Guidebook.txt ./doc/Guidebook.txt
--- ../nethack-3.4.1/doc/Guidebook.txt Sun Feb 23 14:43:18 2003
+++ ./doc/Guidebook.txt Mon Sep 1 14:33:32 2003
@@ -126,7 +126,7 @@
           as well as tracking and stealthy movement.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -192,7 +192,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -258,7 +258,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -324,7 +324,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -390,7 +390,7 @@
                played.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -456,7 +456,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -522,7 +522,7 @@
           ed.  Typing a `*' lists your entire inventory, so you can see the
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -588,7 +588,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -654,7 +654,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -720,7 +720,7 @@
                ing the menu entry for the given option (ie, by  typing  its
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -745,7 +745,7 @@
                messages.  The behavior can be varied via the msg_window op-
                tion.
 
-          q    Quaff (drink) a potion.
+          q    Quaff (drink) something (potion, water, etc).
 
           Q    Select an object for your quiver.  You can then  throw  this
                using  the  `f' command.  (In versions prior to 3.3 this was
@@ -786,7 +786,7 @@
                these slots is empty, the exchange still takes place.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -852,7 +852,7 @@
           (R)UNIX is a registered trademark of AT&T.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -918,7 +918,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -984,7 +984,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1050,7 +1050,7 @@
           which may be open, closed, or locked.  To open a closed door, use
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1116,7 +1116,7 @@
           been  visited,  it  will be created (from scratch for most random
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1182,7 +1182,7 @@
           monster  has  moved  and you don't wish to fight, you can use the
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1248,7 +1248,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1314,7 +1314,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1380,7 +1380,7 @@
           factors.  Among them are:  type  of  weapon,  quality  of  weapon
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1446,7 +1446,7 @@
           when the inventory slot used for `Q' runs out.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1512,7 +1512,7 @@
           level,  the  bonus  is  higher.  A successful hit has a chance to
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1578,7 +1578,7 @@
           rust.  Such damage can be repaired.   Some  types  of  armor  may
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1644,7 +1644,7 @@
           ables are ignored.  You can disable the mail  daemon  by  turning
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1710,7 +1710,7 @@
           manent  magic,  unlike  the  usually fleeting effects of potions,
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1776,7 +1776,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1842,7 +1842,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1908,7 +1908,7 @@
           foodless  conducts.   This includes tripe rations, the corpses or
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -1974,7 +1974,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2040,7 +2040,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2106,7 +2106,7 @@
                stead.  If no weapon is found or the option  is  false,  the
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2172,7 +2172,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2238,7 +2238,7 @@
                down, ladder up, ladder down, altar, grave, throne,  kitchen
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2304,7 +2304,7 @@
                ``fruit:mango'')  (default  ``slime  mold'').   Basically  a
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2370,7 +2370,7 @@
                An obsolete synonym for ``gender:male''.  Cannot be set with
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2436,7 +2436,7 @@
                Menu  character  accelerator to goto the previous menu page.
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2502,7 +2502,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2529,8 +2529,9 @@
                Send padding nulls to the terminal (default off).
 
           number_pad
-               Use  the  number keys to move instead of [yuhjklbn] (default
-               off).
+               Use the number keys to move instead of [yuhjklbn] (default 0
+               or off).  (number_pad:2 invokes the old DOS behaviour  where
+               `5' means `g', meta-`5' means `G',  and meta-`0' means `I'.)
 
           objects
                Set the characters used to display object  classes  (default
@@ -2567,8 +2568,7 @@
 
 
 
-
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2634,7 +2634,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2700,7 +2700,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2766,7 +2766,7 @@
                Where  to  align  or  place the message window (top, bottom,
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2832,7 +2832,7 @@
 
 
 
-          NetHack 3.4                                     February 12, 2003
+          NetHack 3.4                                       August 14, 2003
 
 
 
@@ -2842,11 +2842,15 @@
 
 
 
+          fullscreen
+               NetHack  should  try and display on the entire screen rather
+               than in a window.
+
           hilite_pet
-               Visually  distinguish  pets  from  similar  animals (default
-               off).  The behavior of this option depends on  the  type  of
-               windowing  you use.  In text windowing, text highlighting or
-               inverse video is often used; with tiles, generally  displays
+               Visually distinguish  pets  from  similar  animals  (default
+               off).   The  behavior  of this option depends on the type of
+               windowing you use.  In text windowing, text highlighting  or
+               inverse  video is often used; with tiles, generally displays
                a heart symbol near pets.
 
           large_font
@@ -2866,20 +2870,24 @@
                NetHack should pop up dialog boxes for input.
 
           preload_tiles
-               NetHack should preload tiles into memory.  For  example,  in
-               the  protected mode MSDOS version, control whether tiles get
-               pre-loaded into RAM at the start of the game.  Doing so  en-
+               NetHack  should  preload tiles into memory.  For example, in
+               the protected mode MSDOS version, control whether tiles  get
+               pre-loaded  into RAM at the start of the game.  Doing so en-
                hances performance of the tile graphics, but uses more memo-
                ry. (default on).  Cannot be set with the `O' command.
 
           scroll_amount
-               NetHack should scroll the display by this  number  of  cells
+               NetHack  should  scroll  the display by this number of cells
                when the hero reaches the scroll_margin.
 
           scroll_margin
                NetHack should scroll the display when the hero or cursor is
                this number of cells away from the edge of the window.
 
+          softkeyboard
+               Display  an onscreen keyboard.  Handhelds are most likely to
+               support this option.
+
           splash_screen
                NetHack should display an  opening  splash  screen  when  it
                starts up (default yes).
@@ -2887,26 +2895,26 @@
           tiled_map
                NetHack should display a tiled map if it can.
 
-          tile_file
-               Specify the name of an alternative tile file to override the
-               default.
 
-          tile_height
-               Specify the preferred height of each tile in a tile  capable
-               port.
 
 
+          NetHack 3.4                                       August 14, 2003
 
 
-          NetHack 3.4                                     February 12, 2003
 
 
 
+          NetHack Guidebook                                              45
 
 
-          NetHack Guidebook                                              45
 
+          tile_file
+               Specify the name of an alternative tile file to override the
+               default.
 
+          tile_height
+               Specify the preferred height of each tile in a tile  capable
+               port.
 
           tile_width
                Specify  the  preferred width of each tile in a tile capable
@@ -2923,11 +2931,21 @@
                NetHack  should  display  windows  with  the specified fore-
                ground/background colors if it can.
 
+          wraptext
+               NetHack port should wrap long lines of text  if  they  don't
+               fit in the visible area of the window.
+
           9.6.  Platform-specific Customization options
 
-               Here are explanations of options that are used  by  specific
+               Here  are  explanations of options that are used by specific
           platforms or ports to customize and change the port behaviour.
 
+          altkeyhandler
+               Select an alternate keystroke handler dll to load (Win32 tty
+               NetHack only).  The name of the handler is specified without
+               the .dll extension and without any path information.  Cannot
+               be set with the `O' command.
+
           altmeta
                (default on, AMIGA NetHack only).
 
@@ -2943,6 +2961,19 @@
           MACgraphics
                (default on, Mac NetHack only).
 
+
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              46
+
+
+
           page_wait
                (default on, Mac NetHack only).
 
@@ -2957,23 +2988,21 @@
                (default on, PC NetHack only).  Cannot be set with  the  `O'
                command.
 
+          subkeyval
+               (Win32  tty NetHack only).  May be used to alter the value of
+               keystrokes that the operating system returns to  NetHack  to
+               help  compensate  for  international  keyboard  issues.  OP-
+               TIONS=subkeyvalue:171/92 will return 92 to NetHack,  if  171
+               was  originally  going to be returned.  You can use multiple
+               subkeyvalue statements in the config file if needed.  Cannot
+               be set with the `O' command.
+
           video
                Set  the video mode used (PC NetHack only).  Values are `au-
                todetect', `default', or `vga'.  Setting `vga' (or  `autode-
                tect' with vga hardware present) will cause the game to dis-
                play tiles.  Cannot be set with the `O' command.
 
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              46
-
-
-
           videocolors
                Set the color palette for PC systems using NO_TERMS (default
                4-2-6-1-5-3-15-12-10-14-9-13-11, (PC NetHack only).  The or-
@@ -2999,6 +3028,18 @@
                The following config file entries are  relevant  to  mapping
           user sounds to messages:
 
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              47
+
+
+
           SOUNDDIR
                The directory that houses the sound files to be played.
 
@@ -3027,19 +3068,6 @@
                  *--- matches 0 or more characters.
                  ?--- matches any single character.
 
-
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              47
-
-
-
                Here's  an example of a sound mapping using NetHack's inter-
           nal pattern matching facility:
 
@@ -3066,6 +3094,18 @@
           ter since there are other humanoids represented by the same sign.
           Your  screen-reader  should  also have a function which gives you
           the row and column of your  review  cursor  and  the  PC  cursor.
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              48
+
+
+
           These  co-ordinates  are  often useful in giving players a better
           sense of the overall location of items on the screen.
 
@@ -3094,18 +3134,6 @@
           Character graphics
                Comment  out all character graphics sets found near the bot-
                tom  of  the  defaults.nh  file.   Most  of  these   replace
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              48
-
-
-
                NetHack's  default representation of the dungeon using stan-
                dard ASCII characters with fancier characters from  extended
                character  sets,  and  these  fancier  characters  can annoy
@@ -3132,6 +3160,18 @@
           whatever you have.  If you quit, you keep all your gold,  but  if
           you swing and live, you might find more.
 
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              49
+
+
+
                If  you  just want to see what the current top players/games
           list is, you can type nethack -s all on most versions.
 
@@ -3159,19 +3199,6 @@
           and  Kenneth  C.  R. C. Arnold.  Small portions were adapted from
           Further Exploration of the Dungeons of Doom, by Ken Arromdee.
 
-
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              49
-
-
-
                NetHack is the product of literally dozens of people's work.
           Main  events  in the course of the game development are described
           below:
@@ -3199,6 +3226,18 @@
 
                Later, Mike coordinated a major rewrite of the game, heading
           a team which included Ken Arromdee, Jean-Christophe Collet, Steve
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              50
+
+
+
           Creps, Eric Hendrickson, Izchak Miller, John Rupley, Mike Threep-
           oint, and Janet Walz, to produce NetHack 3.0c.
 
@@ -3226,18 +3265,6 @@
 
                Ken Lorber, Gregg Wonderly and Greg Olson,  with  help  from
           Richard  Addison,  Mike  Passaretti,  and Olaf Seibert, developed
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              50
-
-
-
           NetHack 3.1 for the Amiga.
 
                Norm Meluch and Kevin Smolkowski, with help from Carl  Sche-
@@ -3266,6 +3293,17 @@
           Smith,  Mike  Stephenson,  Janet  Walz, and Paul Winner, released
           version 3.2 in April of 1996.
 
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              51
+
+
+
                Version 3.2 marked the tenth anniversary of the formation of
           the  development team.  In a testament to their dedication to the
           game, all thirteen members of the original development  team  re-
@@ -3292,18 +3330,6 @@
           tures.   Kevin later joined the DevTeam and incorporated the best
           of these ideas in NetHack 3.3.
 
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              51
-
-
-
                The final update to 3.2 was the bug fix release 3.2.3, which
           was  released  simultaneously with 3.3.0 in December 1999 just in
           time for the Year 2000.
@@ -3331,8 +3357,20 @@
                The 3.4 development team initially consisted of Michael  Al-
           lison,  Ken Arromdee, David Cohrs, Jessie Collet, Kevin Hugo, Ken
           Lorber, Dean Luick, Pat Rankin, Mike Stephenson, Janet Walz,  and
-          Paul  Winner,  with   Warwick Allison joining just before the re-
-          lease of NetHack 3.4.0 in March 2002.
+          Paul  Winner,  with   Warwick  Allison  joining  just  before the
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              52
+
+
+
+          release of NetHack 3.4.0 in March 2002.
 
                As with version 3.3, various people contributed to the  game
           as a whole as well as supporting ports on the different platforms
@@ -3358,18 +3396,6 @@
           the  Amiga  port of 3.4 after Janne Salmijarvi resurrected it for
           3.3.1.
 
-
-
-          NetHack 3.4                                     February 12, 2003
-
-
-
-
-
-          NetHack Guidebook                                              52
-
-
-
                Christian ``Marvin'' Bressler maintained 3.4 for  the  Atari
           after he resurrected it for 3.3.1.
 
@@ -3385,48 +3411,88 @@
           Dungeoneers:
 
 
-                   Adam Aronow       Irina Rempt-Drijfhout       Mike Gallop
-                   Alex Kompel           Izchak Miller         Mike Passaretti
-                  Andreas Dorn           J. Ali Harlow         Mike Stephenson
-                   Andy Church             Janet Walz            Norm Meluch
-                  Andy Swanson          Janne Salmijarvi         Olaf Seibert
-                  Ari Huttunen       Jean-Christophe Collet     Pasi Kallinen
-                  Barton House           Jochen Erwied            Pat Rankin
-               Benson I. Margulies        John Kallen            Paul Winner
-                    Bill Dyer             John Rupley          Pierre Martineau
-                Boudewijn Waijers         John S. Bien            Ralf Brown
-                    Bruce Cox              Johnny Lee          Richard Addison
-                 Bruce Holloway            Jon W{tte            Richard Beigel
-                 Bruce Mewborne         Jonathan Handler      Richard P. Hughey
-                  Carl Schelin          Joshua Delahunty          Rob Menke
-                   Chris Russo           Keizo Yamamoto         Robin Johnson
-                   David Cohrs             Ken Arnold         Roderick Schertler
-                 David Damerell           Ken Arromdee          Roland McGrath
-                  David Gentzel            Ken Lorber          Ron Van Iwaarden
-                 David Hairston          Ken Washikita          Ronnen Miller
-                   Dean Luick             Kevin Darcy             Ross Brown
-                    Del Lamb               Kevin Hugo          Sascha Wostmann
-                  Deron Meranda           Kevin Sitze            Scott Bigham
-                  Dion Nicolaas         Kevin Smolkowski       Scott R. Turner
-                 Dylan O'Donnell          Kevin Sweet          Stephen Spackman
-                   Eric Backus            Lars Huttar           Stephen White
-                Eric Hendrickson          Malcolm Ryan           Steve Creps
-                  Eric R. Smith          Mark Gooderum          Steve Linhart
-                 Eric S. Raymond          Mark Modrall        Steve VanDevender
-                  Erik Andersen         Marvin Bressler          Teemu Suikki
-                Frederick Roeber          Matthew Day             Tim Lennan
-                   Gil Neiger             Merlyn LeRoy          Timo Hakulinen
-                   Greg Laskin          Michael Allison            Tom Almy
-                   Greg Olson             Michael Feir             Tom West
-                 Gregg Wonderly          Michael Hamel          Warren Cheung
-                  Hao-yang Wang         Michael Sokolov        Warwick Allison
-                  Helge Hafting           Mike Engber           Yitzhak Sapir
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          NetHack 3.4                                       August 14, 2003
+
+
+
+
+
+          NetHack Guidebook                                              53
+
+
+
+                    Adam Aronow            Izchak Miller         Mike Stephenson
+                    Alex Kompel            J. Ali Harlow           Norm Meluch
+                   Andreas Dorn              Janet Walz            Olaf Seibert
+                    Andy Church           Janne Salmijarvi        Pasi Kallinen
+                   Andy Swanson        Jean-Christophe Collet       Pat Rankin
+                   Ari Huttunen            Jochen Erwied           Paul Winner
+                   Barton House             John Kallen          Pierre Martineau
+                Benson I. Margulies         John Rupley             Ralf Brown
+                     Bill Dyer              John S. Bien            Ray Chason
+                 Boudewijn Waijers           Johnny Lee          Richard Addison
+                     Bruce Cox               Jon W{tte            Richard Beigel
+                  Bruce Holloway          Jonathan Handler      Richard P. Hughey
+                  Bruce Mewborne          Joshua Delahunty          Rob Menke
+                   Carl Schelin            Keizo Yamamoto         Robin Johnson
+                    Chris Russo              Ken Arnold         Roderick Schertler
+                    David Cohrs             Ken Arromdee          Roland McGrath
+                  David Damerell             Ken Lorber          Ron Van Iwaarden
+                   David Gentzel           Ken Washikita          Ronnen Miller
+                  David Hairston            Kevin Darcy             Ross Brown
+                    Dean Luick               Kevin Hugo          Sascha Wostmann
+                     Del Lamb               Kevin Sitze            Scott Bigham
+                   Deron Meranda          Kevin Smolkowski       Scott R. Turner
+                   Dion Nicolaas            Kevin Sweet          Stephen Spackman
+                  Dylan O'Donnell           Lars Huttar           Stephen White
+                    Eric Backus             Malcolm Ryan           Steve Creps
+                 Eric Hendrickson          Mark Gooderum          Steve Linhart
+                   Eric R. Smith            Mark Modrall        Steve VanDevender
+                  Eric S. Raymond         Marvin Bressler          Teemu Suikki
+                   Erik Andersen            Matthew Day             Tim Lennan
+                 Frederick Roeber           Merlyn LeRoy          Timo Hakulinen
+                    Gil Neiger            Michael Allison            Tom Almy
+                    Greg Laskin             Michael Feir             Tom West
+                    Greg Olson             Michael Hamel          Warren Cheung
+                  Gregg Wonderly          Michael Sokolov        Warwick Allison
+                   Hao-yang Wang            Mike Engber           Yitzhak Sapir
+                   Helge Hafting            Mike Gallop
+               Irina Rempt-Drijfhout      Mike Passaretti
 
           Brand and product names are trademarks or  registered  trademarks
           of their respective holders.
 
 
-          NetHack 3.4                                     February 12, 2003
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          NetHack 3.4                                       August 14, 2003
 
 
 
diff -Naurd ../nethack-3.4.1/doc/window.doc ./doc/window.doc
--- ../nethack-3.4.1/doc/window.doc Sun Feb 23 14:43:19 2003
+++ ./doc/window.doc Mon Sep 1 14:33:32 2003
@@ -404,17 +404,17 @@
 
 The wincap preference settings all have their underlying values stored
 in iflags fields.  The names of the wincap related fields are all pre-
-fixed with wc_ to make it easy to identify them.  Your window port can
-access the fields directly.
+fixed with wc_ or wc2_ to make it easy to identify them.  Your window 
+port can access the fields directly.
 
 Your window port identifies what options it will react to and support
-by setting bits in the window_procs wincap mask. See section IX for
-details of where the wincap mask resides. 
+by setting bits in the window_procs wincap mask and/or wincap2 mask. 
+See section IX for details of where the wincap masks reside. 
 
 Two things control whether any preference setting appears in the 
 'O' command options menu during the game:
  1. The option must be marked as being supported by having its 
-    bit set in the window_procs wincap mask.
+    bit set in the window_procs wincap or wincap2 mask.
  2. The option must have its optflag field set to SET_IN_GAME in order
     to be able to set the option, or marked DISP_IN_GAME if you just
     want to reveal what the option is set to. 
@@ -423,26 +423,28 @@
 
 The default values for the optflag field for all the options are 
 hard-coded into the option in options.c.  The default value for 
-the options can be altered by calling 
+the wc_ options can be altered by calling 
 	set_wc_option_mod_status(optmask, status)
-specifying the option modification status to one of SET_IN_FILE, 
+The default value for the wc2_ options can be altered by calling 
+	set_wc2_option_mod_status(optmask, status)
+In each case, set the option modification status to one of SET_IN_FILE, 
 DISP_IN_GAME, or SET_IN_GAME.
 
-The setting of any wincap option is handled by the NetHack core option
-processing code. You do not have to provide a parser in your window 
-port, nor should you set the values for the iflags.wc_* fields 
-directly within the port code. The port code should honor whatever
-values were put there by the core when processing options, either
-in the config file, or by the 'O' command.  
+The setting of any wincap or wincap2 option is handled by the NetHack 
+core option processing code. You do not have to provide a parser in 
+your window port, nor should you set the values for the 
+iflags.wc_* and iflags.wc2_* fields directly within the port code. 
+The port code should honor whatever values were put there by the core 
+when processing options, either in the config file, or by the 'O' command.  
 
 You may be wondering what values your window port will find in the 
-iflags.wc_* fields for options that the user has not specified
-in his/her config file. Put another way, how does you port code
+iflags.wc_* and iflags.wc2_* fields for options that the user has not 
+specified in his/her config file. Put another way, how does you port code
 tell if an option has not been set? The next paragraph explains that.
 
 If the core does not set an option, it will still be initialized 
 to its default value. Those default values for the 
-iflags.wc_* fields are:
+iflags.wc_* and iflags.wc_* fields are:
 
  o All boolean fields are initialized to the starting 
    value specified for that option in the boolopt array in 
@@ -460,9 +462,10 @@
    that in your window-port code before using such a pointer, or 
    you'll end up triggering a nasty fault.
 
-Here are the wincap preference settings that your port can choose
+Here are the wincap and wincap2 preference settings that your port can choose
 to support:
 
+  wincap
   +--------------------+--------------------+--------------------+--------+
   |                    |                    | iflags field       | data   |
   | player option      | bit in wincap mask |   for value        | type   |
@@ -507,6 +510,16 @@
   |  mouse             | WC_MOUSE_SUPPORT   | wc_mouse_support   |boolean |
   +--------------------+--------------------+--------------------+--------+
 
+  wincap2
+  +--------------------+--------------------+--------------------+--------+
+  |                    |                    | iflags field       | data   |
+  | player option      | bit in wincap mask |   for value        | type   |
+  |--------------------+--------------------+--------------------+--------+
+  |  fullscreen        | WC2_FULLSCREEN     | wc2_fullscreen     |boolean |
+  |  softkeyboard      | WC2_SOFTKEYBOARD   | wc2_softkeyboard   |boolean |
+  |  wraptext          | WC2_WRAPTEXT       | wc2_wraptext       |boolean |
+  +--------------------+--------------------+--------------------+--------+
+
 align_message	-- where to place message window (top, bottom, left, right)
 align_status	-- where to place status window (top, bottom, left, right).
 ascii_map	-- port should display an ascii map if it can.
@@ -523,6 +536,7 @@
 font_size_text	-- port should use this size font for text windows.
 font_status	-- port should use a font by this name for status window.
 font_text	-- port should use a font by this name for text windows.
+fullscreen      -- port should try to use the whole screen.
 hilite_pet	-- port should mark pets in some special way on the map.
 map_mode	-- port should display the map in the manner specified.
 player_selection
@@ -532,6 +546,7 @@
 scroll_amount   -- scroll this amount when scroll_margin is reached.
 scroll_margin	-- port should scroll the display when the hero or cursor
 		   is this number of cells away from the edge of the window.
+softkeyboard    -- handhelds should display an on-screen keyboard if possible.
 splash_screen   -- port should/should not display an opening splashscreen.
 tiled_map	-- port should display a tiled map if it can.
 tile_width	-- port should display tiles with this width or round to closest
@@ -547,6 +562,8 @@
 		-- port should use these colors for window foreground/background
 		   colors.  Syntax:
 		     menu fore/back message fore/back status fore/back text fore/back
+wraptext	-- port should wrap long lines of text if they don't fit in 
+		   the visible area of the window
 mouse_support	-- port should enable mouse support if possible
 
 Whenever one of these settings is adjusted, the port is notified of a change
@@ -562,7 +579,15 @@
 Functions available for the window port to call:
 
 set_wc_option_mod_status(optmask, status)
-		-- Adjust the optflag field for a set of options to 
+		-- Adjust the optflag field for a set of wincap options to 
+		   specify whether the port wants the option to appear 
+		   in the 'O' command options menu, The second parameter,
+		   "status" can be set to SET_IN_FILE, DISP_IN_GAME,
+		   or SET_IN_GAME (SET_IN_FILE implies that the option
+		   is completely hidden during the game).
+
+set_wc2_option_mod_status(optmask, status)
+		-- Adjust the optflag field for a set of wincap2 options to 
 		   specify whether the port wants the option to appear 
 		   in the 'O' command options menu, The second parameter,
 		   "status" can be set to SET_IN_FILE, DISP_IN_GAME,
@@ -581,11 +606,13 @@
 Adding a new wincap option:
 
 To add a new wincap option, please follow all these steps:
-	1. Add the option to the wincap preference settings table above.
+	1. Add the option to the wincap preference settings table above. Since
+	   wincap is full, your option will likely target wincap2 field.
 	2. Add the description to the paragraph below the chart.
-	3. Add the WC_ to the bit list in include/winprocs.h (if there is room).
-	4. Add the wc_ field(s) to the iflags structure in flag.h.
-	5. Add the name and value to wc_options[] in options.c
+	3. Add the WC_ or WC2_ to the bit list in include/winprocs.h 
+	   (in wincap2 if there is no room in wincap).
+	4. Add the wc_ or wc2_ field(s) to the iflags structure in flag.h.
+	5. Add the name and value to wc_options[] or wc2_options[] in options.c
 	6. Add an appropriate parser to parseoptions() in options.c.
 	7. Add code to display current value to get_compopt_value() in options.c.
 	8. Document the option in Guidebook.mn and Guidebook.tex.
diff -Naurd ../nethack-3.4.1/Files ./Files
--- ../nethack-3.4.1/Files Sun Feb 23 14:43:15 2003
+++ ./Files Mon Sep 1 14:33:32 2003
@@ -22,11 +22,11 @@
 doc:
 (files for all versions)
 Guidebook.mn    Guidebook.tex   Guidebook.txt   dgn_comp.6      dgn_comp.txt
-dlb.6           dlb.txt         fixes22.0       fixes31.1       fixes31.2
-fixes31.3       fixes32.0       fixes32.1       fixes32.2       fixes32.3
-fixes33.0       fixes33.1       fixes34.0       fixes34.1       lev_comp.6
-lev_comp.txt    nethack.6       nethack.txt     recover.6       recover.txt
-tmac.n          window.doc
+dlb.6           dlb.txt         fixes22.0       fixes30.0       fixes31.1
+fixes31.2       fixes31.3       fixes32.0       fixes32.1       fixes32.2
+fixes32.3       fixes33.0       fixes33.1       fixes34.0       fixes34.1
+fixes34.2       lev_comp.6      lev_comp.txt    nethack.6       nethack.txt
+recover.6       recover.txt     tmac.n          window.doc
 
 include:
 (files for all versions)
@@ -35,16 +35,15 @@
 decl.h          def_os2.h       dgn_file.h      display.h       dlb.h
 dungeon.h       edog.h          emin.h          engrave.h       epri.h
 eshk.h          extern.h        flag.h          func_tab.h      global.h
-hack.h          lev.h           macconf.h       macpopup.h      macwin.h
-mail.h          mfndpos.h       micro.h         mkroom.h        monattk.h
-mondata.h       monflag.h       monst.h         monsym.h        nhlan.h
-ntconf.h        obj.h           objclass.h      os2conf.h       patchlevel.h
-pcconf.h        permonst.h      prop.h          qtext.h         quest.h
-rect.h          region.h        rm.h            skills.h        sp_lev.h
-spell.h         system.h        tcap.h          timeout.h       tosconf.h
-tradstdc.h      trampoli.h      trap.h          unixconf.h      vault.h
-vision.h        vmsconf.h       wceconf.h       winami.h        winprocs.h
-wintype.h       you.h           youprop.h
+hack.h          lev.h           mail.h          mfndpos.h       micro.h
+mkroom.h        monattk.h       mondata.h       monflag.h       monst.h
+monsym.h        nhlan.h         ntconf.h        obj.h           objclass.h
+os2conf.h       patchlevel.h    pcconf.h        permonst.h      prop.h
+qtext.h         quest.h         rect.h          region.h        rm.h
+skills.h        sp_lev.h        spell.h         system.h        tcap.h
+timeout.h       tosconf.h       tradstdc.h      trampoli.h      trap.h
+unixconf.h      vault.h         vision.h        vmsconf.h       wceconf.h
+winami.h        winprocs.h      wintype.h       you.h           youprop.h
 (file for tty versions)
 wintty.h
 (files for X versions)
@@ -55,8 +54,9 @@
 bitmfile.h      gem_rsc.h       load_img.h      wingem.h
 (file for GNOME versions)
 winGnome.h
-(files for mactty version)
-mactty.h        mttypriv.h
+(files for various Macintosh versions)
+mac-carbon.h    mac-qt.h        mac-term.h      macconf.h       macpopup.h
+mactty.h        macwin.h        mttypriv.h
 
 src:
 (files for all versions)
@@ -175,23 +175,30 @@
 
 sys/wince:
 (files for Windows CE and PocketPC)
-Install.ce      assert.h        bootstrp.mak    celib.c         cesetup.bat
-cesound.c       defaults.nh     errno.h         fcntl.h         hpc.vcp
-keypad.uu       mhaskyn.c       mhaskyn.h       mhcmd.c         mhcmd.h
-mhcolor.c       mhcolor.h       mhdlg.c         mhdlg.h         mhfont.c
-mhfont.h        mhinput.c       mhinput.h       mhmain.c        mhmain.h
-mhmap.c         mhmap.h         mhmenu.c        mhmenu.h        mhmsg.h
-mhmsgwnd.c      mhmsgwnd.h      mhrip.c         mhrip.h         mhstatus.c
-mhstatus.h      mhtext.c        mhtext.h        mswproc.c       newres.h
-palmpc.vcp      pocketpc.vcp    resource.h      smartphn.vcp    stat.h
-winMS.h         wince.vcw       winhack.c       winhack.rc      winhcksp.rc
-winmain.c
+Install.ce      bootstrp.mak    celib.c         cesetup.bat     cesound.c
+defaults.nh     menubar.uu      keypad.uu       mhaskyn.c       mhaskyn.h
+mhcmd.c         mhcmd.h         mhcolor.c       mhcolor.h       mhdlg.c
+mhdlg.h         mhfont.c        mhfont.h        mhinput.c       mhinput.h
+mhmain.c        mhmain.h        mhmap.c         mhmap.h         mhmenu.c
+mhmenu.h        mhmsg.h         mhmsgwnd.c      mhmsgwnd.h      mhrip.c
+mhrip.h         mhstatus.c      mhstatus.h      mhtext.c        mhtext.h
+mhtxtbuf.c      mhtxtbuf.h      mswproc.c       newres.h        resource.h
+winMS.h         winhack.c       winhack.rc      winhcksp.rc     winmain.c
+
+sys/wince/ceinc:
+(header files for Windows CE and PocketPC)
+assert.h        errno.h         fcntl.h
+
+sys/wince/ceinc/sys:
+(sys/stat.h for Windows CE and PocketPC)
+stat.h
 
 sys/winnt:
 (files for Windows 9x, NT and Windows2000 version)
 Install.nt      Makefile.bcc    Makefile.gcc    Makefile.msc    console.rc
-defaults.nh     mapimail.c      nethack.def     nhico.uu        nhsetup.bat
-ntsound.c       nttty.c         porthelp        win32api.h      winnt.c
+defaults.nh     mapimail.c      nethack.def     nhdefkey.c      nh340key.c
+nhraykey.c      nhico.uu        nhsetup.bat     ntsound.c       nttty.c
+porthelp        win32api.h      winnt.c
 
 util:
 (files for all versions)
diff -Naurd ../nethack-3.4.1/dat/history ./dat/history
--- ../nethack-3.4.1/dat/history Sun Feb 23 14:43:16 2003
+++ ./dat/history Mon Sep 1 14:33:32 2003
@@ -159,40 +159,41 @@
 the Dungeon sometimes make note of the names of the worst of these miscreants
 in this, the list of Dungeoneers:
 
-    Adam Aronow               Irina Rempt-Drijfhout     Mike Gallop
-    Alex Kompel               Izchak Miller             Mike Passaretti
-    Andreas Dorn              J. Ali Harlow             Mike Stephenson
-    Andy Church               Janet Walz                Norm Meluch
-    Andy Swanson              Janne Salmijarvi          Olaf Seibert
-    Ari Huttunen              Jean-Christophe Collet    Pasi Kallinen
-    Barton House              Jochen Erwied             Pat Rankin
-    Benson I. Margulies       John Kallen               Paul Winner
-    Bill Dyer                 John Rupley               Pierre Martineau
-    Boudewijn Waijers         John S. Bien              Ralf Brown
-    Bruce Cox                 Johnny Lee                Richard Addison
-    Bruce Holloway            Jon W{tte                 Richard Beigel
-    Bruce Mewborne            Jonathan Handler          Richard P. Hughey
-    Carl Schelin              Joshua Delahunty          Rob Menke
-    Chris Russo               Keizo Yamamoto            Robin Johnson
-    David Cohrs               Ken Arnold                Roderick Schertler
-    David Damerell            Ken Arromdee              Roland McGrath
-    David Gentzel             Ken Lorber                Ron Van Iwaarden
-    David Hairston            Ken Washikita             Ronnen Miller
-    Dean Luick                Kevin Darcy               Ross Brown
-    Del Lamb                  Kevin Hugo                Sascha Wostmann
-    Deron Meranda             Kevin Sitze               Scott Bigham
-    Dion Nicolaas             Kevin Smolkowski          Scott R. Turner
-    Dylan O'Donnell           Kevin Sweet               Stephen Spackman
-    Eric Backus               Lars Huttar               Stephen White
-    Eric Hendrickson          Malcolm Ryan              Steve Creps
-    Eric R. Smith             Mark Gooderum             Steve Linhart
-    Eric S. Raymond           Mark Modrall              Steve VanDevender
-    Erik Andersen             Marvin Bressler           Teemu Suikki
-    Frederick Roeber          Matthew Day               Tim Lennan
-    Gil Neiger                Merlyn LeRoy              Timo Hakulinen
-    Greg Laskin               Michael Allison           Tom Almy
-    Greg Olson                Michael Feir              Tom West
-    Gregg Wonderly            Michael Hamel             Warren Cheung
-    Hao-yang Wang             Michael Sokolov           Warwick Allison
-    Helge Hafting             Mike Engber               Yitzhak Sapir
+    Adam Aronow               Izchak Miller             Mike Stephenson
+    Alex Kompel               J. Ali Harlow             Norm Meluch
+    Andreas Dorn              Janet Walz                Olaf Seibert
+    Andy Church               Janne Salmijarvi          Pasi Kallinen
+    Andy Swanson              Jean-Christophe Collet    Pat Rankin
+    Ari Huttunen              Jochen Erwied             Paul Winner
+    Barton House              John Kallen               Pierre Martineau
+    Benson I. Margulies       John Rupley               Ralf Brown
+    Bill Dyer                 John S. Bien              Ray Chason
+    Boudewijn Waijers         Johnny Lee                Richard Addison
+    Bruce Cox                 Jon W{tte                 Richard Beigel
+    Bruce Holloway            Jonathan Handler          Richard P. Hughey
+    Bruce Mewborne            Joshua Delahunty          Rob Menke
+    Carl Schelin              Keizo Yamamoto            Robin Johnson
+    Chris Russo               Ken Arnold                Roderick Schertler
+    David Cohrs               Ken Arromdee              Roland McGrath
+    David Damerell            Ken Lorber                Ron Van Iwaarden
+    David Gentzel             Ken Washikita             Ronnen Miller
+    David Hairston            Kevin Darcy               Ross Brown
+    Dean Luick                Kevin Hugo                Sascha Wostmann
+    Del Lamb                  Kevin Sitze               Scott Bigham
+    Deron Meranda             Kevin Smolkowski          Scott R. Turner
+    Dion Nicolaas             Kevin Sweet               Stephen Spackman
+    Dylan O'Donnell           Lars Huttar               Stephen White
+    Eric Backus               Malcolm Ryan              Steve Creps
+    Eric Hendrickson          Mark Gooderum             Steve Linhart
+    Eric R. Smith             Mark Modrall              Steve VanDevender
+    Eric S. Raymond           Marvin Bressler           Teemu Suikki
+    Erik Andersen             Matthew Day               Tim Lennan
+    Frederick Roeber          Merlyn LeRoy              Timo Hakulinen
+    Gil Neiger                Michael Allison           Tom Almy
+    Greg Laskin               Michael Feir              Tom West
+    Greg Olson                Michael Hamel             Warren Cheung
+    Gregg Wonderly            Michael Sokolov           Warwick Allison
+    Hao-yang Wang             Mike Engber               Yitzhak Sapir
+    Helge Hafting             Mike Gallop               
+    Irina Rempt-Drijfhout     Mike Passaretti           
 
diff -Naurd ../nethack-3.4.1/dat/opthelp ./dat/opthelp
--- ../nethack-3.4.1/dat/opthelp Sun Feb 23 14:43:16 2003
+++ ./dat/opthelp Mon Sep 1 14:33:32 2003
@@ -91,7 +91,7 @@
 
 boulder       override the default boulder symbol with another default: [`]
 disclose      the types of information you want offered at the end of the
-              game  [all]
+              game  [ni na nv ng nc]
 fruit         the name of a fruit you enjoy eating  [slime mold]
               (basically a whimsy which NetHack uses from time to time).
 menustyle     user interface for selection of multiple objects:
diff -Naurd ../nethack-3.4.1/dat/cmdhelp ./dat/cmdhelp
--- ../nethack-3.4.1/dat/cmdhelp Sun Feb 23 14:43:15 2003
+++ ./dat/cmdhelp Mon Sep 1 14:33:32 2003
@@ -53,7 +53,7 @@
 O       Show option settings, possibly change them
 p       Pay your shopping bill
 P       Put on an accessory (ring, amulet, etc)
-q       Quaff (drink) something
+q       Quaff (drink) something (potion, water, etc)
 Q       Select ammunition for quiver
 r       Read a scroll or spellbook
 R       Remove an accessory (ring, amulet, etc)
diff -Naurd ../nethack-3.4.1/dat/help ./dat/help
--- ../nethack-3.4.1/dat/help Sun Feb 23 14:43:16 2003
+++ ./dat/help Mon Sep 1 14:33:32 2003
@@ -125,7 +125,7 @@
         P       Put on an accessory (ring, amulet, etc).
         ^P      Repeat last message (subsequent ^P's repeat earlier messages).
                 The behavior can be varied via the msg_window option.
-        q       Drink (quaff) a potion.
+        q       Drink (quaff) something (potion, water, etc).
         Q       Select ammunition for quiver.
         r       Read a scroll or spellbook.
         R       Remove an accessory (ring, amulet, etc).
diff -Naurd ../nethack-3.4.1/dat/hh ./dat/hh
--- ../nethack-3.4.1/dat/hh Sun Feb 23 14:43:16 2003
+++ ./dat/hh Mon Sep 1 14:33:32 2003
@@ -54,7 +54,7 @@
 o       open    open a door
 p       pay     pay your bill (in a shop)
 P       puton   put on an accessory (ring, amulet, etc)
-q       quaff   drink a potion
+q       quaff   drink something (potion, water, etc)
 Q       quiver  select ammunition for quiver
 r       read    read a scroll or spellbook
 R       remove  remove an accessory (ring, amulet, etc)
diff -Naurd ../nethack-3.4.1/README ./README
--- ../nethack-3.4.1/README Sun Feb 23 14:43:15 2003
+++ ./README Mon Sep 1 14:33:32 2003
@@ -1,33 +1,24 @@
-                NetHack 3.4.1 -- General information
+                NetHack 3.4.2 -- General information
 
 NetHack 3.4 is an enhancement to the dungeon exploration game NetHack.
 It is a distant descendent of Rogue and Hack, and a direct descendent of
 NetHack 3.3.
 
-NetHack 3.4.1 is a bugfix release for 3.4.0.
- *  Fix a few fatal errors including one for reentering shops, one
-       involving land mines and boulders/statues, one for delayed
-       polymorph, and one for chest traps blowing up a ball and chain
- *  Fix a buffer overflow that could lead to security problems
- *  Hundreds of general bug fixes
- *  Several message and other glitches corrected
- *  Travel command adjustments and ability to disable travel command
- *  message recall window extensions (by Christian Cooper)
- *  win32: some interface improvements
- *  unix: improved tile support
- *  gnome: some fixes, and some enhancements by Dylan Alex Simon
- *  Windows CE port included (by Alex Kompel)
+NetHack 3.4.2 is a bugfix release for 3.4.1.
+ *  A fatal bug that caused a crash when applying figurine, candle, or
+    bell that gets used up
+ *  A fatal bug that triggered a panic when your secondary weapon was
+    cursed during bones file creation
+ *  A few dozen general bug fixes
+ *  Fixed some Gnome compilation problems on Redhat 7.2 and 8.0
+ *  Fixed a problem in the util Makefile
+ *  win32 tty adjustments and support for loading alternative key handlers
 
 A fuller list of changes for this release can be found in the file 
-doc/fixes34.1 in the source distribution.  The text in there was written 
+doc/fixes34.2 in the source distribution.  The text in there was written 
 for the development team's own use and is provided "as is", so please do 
 not ask us to further explain the entries in that file.
 
-We've also added a trouble log (paniclog) that will keep a record of the
-details behind a "dungeon collapses" message, or a "perhaps you better
-quit" message to assist in getting the required information included in
-bug reports to us.
-
                         - - - - - - - - - - -
 
 Please read items (1), (2) and (3) BEFORE doing anything with your new code.
@@ -155,13 +146,13 @@
     C compiler.
 
     With the demise of Windows NT on the DEC Alpha, no attempt has been
-    made to build NetHack 3.4.1 on that platform.
+    made to build NetHack 3.4.2 on that platform.
 
-    No attempt has been made to build or run NetHack 3.4.1 on Windows Me
+    No attempt has been made to build or run NetHack 3.4.2 on Windows Me
     at this point.  It may work, but then again it may not.
     
     A build for Intel 80286 machines and DOS "real mode" overlaid versions 
-    has not been produced for 3.4.1.  Nobody on the porting team has
+    has not been produced for 3.4.2.  Nobody on the porting team has
     the time or the software to attempt the necessary tuning that will allow 
     it to achieve the balance of having just the right amount of available 
     memory, and still have acceptable performance.  The sources necessary 
