Update xorg.conf man page & sample for changes in Xorg 1.7

AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.

Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefaeb43f15b677eefbea4a288a9948373b

Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c

Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
  by commit 76f18b94bd2719a8199334742d021c4d0806187d
- DRI2 option added in April 2008
  by 35982bc109d424c464551ab22ec90af69908c884

Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
  by commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
- PciProbe/Config options were removed in August 2008
  by commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
- EstimateSizesAggressively was removed in August 2008
  by commit cd1e8f26147919227e7624ac4c6b313d972a4d35
- loadable font modules were removed in July 2008
  by commit affec10635343668839994ea2bac16c1d4524200
- ModInDev options were removed in December 2008
  by commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf

(Also strips some trailing whitespaces to make git happier.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 9 insertions, 28 deletions

diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index 8ba9ae668..8f0c83014 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -73,11 +73,6 @@ XCOMM initialisation of the XFree86-DGA extension within that module.
 	Option	"omit xfree86-dga"
     EndSubSection
 
-XCOMM This loads the Type1 and FreeType font modules
-
-    Load	"type1"
-    Load	"freetype"
-
 EndSection
 
 
@@ -99,8 +94,8 @@ XCOMM events.
 
 XCOMM    Option	"DontVTSwitch"
 
-XCOMM Uncomment this to enable the <Ctrl><Alt><BS> server abort sequence
-XCOMM The default allows clients to receive this key event.
+XCOMM Uncomment this to disable the <Ctrl><Alt><BS> server abort sequence
+XCOMM This allows clients to receive this key event.
 
 XCOMM    Option	"DontZap"	"false"
 
@@ -120,28 +115,18 @@ XCOMM Uncomment this to enable the use of a non-local xvidtune client.
 
 XCOMM    Option	"AllowNonLocalXvidtune"
 
-XCOMM Uncomment this to disable dynamically modifying the input device
-XCOMM (mouse and keyboard) settings.
-
-XCOMM    Option	"DisableModInDev"
-
-XCOMM Uncomment this to enable the use of a non-local client to
-XCOMM change the keyboard or mouse settings (currently only xset).
-
-XCOMM    Option	"AllowNonLocalModInDev"
-
 XCOMM Set the basic blanking screen saver timeout.
 
-    Option	"blank time"	"10"	# 10 minutes
+    Option	"BlankTime"	"10"	# 10 minutes
 
 XCOMM Set the DPMS timeouts.  These are set here because they are global
 XCOMM rather than screen-specific.  These settings alone don't enable DPMS.
 XCOMM It is enabled per-screen (or per-monitor), and even then only when
 XCOMM the driver supports it.
 
-    Option	"standby time"	"20"
-    Option	"suspend time"	"30"
-    Option	"off time"	"60"
+    Option	"StandbyTime"	"10"	# 10 minutes
+    Option	"SuspendTime"	"10"	# 10 minutes
+    Option	"OffTime"	"10"	# 10 minutes
 
 EndSection
 
@@ -167,10 +152,6 @@ XCOMM Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)).
 
 XCOMM    Option	"Xleds"	"1 2 3"
 
-XCOMM To disable the XKEYBOARD extension, uncomment XkbDisable.
-
-XCOMM    Option	"XkbDisable"
-
 XCOMM To customise the XKB settings to suit your keyboard, modify the
 XCOMM lines below (which are the defaults).  For example, for a European
 XCOMM keyboard, you will probably want to use one of:
@@ -395,14 +376,14 @@ Section "Device"
 
 XCOMM The Identifier must be present.
 
-    Identifier	"Generic VGA"
+    Identifier	"Generic VESA"
 
 XCOMM The Driver line must be present.  When using run-time loadable driver
 XCOMM modules, this line instructs the server to load the specified driver
 XCOMM module.  Even when not using loadable driver modules, this line
 XCOMM indicates which driver should interpret the information in this section.
 
-    Driver	"vga"
+    Driver	"vesa"
 
 XCOMM The chipset line is optional in most cases.  It can be used to override
 XCOMM the driver's chipset detection, and should not normally be specified.
@@ -466,7 +447,7 @@ Section "Screen"
 XCOMM The Identifier, Device and Monitor lines must be present
 
     Identifier	"Screen 1"
-    Device	"Generic VGA"
+    Device	"Generic VESA"
     Monitor	"Generic Monitor"
 
 XCOMM The favoured Depth and/or Bpp may be specified here