[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/nv nv.man, 1.1.4.3, 1.1.4.4 nv_driver.c, 1.1.4.4, 1.1.4.5 riva_driver.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

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


Index: nv.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,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/nv.man	5 Mar 2004 13:40:29 -0000	1.1.4.3
+++ b/nv.man	15 Apr 2004 10:16:32 -0000	1.1.4.4
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B nv 
-is an XFree86 driver for NVIDIA video cards.  The driver supports 2D 
+is an __xservername__ driver for NVIDIA video cards.  The driver supports 2D 
 acceleration and provides support for the following framebuffer depths:
 8, 15, 16 (except Riva128) and 24.  All
 visual types are supported for depth 8, TrueColor and DirectColor
@@ -53,7 +53,7 @@
 .B GeForce FX, QUADRO FX
 NV30, NV31, NV34, NV35, NV36, NV38
 .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
@@ -114,7 +114,7 @@
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  Default: off.
 .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: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk, 
 Mark Vojkovich

Index: nv_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/nv_driver.c	5 Mar 2004 13:40:29 -0000	1.1.4.4
+++ b/nv_driver.c	15 Apr 2004 10:16:32 -0000	1.1.4.5
@@ -328,7 +328,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,                     /* This is a video driver */
     ABI_VIDEODRV_VERSION,

Index: riva_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,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/riva_driver.c	5 Mar 2004 13:40:29 -0000	1.1.4.2
+++ b/riva_driver.c	15 Apr 2004 10:16:32 -0000	1.1.4.3
@@ -172,7 +172,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     RIVA_MAJOR_VERSION, RIVA_MINOR_VERSION, RIVA_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,                     /* This is a video driver */
     ABI_VIDEODRV_VERSION,