Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

12 files changed, 16 insertions, 16 deletions

diff --git a/man/sunleo.man b/man/sunleo.man
index 2871ec5..9735f0d 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SUNLEO __drivermansuffix__ __vendorversion__
@@ -22,7 +22,7 @@ sunleo \- Leo video driver
 .fi
 .SH DESCRIPTION
 .B leo
-is an XFree86 driver for Sun Leo (ZX) video cards.
+is an __xservername__ driver for Sun Leo (ZX) video cards.
 .PP
 Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D
 graphics card. Both cards are double-width, but the TZX also requires
@@ -55,11 +55,11 @@ SPARCcenter 2000
 .SH CONFIGURATION DETAILS
 You must set "DefaultDepth" to "32" in the Screen Section.
 .nf
-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
 Driver authors include: Jakub Jelinek <jakub@redhat.com>
 .br
diff --git a/src/leo.h b/src/leo.h
index 8df9302..59714b4 100644
--- a/src/leo.h
+++ b/src/leo.h
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
 
 #ifndef LEO_H
 #define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index ee62310..02e7f82 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.2tsi Exp $ */
 
 #define	PSZ	32
 
diff --git a/src/leo_checks.c b/src/leo_checks.c
index e0ad8ab..dc04256 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
 
 #define PSZ 32
 
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 271a222..6112169 100644
--- a/src/leo_cursor.c
+++ b/src/leo_cursor.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
 
 #include "leo.h"
 
diff --git a/src/leo_driver.c b/src/leo_driver.c
index b15323b..f8843f3 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -108,7 +108,7 @@ static XF86ModuleVersionInfo sunleoVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	LEO_MAJOR_VERSION, LEO_MINOR_VERSION, LEO_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 4f1e854..004aa29 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
 
 #define PSZ 32
 
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 8784acc..a162fd6 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
 
 #define PSZ 32
 
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 755870c..239d157 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
 
 #define PSZ 32
 
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 92b46a1..8550c9b 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
 
 #define PSZ 32
 
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 747865c..a233edd 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.c
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
 
 #define PSZ 32
 
diff --git a/src/leo_regs.h b/src/leo_regs.h
index e001587..60686a9 100644
--- a/src/leo_regs.h
+++ b/src/leo_regs.h
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef LEOREGS_H
 #define LEOREGS_H