X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2FX11%2Fxorg.conf.example;h=5112c874c71538aa4ccc97049416529a133f6957;hb=8f851e6f4309b3c7427d45b012cbd002584b4ae5;hp=a213cdb93d58103f2a571453b224f6cac3a22a2f;hpb=910af43b493c2d1089d0785c2ed80c8b5bd6116b;p=grml-x.git

diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example
index a213cdb..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
@@ -26,7 +26,6 @@ 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
 
@@ -61,19 +60,19 @@ Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
         Load  "glx"       # 3D layer
-        Load  "type1"     # font module
-        Load  "freetype"  # font rendering
         Load  "extmod"    # some commonly used server extensions (e.g. shape extension)
         Load  "record"    # recording extension
         Load  "evdev"     # generic input handling driver on Linux
-        # Load  "vbe"       # Vesa BIOS Extension
-        # Load  "ddc"       # ddc probing of monitor
         # Load  "bitmap"    # bitmap fonts
+        # Load  "ddc"       # ddc probing of monitor
+        # Load  "freetype"  # font rendering
         # Load  "GLcore"    # render OpenGL in software
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS
         # Load  "speedo"    # font module
+        # Load  "type1"     # font module
         # Load  "v4l"       # Video for Linux
+        # Load  "vbe"       # Vesa BIOS Extension
 # Valid entries - see /usr/lib/xorg/modules/[extensions/]
 # afb bitmap cfb cfb16 cfb24 cfb32 cw damage dbe ddc dri drm extmod fb
 # fbdevhw freetype GLcore glx i2c int10 int10 layer mfb pcidata rac ramdac