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

[Egbert Eich]

Committed by: eich

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

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


Index: rendition.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.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/rendition.c	5 Mar 2004 13:40:29 -0000	1.1.4.3
+++ b/rendition.c	15 Apr 2004 10:16:32 -0000	1.1.4.4
@@ -228,7 +228,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     RENDITION_VERSION_MAJOR, RENDITION_VERSION_MINOR, RENDITION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -354,8 +354,8 @@
 		foundScreen=TRUE;
 	    }
         }
+	xfree(usedChips);
     }
-    xfree(usedChips);
     return foundScreen;
 }
 

Index: rendition.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.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/rendition.man	5 Mar 2004 13:40:30 -0000	1.1.4.2
+++ b/rendition.man	15 Apr 2004 10:16:32 -0000	1.1.4.3
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B rendition 
-is an XFree86 driver for Rendition/Micron based video cards.  The driver
+is an __xservername__ driver for Rendition/Micron based video cards.  The driver
 supports following framebuffer depths: 8, 15 (Verite V1000 only), 16
 and 24. Acceleration and multi-head configurations are
 not supported yet, but are work in progress.
@@ -32,7 +32,7 @@
 .B V2200
 Verite V2200 based cards.
 .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
@@ -79,9 +79,9 @@
 .TP
 .BI "Option \*qNoDDC\*q \*q" boolean \*q
 Disable probing of DDC-information from your monitor. This information is not
-used yet and is only there for informational purposes. This might change
-before final XFree86 4.0 release. Safe to disable if you experience problems
-during startup of X-server.
+used yet and is only there for informational purposes.  
+Safe to disable if you experience problems
+during startup of __xservername__.
 Default: Probe DDC.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
@@ -107,6 +107,6 @@
 .B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the video board.
 .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: Marc Langenbach, Dejan Ilic