diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:32 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:32 +0000 |
| commit | 6a3e0064c05bd8e5e61c625e8643d68b75a9830e (patch) | |
| tree | e20191f542d879603b0d3755dac9dc480e6626d4 | |
| parent | 1600d4aa5b35a662af2c918a2ac9f97d1dc99f66 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | README.sgml | 7 | ||||
| -rw-r--r-- | man/i128.man | 6 | ||||
| -rw-r--r-- | src/i128_driver.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/README.sgml b/README.sgml index 2ecbc3a..289a5b6 100644 --- a/README.sgml +++ b/README.sgml @@ -1,13 +1,12 @@ -<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[ +<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[ <!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> <article> <title>Information for Number Nine I128 Users <author>The XFree86 Project Inc. -<date>3 November 2000 +<date>25 March 2004 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.5 2000/11/06 22:03:28 dawes Exp $ </ident> <toc> @@ -45,7 +44,7 @@ supported. <p> The I128 driver should auto-detect all supported hardware so you needn't have anything other than the Identifier in the Section "Device" of the -XF86Config file. When running the XF86Setup or xf86config programs one +xorg.conf file. When running the xorgcfg or xorgconfig programs one merely needs to select an I128 card so that the correct server will be used. One need not and should not specify a RAMDAC, clockchip or allow the setup program to probe for clocks. The driver will auto-detect the diff --git a/man/i128.man b/man/i128.man index 24a1a4d..c4a1f71 100644 --- a/man/i128.man +++ b/man/i128.man @@ -14,7 +14,7 @@ i128 \- Number 9 I128 video driver .fi .SH DESCRIPTION .B i128 -is an XFree86 driver for Number 9 I128 video cards. The driver is +is an __xservername__ driver for Number 9 I128 video cards. The driver is accelerated and provides support for all versions of the I128 chip family, including the SGI flatpanel configuration. Multi-head configurations are supported. @@ -34,7 +34,7 @@ Ticket 2 Ride .B I128-T2R4 Ticket 2 Ride IV .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 @@ -65,6 +65,6 @@ Default: false. This turns on verbose debug information from the driver. 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: Robin Cutshaw (driver), Galen Brooks (flatpanel support). diff --git a/src/i128_driver.c b/src/i128_driver.c index b4b17df..adc9b92 100644 --- a/src/i128_driver.c +++ b/src/i128_driver.c @@ -141,7 +141,7 @@ static XF86ModuleVersionInfo i128VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, I128_MAJOR_VERSION, I128_MINOR_VERSION, I128_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, |