15 files changed, 96 insertions, 53 deletions

diff --git a/config/cf/NetBSD.cf b/config/cf/NetBSD.cf
index d1859b035..8fa6eae68 100644
--- a/config/cf/NetBSD.cf
+++ b/config/cf/NetBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.124tsi Exp $
+XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.125 2004/06/25 15:33:20 tsi Exp $
 
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
@@ -162,7 +162,11 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define ThreadedX		YES
 # define HasThreadSafeAPI	YES
 # define ThreadsLibraries	-lpthread
-# define LibraryMTDefines	-DUSE_NBSD_THREADLIB
+# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
+      (OSMajorVersion == 2 && OSMinorVersion < 99) || \
+      (OSMajorVersion < 2))
+#  define LibraryMTDefines	-DUSE_NBSD_THREADLIB
+# endif
 # define SystemMTDefines	-D_REENTRANT
 # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
 #else 
diff --git a/config/imake/imakemdep.h b/config/imake/imakemdep.h
index 3a5599fa6..a590bbd88 100644
--- a/config/imake/imakemdep.h
+++ b/config/imake/imakemdep.h
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.78tsi Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.79 2004/12/16 22:15:48 tsi Exp $ */
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -908,16 +908,36 @@ char *cpp_argv[ARGUMENTS] = {
  */
 #  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
 #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV   "r %*d.%*d%[A-Z]" 
+#  define DEFAULT_OS_TEENY_REV   "r %s" 
 #  define DEFAULT_OS_TEENY_REV_FROB(buf, size)				\
     do {								\
-	int	teeny = 0;						\
-	char	*ptr = (buf);						\
+	int	major, minor, teeny = 0;				\
+	char	*ptr = (buf), *endptr;					\
 									\
-	while (*ptr >= 'A' && *ptr <= 'Z') /* sanity check */		\
-	    teeny = teeny * 26 + (int)(*ptr++ - 'A');			\
+	major = (int)strtol(ptr, &endptr, 10);				\
+	if (ptr == endptr || *endptr++ != '.')				\
+	    goto error;							\
 									\
-	snprintf((buf), (size), "%d", teeny + 1);			\
+	ptr = endptr;							\
+	minor = (int)strtol(ptr, &endptr, 10);				\
+	if (ptr == endptr)						\
+	    goto error;							\
+	ptr = endptr;							\
+									\
+	if (major > 2 || (major == 2 && minor >= 99)) {			\
+		if (*ptr++ == '.') {					\
+			teeny = (int)strtol(ptr, &endptr, 10);		\
+			if (ptr == endptr)				\
+				goto error;				\
+		}							\
+	} else {							\
+		while (*ptr >= 'A' && *ptr <= 'Z') /* sanity check */	\
+		    teeny = teeny * 26 + (int)(*ptr++ - 'A');		\
+		teeny++;						\
+	}								\
+									\
+error:									\
+	snprintf((buf), (size), "%d", teeny);				\
     } while (0)
 #  define DEFAULT_OS_NAME        "smr %[^\n]"
 #  define DEFAULT_OS_NAME_FROB(buf, size)				\
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 6b8c3227e..cd0965d67 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,9 @@
 XFree86 4.4.99.23 (xx January 2005)
+ 304. Fix xf86cfg to handle drivers (like 'ati') with no options
+      (Bugzilla #1539, David Laight).
+ 303. Assorted XFree86 driver man page updates (Bugzilla #1538, Nicolas Joly).
+ 302. Updates for building on NetBSD-current (#7386, Matthais Scheler,
+      Izumi Tsutsui, submitted by Bernd Ernesti).
  301. Modify getconfig's version handling to work with versions of perl
       that do not have v-strings (David Dawes).
  300. Clean up Xprt, Xnest, Xvfb and Xdmx links (Marc La France).
@@ -19337,7 +19342,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3412 2005/01/31 22:54:47 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3413 2005/02/01 00:01:15 dawes Exp $
 
 
 
diff --git a/programs/Xserver/hw/xfree86/drivers/apm/apm.man b/programs/Xserver/hw/xfree86/drivers/apm/apm.man
index 035f7b008..74ab6c9de 100644
--- a/programs/Xserver/hw/xfree86/drivers/apm/apm.man
+++ b/programs/Xserver/hw/xfree86/drivers/apm/apm.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.2 2001/01/27 18:20:46 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.3 2002/05/07 12:53:49 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH APM __drivermansuffix__ __vendorversion__
@@ -47,6 +47,7 @@ section, and will override the auto-detection:
 .PP
 .RS 4
 "6422", "at24", "at3d".
+.RE
 .PP
 The AT25 is Chipset "at3d" and the 6420 is 6422.
 .PP
@@ -64,6 +65,9 @@ are supported:
 .BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the hardware cursor.  Default: on.
 .TP
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
+Force the software cursor.  Default: off.  
+.TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
@@ -94,13 +98,11 @@ that with
 in the
 .B Device
 section of the config file.
-.TP
-.BI "Option \*qSWCursor\*q \*q" boolean \*q
-Force the software cursor.  Default: off.
+.RE
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  Default: off.
 .SH "SEE ALSO"
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
-Authors include: ...
+Authors include: Kent Hamilton, Henrik Harmsen and Loic Grenie.
diff --git a/programs/Xserver/hw/xfree86/drivers/chips/chips.man b/programs/Xserver/hw/xfree86/drivers/chips/chips.man
index af7085335..11da2605f 100644
--- a/programs/Xserver/hw/xfree86/drivers/chips/chips.man
+++ b/programs/Xserver/hw/xfree86/drivers/chips/chips.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.5 2002/01/04 21:22:27 tsi Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.6 2004/10/03 20:32:50 herrb Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH CHIPS __drivermansuffix__ __vendorversion__
@@ -109,11 +109,11 @@ Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
 .BI "Option \*qNoLinear\*q \*q" boolean \*q
 Disables linear addressing in cases where it is enabled by default.
-Default: off
+Default: off.
 .TP
 .BI "Option \*qLinear\*q \*q" boolean \*q
 Enables linear addressing in cases where it is disabled by default.
-Default: off
+Default: off.
 .TP
 .BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
@@ -125,26 +125,26 @@ Enable or disable the SW cursor.  Default: off.
 Force detection of STN screen type. Default: off.
 .TP
 .BI "Option \*qUseModeline\*q \*q" boolean \*q
-Reprogram flat panel timings with values from the modeline. Default: off
+Reprogram flat panel timings with values from the modeline. Default: off.
 .TP
 .BI "Option \*qFixPanelSize\*q \*q" boolean \*q
-Reprogram flat panel size with values from the modeline. Default: off
+Reprogram flat panel size with values from the modeline. Default: off.
 .TP
 .BI "Option \*qNoStretch\*q \*q" boolean \*q
 This option disables the stretching on a mode on a flat panel to fill the
-screen. Default: off
+screen. Default: off.
 .TP
 .BI "Option \*qLcdCenter\*q \*q" boolean \*q
-Center the mode displayed on the flat panel on the screen. Default: off
+Center the mode displayed on the flat panel on the screen. Default: off.
 .TP
 .BI "Option \*qHWclocks\*q \*q" boolean \*q
 Force the use of fixed hardware clocks on chips that support both fixed
-and programmable clocks. Default: off
+and programmable clocks. Default: off.
 .TP
 .BI "Option \*qUseVclk1\*q \*q" boolean \*q
 Use the Vclk1 programmable clock on
 .B HiQV
-chipsets instead of Vclk2. Default: off
+chipsets instead of Vclk2. Default: off.
 .TP
 .BI "Option \*qFPClock8\*q \*q" float \*q
 .TP
@@ -154,17 +154,17 @@ chipsets instead of Vclk2. Default: off
 .TP
 .BI "Option \*qFPClock32\*q \*q" float \*q
 Force the use of a particular video clock speed for use with the 
-flat panel at a specified depth
+flat panel at a specified depth.
 .TP
 .BI "Option \*qMMIO\*q \*q" boolean \*q
-Force the use of memory mapped IO for acceleration registers. Default: off
+Force the use of memory mapped IO for acceleration registers. Default: off.
 .TP
 .BI "Option \*qFullMMIO\*q \*q" boolean \*q
-Force the use of memory mapped IO where it can be used. Default: off
+Force the use of memory mapped IO where it can be used. Default: off.
 .TP
 .BI "Option \*qSuspendHack\*q \*q" boolean \*q
 Force driver to leave centering and stretching registers alone. This
-can fix some laptop suspend/resume problems. Default: off
+can fix some laptop suspend/resume problems. Default: off.
 .TP
 .BI "Option \*qOverlay\*q"
 Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
@@ -186,7 +186,7 @@ Enable or disable combining the sync signals with the green signal.
 Default: off.
 .TP
 .BI "Option \*qShowCache\*q \*q" boolean \*q
-Enable or disable viewing offscreen memory. Used for debugging only
+Enable or disable viewing offscreen memory. Used for debugging only.
 Default: off.
 .TP
 .BI "Option \*q18bitBus\*q \*q" boolean \*q
diff --git a/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man b/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man
index 9343107a5..38cb93503 100644
--- a/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man
+++ b/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH CYRIX __drivermansuffix__ __vendorversion__
@@ -34,17 +34,16 @@ driver.
 .PP
 The following driver
 .B options
-are supported
+are supported:
 .TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration. Default: acceleration is enabled.
 .TP
 .BI "Option \*qSWCursor\*q \*q" boolean \*q
-Disable or enable software cursor. Default software cursor is enabled and a
-hardware cursor is used.
+Disable or enable software cursor. Default: software cursor is enabled.
 .TP
 .BI "Option \*qHWCursor\*q \*q" boolean \*q
-Disable or enable hardware cursor. Default hardware cursor is disabled.
+Disable or enable hardware cursor. Default: hardware cursor is disabled.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
 Disable or enable shadow frame buffer. The shadow buffer is normally only
@@ -53,9 +52,9 @@ used when rotating the screen. The default is false.
 .BI "Option \*qRotate\*q \*qCW\*q"
 .TP
 .BI "Option \*qRotate\*q \*qCCW\*q"
-.PP
 Rotate the display clockwise or counterclockwise for use on Cyrix based
 tablet PC systems. This mode is currently unaccelerated.
+Default: no rotation.
 .SH "BUGS"
 This driver has not been tested on the original 5510 hardware for some
 considerable time.
diff --git a/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man b/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man
index 929185192..21c78e3e1 100644
--- a/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man
+++ b/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.3 2001/10/02 15:57:32 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH FBDEV __drivermansuffix__ __vendorversion__
@@ -59,4 +59,4 @@ Enable rotation of the display. The supported values are "CW" (clockwise,
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
 X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
 .SH AUTHORS
-Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
+Authors include: Gerd Knorr, Michel Danzer, Geert Uytterhoeven
diff --git a/programs/Xserver/hw/xfree86/drivers/glint/glint.man b/programs/Xserver/hw/xfree86/drivers/glint/glint.man
index c3c1da73c..3e31571e6 100644
--- a/programs/Xserver/hw/xfree86/drivers/glint/glint.man
+++ b/programs/Xserver/hw/xfree86/drivers/glint/glint.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.5 2001/12/17 20:52:32 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.6 2003/02/14 12:03:09 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH GLINT __drivermansuffix__ __vendorversion__
@@ -106,5 +106,5 @@ If you have a card of the same name, turn this on.  Default: off.
 .SH "SEE ALSO"
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
-Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer,
+Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Danzer,
 Sven Luther
diff --git a/programs/Xserver/hw/xfree86/drivers/i128/i128.man b/programs/Xserver/hw/xfree86/drivers/i128/i128.man
index 24a1a4d76..785c7a7ca 100644
--- a/programs/Xserver/hw/xfree86/drivers/i128/i128.man
+++ b/programs/Xserver/hw/xfree86/drivers/i128/i128.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.1 2001/01/24 00:06:19 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH I128 __drivermansuffix__ __vendorversion__
@@ -50,6 +50,9 @@ are supported:
 .BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
 .TP
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
+Enable or disable the SW cursor.  Default: off.
+.TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
@@ -64,6 +67,14 @@ Default: false.
 .BI "Option \*qDebug\*q \*q" boolean \*q
 This turns on verbose debug information from the driver.
 Default: off.
+.PP
+The following additional
+.B Options
+are supported:
+.TP
+.BI "Option \*qShowCache\*q \*q" boolean \*q
+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__)
 .SH AUTHORS
diff --git a/programs/Xserver/hw/xfree86/drivers/i810/i810.man b/programs/Xserver/hw/xfree86/drivers/i810/i810.man
index 64934a10a..4ff53ba45 100644
--- a/programs/Xserver/hw/xfree86/drivers/i810/i810.man
+++ b/programs/Xserver/hw/xfree86/drivers/i810/i810.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v 1.7 2004/06/10 13:08:28 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v 1.8 2005/01/09 20:47:19 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH I810 __drivermansuffix__ __vendorversion__
@@ -65,7 +65,7 @@ that the video BIOS is aware of.
 .PP
 The following driver
 .B Options
-are supported
+are supported:
 .TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
diff --git a/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man b/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man
index 7753935c8..9dba7f8a8 100644
--- a/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man
+++ b/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.4 2003/02/20 03:22:52 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NEOMAGIC __drivermansuffix__ __vendorversion__
@@ -52,7 +52,7 @@ driver.
 .PP
 The following driver
 .B Options
-are supported
+are supported:
 .TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
diff --git a/programs/Xserver/hw/xfree86/drivers/newport/newport.man b/programs/Xserver/hw/xfree86/drivers/newport/newport.man
index 8c181df76..0e7e40d5c 100644
--- a/programs/Xserver/hw/xfree86/drivers/newport/newport.man
+++ b/programs/Xserver/hw/xfree86/drivers/newport/newport.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man,v 1.3 2001/11/23 19:50:45 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man,v 1.4 2003/02/17 23:06:11 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NEWPORT __drivermansuffix__ __vendorversion__
@@ -25,7 +25,9 @@ Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
-The following driver options are supported:
+The following driver
+.B Options
+are supported:
 .br
 .TP
 .BI "Option \*qbitplanes\*q \*q" integer \*q
diff --git a/programs/Xserver/hw/xfree86/drivers/trident/trident.man b/programs/Xserver/hw/xfree86/drivers/trident/trident.man
index 57c6813bd..fc4bf3455 100644
--- a/programs/Xserver/hw/xfree86/drivers/trident/trident.man
+++ b/programs/Xserver/hw/xfree86/drivers/trident/trident.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.15 2003/07/03 07:52:46 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH TRIDENT __drivermansuffix__ __vendorversion__
@@ -21,7 +21,7 @@ The XvImage extension is supported on TGUI96xx and greater cards.
 .SH SUPPORTED HARDWARE
 The
 .B trident
-driver supports PCI,AGP and ISA video cards based on the following 
+driver supports PCI, AGP and ISA video cards based on the following 
 Trident chips:
 .TP 12
 .B Blade
diff --git a/programs/Xserver/hw/xfree86/drivers/via/via.man b/programs/Xserver/hw/xfree86/drivers/via/via.man
index 23e052608..ad221fa4a 100644
--- a/programs/Xserver/hw/xfree86/drivers/via/via.man
+++ b/programs/Xserver/hw/xfree86/drivers/via/via.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via.man,v 1.4 2003/12/19 22:00:46 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via.man,v 1.5 2004/04/03 22:05:02 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH VIA __drivermansuffix__ __vendorversion__
@@ -32,8 +32,8 @@ details.  This section only covers configuration details specific to this
 driver.
 .PP
 The following driver
-.B options
-are supported
+.B Options
+are supported:
 .TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration. Default: acceleration is enabled.
diff --git a/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c b/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c
index 26e675a8f..94ed6d043 100644
--- a/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c
+++ b/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "xf86config.h"
@@ -498,7 +498,7 @@ ScreenDialog(XF86SetupInfo *info)
 		strcmp(drv_opts->name, screen->scrn_device->dev_driver) == 0) {
 		OptionInfoPtr opts = drv_opts->option;
 
-		while (opts->name) {
+		while (opts && opts->name) {
 		    if (xf86nameCompare(opts->name, "Rotate") == 0) {
 			foundRotate = True;
 			break;