[xserver-commit] xserver/hw/xizzle/common xf86Configure.c,3.86,3.87 xf86Init.c,3.220,3.221

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/common
In directory pdx:/tmp/cvs-serv26065

Modified Files:
	xf86Configure.c xf86Init.c 
Log Message:
Word up to branding - s/XFree86/Xizzle/ in a couple of user-visible places.


Index: xf86Configure.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Configure.c,v
retrieving revision 3.86
retrieving revision 3.87
diff -u -d -r3.86 -r3.87
--- a/xf86Configure.c	10 Mar 2004 11:50:31 -0000	3.86
+++ b/xf86Configure.c	10 Mar 2004 13:45:18 -0000	3.87
@@ -483,7 +483,7 @@
     int scrnum = 0;
     parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
 
-    ptr->lay_identifier = "XFree86 Configured";
+    ptr->lay_identifier = "Xizzle Configured";
 
     {
 	XF86ConfInputrefPtr iptr;
@@ -940,16 +940,16 @@
     ErrorF("\n");
 
     if (!foundMouse) {
-	ErrorF("\nXFree86 is not able to detect your mouse.\n"
+	ErrorF("\nXizzle is not able to detect your mouse.\n"
 		"Edit the file and correct the Device.\n");
     }
 
     if (xf86NumScreens > 1) {
-	ErrorF("\nXFree86 has configured a multihead system, please check your config.\n");
+	ErrorF("\nXizzle 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 configuration file is %s\n\n", filename);
+    ErrorF("To test the server, run 'Xizzle -config %s'\n\n", filename);
 
 bail:
     OsCleanup();

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Init.c,v
retrieving revision 3.220
retrieving revision 3.221
diff -u -d -r3.220 -r3.221
--- a/xf86Init.c	10 Mar 2004 12:39:40 -0000	3.220
+++ b/xf86Init.c	10 Mar 2004 13:45:18 -0000	3.221
@@ -694,7 +694,7 @@
     formatsDone = TRUE;
 
     if (xf86Info.vtno >= 0 ) {
-#define VT_ATOM_NAME         "XFree86_VT"
+#define VT_ATOM_NAME         "Xizzle_VT"
       Atom VTAtom=-1;
       CARD32  *VT = NULL;
       int  ret;
@@ -1579,18 +1579,18 @@
 {
   ErrorF("\n");
   ErrorF("\n");
-  ErrorF("Device Dependent Usage\n");
+  ErrorF("Xizzle Usage\n");
   if (getuid() == 0)
   {
-    ErrorF("-xf86config file       specify a configuration file\n");
+    ErrorF("-config file           specify a configuration file\n");
     ErrorF("-modulepath paths      specify the module search path\n");
     ErrorF("-logfile file          specify a log file name\n");
     ErrorF("-configure             probe for devices and write an XF86Config\n");
   }
   else
   {
-    ErrorF("-xf86config file       specify a configuration file, relative to the\n");
-    ErrorF("                       XF86Config search path, only root can use absolute\n");
+    ErrorF("-config file           specify a configuration file, relative to the\n");
+    ErrorF("                       search path, only root can use absolute\n");
   }
   ErrorF("-probeonly             probe for devices, then exit\n");
   ErrorF("-scanpci               execute the scanpci module and exit\n");
@@ -1644,7 +1644,7 @@
 static void
 xf86PrintBanner()
 {
-  ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
+  ErrorF("\nXizzle Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
                                        XF86_VERSION_PATCH);
 #ifdef XF86_CUSTOM_VERSION
   ErrorF(" (%s)", XF86_CUSTOM_VERSION);