diff options
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 81ce26eec..e7292fe57 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -500,7 +500,7 @@ configureLayoutSection (void) int scrnum = 0; parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec) - ptr->lay_identifier = "XFree86 Configured"; + ptr->lay_identifier = "X.org Configured"; { XF86ConfInputrefPtr iptr; @@ -978,29 +978,33 @@ DoConfigure() ErrorF("\n"); #ifdef SCO - ErrorF("\nXFree86 is using the kernel event driver to access the mouse.\n" - "If you wish to use the internal XFree86 mouse drivers, please\n" + ErrorF("\n"__XSERVERNAME__ + " is using the kernel event driver to access the mouse.\n" + "If you wish to use the internal "__XSERVERNAME__ + "mouse drivers, please\n" "edit the file and correct the Device.\n"); #else /* !SCO */ if (!foundMouse) { - ErrorF("\nXFree86 is not able to detect your mouse.\n" + ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" "Edit the file and correct the Device.\n"); } else { #ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */ - ErrorF("\nXFree86 detected your mouse at device %s.\n" + ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n" "Please check your config if the mouse is still not\n" - "operational, as by default XFree86 tries to autodetect\n" + "operational, as by default "__XSERVERNAME__ + " tries to autodetect\n" "the protocol.\n",DFLT_MOUSE_DEV); #endif } #endif /* !SCO */ if (xf86NumScreens > 1) { - ErrorF("\nXFree86 has configured a multihead system, please check your config.\n"); + ErrorF("\n"__XSERVERNAME__ + " has configured a multihead system, please check your config.\n"); } - ErrorF("\nYour XF86Config file is %s\n\n", filename); - ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename); + ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename); + ErrorF("To test the server, run 'X -xf86config %s'\n\n", filename); bail: OsCleanup(TRUE); |