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

[Egbert Eich]

Committed by: eich

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

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


Index: fbdev.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.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/fbdev.c	5 Mar 2004 13:40:22 -0000	1.1.4.3
+++ b/fbdev.c	15 Apr 2004 10:16:20 -0000	1.1.4.4
@@ -186,7 +186,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	FBDEV_MAJOR_VERSION, FBDEV_MINOR_VERSION, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,

Index: fbdev.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/fbdev.man	5 Mar 2004 13:40:22 -0000	1.1.4.1
+++ b/fbdev.man	15 Apr 2004 10:16:20 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 .fi
 .SH DESCRIPTION
 .B fbdev
-is an XFree86 driver for framebuffer devices.  This is a non-accelerated
+is an __xservername__ driver for framebuffer devices.  This is a non-accelerated
 driver, the following framebuffer depths are supported: 8, 15, 16, 24.
 All visual types are supported for depth 8, and TrueColor visual is
 supported for the other depths.  Multi-head configurations are supported.
@@ -27,7 +27,7 @@
 to the kernel
 device driver.  Currently a fbdevhw module is available for linux.
 .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
@@ -38,7 +38,8 @@
 driver and will use it if there are no video modes configured.
 .PP
 For PCI boards you might have to add a BusID line to the Device
-section.  See above for a sample line.  You can use "XFree86 -scanpci"
+section.  See above for a sample line.  You can use \*q\__xservername__
+-scanpci\*q
 to figure out the correct values.
 .PP
 The following driver 
@@ -56,7 +57,7 @@
 90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise,
 270 degrees). Implies use of the shadow framebuffer layer.   Default: off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
 X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven