Merge the new release from HEADXACE-SELINUX

3 files changed, 10 insertions, 11 deletions

diff --git a/man/siliconmotion.man b/man/siliconmotion.man
index b9614bb..4f0a20f 100644
--- a/man/siliconmotion.man
+++ b/man/siliconmotion.man
@@ -1,5 +1,5 @@
-.\" Header:   //Mercury/Projects/archives/XFree86/4.0/siliconmotion.cpp-arc   1.4   29 Nov 2000 14:12:56   Frido  $
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man,v 1.2 2001/01/27 18:20:52 dawes Exp $
+.\" Header:   //Mercury/Projects/archives/__xservername__/4.0/siliconmotion.cpp-arc   1.4   29 Nov 2000 14:12:56   Frido  $
+.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man,v 1.2 2001/01/27 18:20:52 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH siliconmotion __drivermansuffix__ __vendorversion__
@@ -21,7 +21,7 @@ siliconmotion \- Silicon Motion video driver
 .B EndSection
 .SH DESCRIPTION
 .B siliconmotion 
-is an XFree86 driver for Silicon Motion based video cards.  The driver is fully
+is an __xservername__ driver for Silicon Motion based video cards.  The driver is fully
 accelerated, and provides support for the following framebuffer depths:
 8, 16, and 24.  All
 visual types are supported for depth 8, and TrueColor
@@ -52,7 +52,7 @@ SM720
 .B Cougar3DR
 SM730
 .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.  All options names are case and white space insensitive when
 parsed by the server, for example,  "lynxe" and "LynxE" are equivalent.
@@ -185,14 +185,13 @@ Enable or disable viewing offscreen cache memory.  A
 development debug option.  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 SUPPORT
-For assistance with this driver, or XFree86 in general, check the XFree86 web
-site at http://www.xfree86.org.  A FAQ is available on the web site at
-http://www.xfree86.org/FAQ/.  If you find a problem with XFree86 or have a
+For assistance with this driver, or __xservername__ in general, check the __xservername__ web
+site at http://www.x.org.  If you find a problem with __xservername__ or have a
 question not answered in the FAQ please use our bug report form available on
-the web site or send mail to XFree86@XFree86.org.  When reporting problems
+the web site.  When reporting problems
 with the driver send as much detail as possible, including chipset type, a 
 server output log, and operating system specifics.
 
diff --git a/src/smi_driver.c b/src/smi_driver.c
index a75ea59..608d9d9 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -304,7 +304,7 @@ static XF86ModuleVersionInfo SMIVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	SILICONMOTION_VERSION_MAJOR,
 	SILICONMOTION_VERSION_MINOR,
 	SILICONMOTION_PATCHLEVEL,
diff --git a/src/smi_video.c b/src/smi_video.c
index 3bc4f8b..956c15f 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -41,7 +41,7 @@ Author of changes: Corvin Zahn <zahn@zac.de>
 Date:   2.11.2001
 */
 
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.14 2003/12/08 16:03:58 alanh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.2 2004/04/23 19:45:06 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */
 
 #include "smi.h"