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

[Egbert Eich]

Committed by: eich

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

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


Index: v4l.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.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/v4l.c	5 Mar 2004 13:40:39 -0000	1.1.4.4
+++ b/v4l.c	15 Apr 2004 10:16:40 -0000	1.1.4.5
@@ -50,7 +50,7 @@
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         0, 0, 1,
         ABI_CLASS_VIDEODRV,
         ABI_VIDEODRV_VERSION,

Index: v4l.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.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/v4l.man	5 Mar 2004 13:40:39 -0000	1.1.4.1
+++ b/v4l.man	15 Apr 2004 10:16:40 -0000	1.1.4.2
@@ -13,9 +13,9 @@
 .fi
 .SH DESCRIPTION
 .B v4l 
-is an XFree86 driver for video4linux cards.  It provides a Xvideo
+is an __xservername__ driver for video4linux cards.  It provides a Xvideo
 extention port for video overlay.  Just add the driver to the module
-list within the module section of your XF86Config file if you want
+list within the module section of your __xconfigfile__ file if you want
 to use it.  There are no config options.
 .P
 Note that the the extmod module is also required for the Xvideo
@@ -30,10 +30,10 @@
 bt848/bt878-based TV cards are the most popular hardware these
 days.
 .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.
 .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: Gerd Knorr <kraxel at bytesex.org>