From: Christian Hofstaedtler <ch@grml.org>
Date: Fri, 26 Nov 2010 21:25:39 +0000 (+0100)
Subject: update xorg.conf.example
X-Git-Tag: v0.6.1~1
X-Git-Url: http://git.grml.org/?p=grml-x.git;a=commitdiff_plain;h=22466199f990e2f3e9e323581f660d7ccceb3227

update xorg.conf.example

don't claim it's generated and drop some (pseudo-)obsolete ServerFlags
---

diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example
index 7f923d4..5112c87 100644
--- a/etc/X11/xorg.conf.example
+++ b/etc/X11/xorg.conf.example
@@ -1,6 +1,6 @@
 ################################################################################
 # Filename:      /etc/X11/xorg.conf
-# Purpose:       config file for xserver - generated by grml-x
+# Purpose:       config file for xserver
 # Bug-Reports:   see http://grml.org/bugs/
 # See also:
 #   /usr/share/doc/xserver-xorg/   and
@@ -21,13 +21,11 @@ Section "ServerLayout"
         InputDevice    "Keyboard0"  "CoreKeyboard"
         InputDevice    "USB Mouse"  "CorePointer"
         # InputDevice    "PS/2 Mouse" "CorePointer"
-        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 EndSection
 
 Section "ServerFlags"
         Option "AllowMouseOpenFail"  "true"  # allows the server to start up even if the mouse does not work
         Option "DontVTSwitch"        "false" # allow switching between virtual terminal
-        Option "DontZap"             "false" # enable <Crtl><Alt><BS> (server abort)
         # Option "DontZoom"            "true"  # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
 EndSection