--- cvs-ro/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	Mon Jan  3 09:29:46 2005
+++ cvs-rw/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	Mon Jan  3 16:06:09 2005
@@ -225,7 +225,7 @@
 #endif
 int config_xkbdisable = 0;
 char *config_xkbrules;
-char *config_xkbmodel = "pc101";
+char *config_xkbmodel = "pc105";
 char *config_xkblayout = "us";
 char *config_xkbvariant = (char *) 0;
 char *config_xkboptions = (char *) 0;
@@ -679,7 +679,7 @@
 static char *xkbmodeltext = 
 "Please select one of the following keyboard types that is the better\n"
 "description of your keyboard. If nothing really matches,\n"
-"choose 1 (Generic 101-key PC)\n\n";
+"choose \"Generic 104-key PC\"\n\n";
 
 static char *xkblayouttext = 
 "Please select the layout corresponding to your keyboard\n";
@@ -2077,7 +2077,7 @@
 "# To customise the XKB settings to suit your keyboard, modify the\n"
 "# lines below (which are the defaults).  For example, for a non-U.S.\n"
 "# keyboard, you will probably want to use:\n"
-"#    Option \"XkbModel\"    \"pc102\"\n"
+"#    Option \"XkbModel\"    \"pc105\"\n"
 "# If you have a US Microsoft Natural keyboard, you can use:\n"
 "#    Option \"XkbModel\"    \"microsoft\"\n"
 "#\n"
@@ -2094,7 +2094,7 @@
 "\n"
 "# These are the default XKB settings for "__XSERVERNAME__"\n"
 "#    Option \"XkbRules\"    \""__XKBDEFRULES__"\"\n"
-"#    Option \"XkbModel\"    \"pc101\"\n"
+"#    Option \"XkbModel\"    \"pc105\"\n"
 "#    Option \"XkbLayout\"   \"us\"\n"
 "#    Option \"XkbVariant\"  \"\"\n"
 "#    Option \"XkbOptions\"  \"\"\n"