X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2FX11%2Fxorg.conf.example;h=5112c874c71538aa4ccc97049416529a133f6957;hb=22466199f990e2f3e9e323581f660d7ccceb3227;hp=bc824b439f36160c1a344efb725416ff4481b91c;hpb=f16a8c94858f2282254f343f43fb8e09798ffb56;p=grml-x.git

diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example
index bc824b4..5112c87 100644
--- a/etc/X11/xorg.conf.example
+++ b/etc/X11/xorg.conf.example
@@ -1,17 +1,15 @@
 ################################################################################
 # 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/
-# Latest change: Sat Apr 15 10:39:38 CEST 2006 [mika]
 # See also:
 #   /usr/share/doc/xserver-xorg/   and
 #   http://wiki.x.org/wiki/Home    and
 #   http://ftp.x.org/pub/X11R7.0/doc/html/index.html for information on Xorg
-#   /usr/share/doc/xfree86-common/                   for information on XFree86
 # Refer to the xorg.conf man page and to
 # http://ftp.x.org/pub/X11R7.0/doc/html/xorg.conf.5.html
 # for details about the format of this file.
-# 
+#
 # If you would like this file to be automatically reconfigured by debian,
 # run the following command:
 #   sudo dpkg-reconfigure -phigh xserver-xorg
@@ -28,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"             "true"  # disable <Crtl><Alt><BS> (server abort)
         # Option "DontZoom"            "true"  # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
 EndSection
 
@@ -58,24 +55,24 @@ Section "Files"
         FontPath     "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 EndSection
 
-# Modules - see /usr/X11R6/lib/modules/fonts and /usr/X11R6/lib/modules/extensions
+# Modules - see /usr/lib/xorg/modules/fonts and /usr/lib/xorg/modules/extensions
 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  "vbe"       # Vesa BIOS Extension
-        # Load  "ddc"       # ddc probing of monitor
+        Load  "evdev"     # generic input handling driver on Linux
         # 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  "evdev"     # generic input handling driver on 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
@@ -97,11 +94,11 @@ Section "InputDevice"
         Option      "XkbModel"   "pc105"
         Option      "XkbLayout"  "us"
         #Option      "XkbVariant" "nodeadkeys"
+        #Option      "XkbOptions" "ctrl:swapcaps,grp:alt_shift_toggle,grp_led:scroll,compose:menu"
 EndSection
 
 # More information: http://ftp.x.org/pub/X11R6.9.0/doc/html/mouse.html
 
-
 Section "InputDevice"
         Identifier      "USB Mouse"
         Driver          "mouse"
@@ -179,7 +176,6 @@ Section "Device"
         # Option "RenderAccel" "true"
         # Option "AllowGLXWithComposite" "true"
         Identifier  "Card0"
-# The following line is auto-generated by grml-x
         Driver      "vesa"
         VendorName  "All"
         BoardName   "All"
@@ -227,6 +223,8 @@ Section "Screen"
         EndSubSection
 EndSection
 
+# Make sure you have the relevant Debian packages on your system
+# to be able to use DRI (libgl1-mesa-dri for example)
 Section "DRI"
         Mode 0666
 EndSection