[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/neomagic neo_driver.c, 1.1.4.3, 1.1.4.4 neomagic.man, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/neomagic
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/neomagic

Modified Files:
      Tag: XORG-CURRENT
	neo_driver.c neomagic.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: neo_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/neo_driver.c	5 Mar 2004 13:40:25 -0000	1.1.4.3
+++ b/neo_driver.c	15 Apr 2004 10:16:31 -0000	1.1.4.4
@@ -492,7 +492,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	NEO_MAJOR_VERSION, NEO_MINOR_VERSION, NEO_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,

Index: neomagic.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/neomagic.man	5 Mar 2004 13:40:25 -0000	1.1.4.2
+++ b/neomagic.man	15 Apr 2004 10:16:31 -0000	1.1.4.3
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B neomagic 
-is an XFree86 driver for the Neomagic graphics chipsets found in many
+is an __xservername__ driver for the Neomagic graphics chipsets found in many
 laptop computers.  
 .SH SUPPORTED HARDWARE
 .B neomagic
@@ -46,7 +46,7 @@
 DirectColor visuals are supported in the other depths.
 
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -90,7 +90,7 @@
 .fi
 
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,  
 Mark Vojkovich, Alan Hourihane.