Index: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1651,7 +1651,7 @@
 
       <programlisting>Section "Extensions"
     Option         "Composite" "Enable"
-    EndSection</programlisting>
+EndSection</programlisting>
 
       <para>Locate the <quote>Screen</quote> section which should look
 	similar to the one below:</para>
@@ -1666,7 +1666,7 @@
 	<quote>Monitor</quote> will do):</para>
 
       <programlisting>DefaultDepth    24
-    Option         "AddARGBGLXVisuals" "True"</programlisting>
+Option         "AddARGBGLXVisuals" "True"</programlisting>
 
       <para>Locate the <quote>Subsection</quote> that refers to the
 	screen resolution that you wish to use.  For example, if you
@@ -1677,7 +1677,7 @@
       <programlisting>SubSection     "Display"
     Viewport    0 0
     Modes      "1280x1024"
-    EndSubSection</programlisting>
+EndSubSection</programlisting>
 
       <para>A color depth of 24&nbsp;bits is needed for desktop
 	composition, change the above subsection to:</para>
@@ -1686,7 +1686,7 @@
     Viewport    0 0
     Depth       24
     Modes      "1280x1024"
-    EndSubSection</programlisting>
+EndSubSection</programlisting>
 
       <para>Finally, confirm that the <quote>glx</quote> and
 	<quote>extmod</quote> modules are loaded in the
@@ -1702,8 +1702,8 @@
 	root):</para>
 
       <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput>
-    &prompt.root; <userinput>nvidia-xconfig --composite</userinput>
-    &prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen>
+&prompt.root; <userinput>nvidia-xconfig --composite</userinput>
+&prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen>
     </sect2>
 
     <sect2 xml:id="compiz-fusion">
@@ -1719,7 +1719,7 @@
 	normal user):</para>
 
       <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &amp;</userinput>
-    &prompt.user; <userinput>emerald --replace &amp;</userinput></screen>
+&prompt.user; <userinput>emerald --replace &amp;</userinput></screen>
 
       <para>Your screen will flicker for a few seconds, as your window
 	manager (e.g. <application>Metacity</application> if you are
@@ -1735,8 +1735,8 @@
 	desktop):</para>
 
       <programlisting>#! /bin/sh
-    compiz --replace --sm-disable --ignore-desktop-hints ccp &amp;
-    emerald --replace &amp;</programlisting>
+compiz --replace --sm-disable --ignore-desktop-hints ccp &amp;
+emerald --replace &amp;</programlisting>
 
       <para>Save this in your home directory as, for example,
 	<filename>start-compiz</filename> and make it
@@ -2088,10 +2088,10 @@
 		startup.  The most common would be:</para>
 
 	      <screen>(EE) NVIDIA(0):     Failed to initialize the GLX module; please check in your X
-    (EE) NVIDIA(0):     log file that the GLX module has been loaded in your X
-    (EE) NVIDIA(0):     server, and that the module is the NVIDIA GLX module.  If
-    (EE) NVIDIA(0):     you continue to encounter problems, Please try
-    (EE) NVIDIA(0):     reinstalling the NVIDIA driver.</screen>
+(EE) NVIDIA(0):     log file that the GLX module has been loaded in your X
+(EE) NVIDIA(0):     server, and that the module is the NVIDIA GLX module.  If
+(EE) NVIDIA(0):     you continue to encounter problems, Please try
+(EE) NVIDIA(0):     reinstalling the NVIDIA driver.</screen>
 
 	    <para>This is usually the case when you upgrade
 	      <application>&xorg;</application>.  You will need to