XFree86 4.1.0 Keyboard settings?

[William C Brennan <brennan@netaxs.com>]

Hi folks,

I just updated to version 4.1.0-9 ("testing") of XFree86 on my 
PowerMac 7200.  I'm not even sure which version I had been previously 
running (I think it was a patched version of 4.0.3), but it had been 
working fine since May.

When I try to run XFree 4.1.0 (via startx), the Gnome desktop comes 
up just fine, but the keyboard no longer works properly: most keys 
don't produce anything and some keys produce the wrong letters. 
Obviously, the key mappings must be wrong.

I hope the solution is as simple as to change the input section of 
/etc/X11/XFConfig-4.  Here is what it currently looks like:

Section "InputDevice"
	Identifier	"Generic Keyboard"
	Driver		"keyboard"
	Option		"CoreKeyboard"
	Option		"XkbRules"	"xfree86"
	Option		"XkbModel"	"macintosh"
	Option		"XkbLayout"	"us"
EndSection


Could someone please make a recommendation of what to change it to, 
or refer me to a document where I can find this information?

Thanks!

   -- Bill