Update the 'Configuring X11' section for Xorg 7.4

Reviewed by:	rene, keramida, trhodes, Warren Block <wblock at wonkity dot com>

en_US.ISO8859-1/books/handbook/x11/chapter.sgml

@@ -411,8 +411,24 @@
 
       <screen>&prompt.user; <userinput>startx</userinput></screen>
 
-      <para>If this does not work, or if the default configuration is
-	not acceptable, then X11 must be configured manually.</para>
+      <para>Starting with version 7.4, <application>&xorg;</application>
+	can use <acronym>HAL</acronym> to autodetect keyboards and mice.
+	The <filename role="package">sysutils/hal</filename> and
+	<filename role="package">devel/dbus</filename> ports are installed
+	as dependencies of <filename role="package">x11/xorg</filename>, but
+	must be enabled by the following entries in the
+	<filename>/etc/rc.conf</filename> file:</para>
+
+      <programlisting>hald_enable="YES"
+dbus_enable="YES"</programlisting>
+
+      <para>These services should be started (either manually or by
+	rebooting) before further <application>&xorg;</application>
+	configuration is attempted.</para>
+
+      <para>The automatic configuration may fail to work with some hardware,
+	or may not set things up quite as desired.  In these cases, manual
+	configuration will be necessary.</para>
 
       <note>
 	<para>Desktop environments like
@@ -448,11 +464,18 @@
       <para>The next step is to test the existing
         configuration to verify that <application>&xorg;</application>
         can work with the graphics
-        hardware on the target system.  To perform this task,
-        type:</para>
+        hardware on the target system.  In <application>&xorg;</application>
+	versions up to 7.3, type:</para>
 
       <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new</userinput></screen>
 
+      <para>Starting with <application>&xorg;</application> 7.4 and above,
+	this test produces a black screen which may make it difficult
+	to diagnose whether X11 is working properly.  The older behavior
+	is still available by using the <option>retro</option> option:</para>
+
+      <screen>&prompt.root; <userinput>Xorg -config xorg.conf.new -retro</userinput></screen>
+
       <para>If a black and grey grid and an X mouse cursor appear,
         the configuration was successful.  To exit the test, just press
         <keycombo action="simul">
@@ -461,9 +484,30 @@
           <keycap>Backspace</keycap>
         </keycombo> simultaneously.</para>
 
-	<note><para>If the mouse does not work, you will need to first
+      <note>
+	<para>This key combination was enabled by default up to
+	  <application>&xorg;</application> version 7.3.  To enable it in
+	  version 7.4 and later, add the following line to the
+	  <literal>ServerLayout</literal> or <literal>ServerFlags</literal>
+	  section of the configuration file:</para>
+
+	<programlisting>Option "DontZap" "Off"</programlisting>
+      </note>
+
+	<para>If the mouse does not work, you will need to first
 	  configure it before proceeding.  See <xref linkend="mouse">
-	  in the &os; install chapter.</para></note>
+	  in the &os; install chapter.  Additionally, starting with version
+	  7.4, the <literal>InputDevice</literal> sections in
+	  <filename>xorg.conf</filename> are ignored in favor of the
+	  autodetected devices.  To restore the old behavior, add the
+	  following line to the <literal>ServerLayout</literal> or
+	  <literal>ServerFlags</literal> section of this file:</para>
+
+	  <programlisting>Option "AutoAddDevices" "false"</programlisting>
+
+	  <para>Input devices may then be configured as in previous versions,
+	    along with any other options needed (e.g. keyboard layout
+	    switching).</para>
 
       <indexterm><primary>X11 tuning</primary></indexterm>
 
@@ -561,19 +605,6 @@ EndSection</programlisting>
 	started with the &man.startx.1; utility.
 	The X11 server may also be started with the use of
         &man.xdm.1;.</para>
-
-      <note><para>There is also a graphical configuration tool,
-	&man.xorgcfg.1;, which comes with the
-	X11 distribution.  It
-	allows you to interactively define your configuration by choosing
-	the appropriate drivers and settings.  This program can be invoked from the console, by typing the command <command>xorgcfg -textmode</command>.  For more details,
-	refer to the &man.xorgcfg.1; manual page.</para>
-
-      <para>Alternatively, there is also a tool called &man.xorgconfig.1;.
-	This program is a console utility that is less user friendly,
-	but it may work in situations where the other tools do
-	not.</para></note>
-
     </sect2>
 
     <sect2>