Index: chapter.xml
===================================================================
--- chapter.xml
+++ chapter.xml
@@ -266,59 +266,6 @@
     <screen>&prompt.root; <userinput>pkg install xorg</userinput></screen>
   </sect1>
 
-  <sect1 xml:id="x-config-quick-start">
-    <title>Quick Start</title>
-
-    <para>In most cases, <application>&xorg;</application> is
-      self-configuring.  When started without any configuration file,
-      the video card and input devices are automatically detected and
-      used.  Autoconfiguration is the preferred method, and should be
-      tried first.</para>
-
-    <procedure xml:id="x-config-quick-start-procedure">
-      <step>
-	<para>Check if <acronym>HAL</acronym> is used by the X
-	  server:</para>
-
-	<screen>&prompt.user; <userinput>pkg info xorg-server | grep HAL</userinput></screen>
-
-	<para>If the output shows <acronym>HAL</acronym> is
-	  <literal>off</literal>, skip to the next step.  If
-	  <acronym>HAL</acronym> is <literal>on</literal>, enable
-	  needed services by adding two entries to
-	  <filename>/etc/rc.conf</filename>.  Then start the
-	  services:</para>
-
-	<programlisting>hald_enable="YES"
-dbus_enable="YES"</programlisting>
-
-	<screen>&prompt.root; <userinput>service hald start ; service dbus start</userinput></screen>
-      </step>
-
-      <step>
-	<para>Rename or delete old versions of
-	  <filename>xorg.conf</filename>:</para>
-
-	<screen>&prompt.root; <userinput>mv /etc/X11/xorg.conf ~/xorg.conf.etc</userinput>
-&prompt.root; <userinput>mv /usr/local/etc/X11/xorg.conf ~/xorg.conf.localetc</userinput></screen>
-      </step>
-
-      <step>
-	<para>Start the X system:</para>
-
-	<screen>&prompt.user; <userinput>startx</userinput></screen>
-
-	<para>Test the system by moving the mouse and typing text into
-	  the windows.  If both mouse and keyboard work as expected,
-	  see <xref linkend="x11-wm"/> and <xref
-	    linkend="x-xdm"/>.</para>
-
-	<para>If the mouse or keyboard do not work, continue with
-	  <xref linkend="x-config"/>.</para>
-      </step>
-    </procedure>
-  </sect1>
-
   <sect1 xml:id="x-config">
     <!--
     <sect1info>
@@ -336,138 +283,43 @@
     <indexterm><primary>&xorg;</primary></indexterm>
     <indexterm><primary><application>&xorg;</application></primary></indexterm>
 
-    <para>Those with older or unusual equipment may find it helpful to
-      gather some hardware information before beginning
-      configuration.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>Monitor sync frequencies</para>
-      </listitem>
-
-      <listitem>
-	<para>Video card chipset</para>
-      </listitem>
-
-      <listitem>
-	<para>Video card memory</para>
-      </listitem>
-    </itemizedlist>
-
-    <indexterm>
-      <primary>horizontal sync frequency</primary>
-    </indexterm>
-    <indexterm>
-      <primary>horizontal scan rate</primary>
-      <see>horizontal sync frequency</see>
-    </indexterm>
-    <indexterm><primary>refresh rate</primary></indexterm>
-    <indexterm>
-      <primary>vertical sync frequency</primary>
-      <see>refresh rate</see>
-    </indexterm>
-    <indexterm>
-      <primary>vertical scan rate</primary>
-      <see>refresh rate</see>
-    </indexterm>
-
-    <para>Screen resolution and refresh rate are determined by the
-      monitor's horizontal and vertical sync frequencies.  Almost all
-      monitors support electronic autodetection of these values.  A
-      few monitors do not provide these values, and the specifications
-      must be determined from the printed manual or manufacturer web
-      site.</para>
-
-    <para>The video card chipset is also autodetected, and used to
-      select the proper video driver.  It is beneficial for the user
-      to be aware of which chipset is installed for when autodetection
-      does not provide the desired result.</para>
-
-    <para>Video card memory determines the maximum resolution and
-      color depth which can be displayed.</para>
-
-    <sect2>
-      <title>Caveats</title>
-
-      <para>The ability to configure optimal resolution is dependent
-	upon the video hardware and the support provided by its
-	driver.  At this time, driver support includes:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Intel: as of &os;&nbsp;9.3 and &os;&nbsp;10.1, 3D
-	    acceleration on most Intel graphics, including IronLake,
-	    SandyBridge, and IvyBridge, is supported.  Support for
-	    switching between X and virtual consoles is provided by
-	    &man.vt.4;.</para>
-	</listitem>
-
-	<listitem>
-	  <para>ATI/Radeon: 2D and 3D acceleration is supported on
-	    most Radeon cards up to the HD6000 series.</para>
-	</listitem>
-
-	<listitem>
-	  <para>NVIDIA: several NVIDIA drivers are available in the
-	    <filename>x11</filename> category of the Ports Collection.
-	    Install the driver that matches the video card.</para>
-	</listitem>
-
-	<listitem>
-	  <para>Optimus: currently there is no switching support
-	    between the two graphics adapters provided by Optimus.
-	    Optimus implementations vary, and &os; will not be able to
-	    drive all versions of the hardware.  Some computers
-	    provide a <acronym>BIOS</acronym> option to disable one of
-	    the graphics adapters or select a
-	    <emphasis>discrete</emphasis> mode.</para>
-	</listitem>
-      </itemizedlist>
-    </sect2>
-
-    <sect2>
-      <title>Configuring <application>&xorg;</application></title>
-
-      <para>By default, <application>&xorg;</application> uses
-	<acronym>HAL</acronym> to autodetect keyboards and mice.  The
-	<package>sysutils/hal</package> and
-	<package>devel/dbus</package> ports are automatically
-	installed as dependencies of <package>x11/xorg</package>, but
-	must be enabled by adding these entries to
-	<filename>/etc/rc.conf</filename>:</para>
+    <para>In most cases, <application>&xorg;</application> is
+      self-configuring.  Autoconfiguration is the preferred method,
+      and should be tried first.  When X is started without a
+      configuration file, the video card and input devices are
+      automatically detected and used.  If the system already has a
+      configuration file and you wish to create a new configuration,
+      save a copy of the old one first:</para>
 
-      <programlisting>hald_enable="YES"
-dbus_enable="YES"</programlisting>
+    <screen>&prompt.root; <userinput>mv /etc/X11/xorg.conf ~/xorg.conf.etc</userinput>
+&prompt.root; <userinput>mv /usr/local/etc/X11/xorg.conf ~/xorg.conf.localetc</userinput></screen>
 
-      <para>Start these services before configuring
-	<application>&xorg;</application>:</para>
+    <para>To generate the configuration file and start the X system,
+      issue this command:</para>
 
-      <screen>&prompt.root; <userinput>service hald start</userinput>
-&prompt.root; <userinput>service dbus start</userinput></screen>
+    <screen>&prompt.user; <userinput>startx</userinput></screen>
 
-      <para>Once the services have been started, check whether
-	<application>&xorg;</application> auto-configures itself by
-	typing:</para>
-
-      <screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>
-
-      <para>This will generate a file named
-	<filename>/root/xorg.conf.new</filename> which attempts to
-	load the proper drivers for the detected hardware.  Next, test
-	that the automatically generated configuration file works with
-	the graphics hardware by typing:</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, switch to the
-	virtual console used to start it by pressing <keycombo
-	  action="simul"> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
-	  <keycap>F<replaceable>n</replaceable></keycap> </keycombo>
+    <para>If a black and grey grid and an X mouse cursor appear, the
+      configuration was successful.  Test the system by moving the
+      mouse and typing text into the windows.  To exit the test,
+      switch to the virtual console used to start it by pressing
+      <keycombo action="simul"> <keycap>Ctrl</keycap>
+	<keycap>Alt</keycap>
+	<keycap>F<replaceable>n</replaceable></keycap> </keycombo>
 	(<keycap>F1</keycap> for the first virtual console) and press
 	<keycombo action="simul"> <keycap>Ctrl</keycap>
 	  <keycap>C</keycap> </keycombo>.</para>
 
+    <para>If the mouse or keyboard do not work, continue with <xref
+	linkend="x11-understanding"/>.</para>
+
+    <para>Desktop environments like <application>GNOME</application>,
+      <application>KDE</application> or
+      <application>Xfce</application> provide graphical tools to set
+      parameters such as video resolution.  If the default
+      configuration works, skip to <xref linkend="x11-wm"/> for
+      examples on how to install a desktop environment.</para>
+
       <note>
 	<para>The <keycombo action="simul">
 	    <keycap>Ctrl</keycap>
@@ -496,9 +348,6 @@
   &lt;/device&gt;
 &lt;/deviceinfo&gt;</programlisting>
 
-	<para>You will have to reboot your machine to force
-	  <application>hald</application> to read this file.</para>
-
 	<para>The following line will also have to be added to
 	  <filename>xorg.conf.new</filename>, in the
 	  <literal>ServerLayout</literal> or
@@ -507,22 +356,43 @@
 	<programlisting>Option	"DontZap"	"off"</programlisting>
       </note>
 
-      <para>If the test is unsuccessful, skip ahead to <xref
-	  linkend="x11-understanding"/>.  Once the test is successful,
-	copy the configuration file to
-	<filename>/etc/X11/xorg.conf</filename>:</para>
+    <sect2>
+      <title>Caveats</title>
 
-	<screen>&prompt.root; <userinput>cp xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
+      <para>The ability to configure optimal resolution is dependent
+	upon the video hardware and the support provided by its
+	driver.  At this time, driver support includes:</para>
 
-      <note>
-	<para>Desktop environments like
-	  <application>GNOME</application>,
-	  <application>KDE</application> or
-	  <application>Xfce</application> provide graphical tools to
-	  set parameters such as video resolution.  If the default
-	  configuration works, skip to <xref linkend="x11-wm"/> for
-	  examples on how to install a desktop environment.</para>
-      </note>
+      <itemizedlist>
+	<listitem>
+	  <para>Intel: as of &os;&nbsp;9.3 and &os;&nbsp;10.1, 3D
+	    acceleration on most Intel graphics, including IronLake,
+	    SandyBridge, and IvyBridge, is supported.  Support for
+	    switching between X and virtual consoles is provided by
+	    &man.vt.4;.</para>
+	</listitem>
+
+	<listitem>
+	  <para>ATI/Radeon: 2D and 3D acceleration is supported on
+	    most Radeon cards up to the HD6000 series.</para>
+	</listitem>
+
+	<listitem>
+	  <para>NVIDIA: several NVIDIA drivers are available in the
+	    <filename>x11</filename> category of the Ports Collection.
+	    Install the driver that matches the video card.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Optimus: currently there is no switching support
+	    between the two graphics adapters provided by Optimus.
+	    Optimus implementations vary, and &os; will not be able to
+	    drive all versions of the hardware.  Some computers
+	    provide a <acronym>BIOS</acronym> option to disable one of
+	    the graphics adapters or select a
+	    <emphasis>discrete</emphasis> mode.</para>
+	</listitem>
+      </itemizedlist>
     </sect2>
   </sect1>