- Various SGML fixes;

- s/Gnome/GNOME

en_US.ISO8859-1/articles/compiz-fusion/article.sgml

@@ -153,7 +153,7 @@
 
       <para>The driver will create a kernel module, which should be loaded
 	at system startup.  You will need to add the following line to the
-	<filename>/boot/loader.conf</filename> file:
+	<filename>/boot/loader.conf</filename> file:</para>
 
       <programlisting>nvidia_load="YES"</programlisting>
 
@@ -263,9 +263,9 @@ Load           "glx"
 	  you should be able to perform most of the above settings by
           entering the following commands (as root):</para>
 	
-	<screen>&prompt.root; nvidia-xconfig --add-argb-glx-visuals
-&prompt.root; nvidia-xconfig --composite
-&prompt.root; nvidia-xconfig --depth=24</screen>
+	<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>
 
         <para>You may wish to run <command>nvidia-xonfig -A |more</command>
           to see a list of all the options offered by the above
@@ -278,12 +278,12 @@ Load           "glx"
     <para>Installing <application>Compiz&nbsp;Fusion</application>
       is as simple as any other port:</para>
 
-    <screen>&prompt.root; cd /usr/ports/x11-wm/compiz-fusion
-&prompt.root; make install clean</screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/compiz-fusion</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
 
     <para>Make sure to select the <quote>EXTRA</quote> plugins and the
       <quote>EMERALD</quote> window decorator from the options dialog that
-      appears.  If you are using <application>Gnome</application>, or
+      appears.  If you are using <application>GNOME</application>, or
       already have support for <command>gconf</command> in your system, you
       may also wish to select <quote>gconf support</quote>.  In this way,
       your effect settings will be integrated with the other desktop settings,
@@ -297,8 +297,8 @@ Load           "glx"
     <para>When the installation is finished, start your graphic desktop and
       at a terminal, enter the following commands (as a normal user):</para>
 
-    <screen>compiz --replace --sm-disable --ignore-desktop-hints ccp &
-emerald --replace &</screen>
+    <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &</userinput>
+&prompt.user; <userinput>emerald --replace &</userinput></screen>
 
     <para>Your screen will flicker for a few seconds, as your window manager
       (e.g. <application>Metacity</application> if you are using
@@ -319,7 +319,7 @@ emerald --replace &</programlisting>
     <para>Save this in your home directory as, for example,
       <filename>start-compiz</filename> and make it executable:</para>
 
-    <screen>chmod +x ~/start-compiz</screen>
+    <screen>&prompt.user; <userinput>chmod +x ~/start-compiz</userinput></screen>
 
     <para>Then use the GUI to add it to
       <guimenuitem>Startup Programs</guimenuitem>
@@ -332,7 +332,7 @@ emerald --replace &</programlisting>
       execute (again as a normal user) the
       <application>Compiz&nbsp;Config&nbsp;Settings&nbsp;Manager</application>:</para>
 
-    <screen>ccsm</screen>
+    <screen>&prompt.user; <userinput>ccsm</userinput></screen>
 
     <note>
       <para>In <application>GNOME</application>, this can also be found in
@@ -365,8 +365,8 @@ emerald --replace &</programlisting>
 	  <answer>
 	    <para>You are probably missing a setting in
 	      <filename>/etc/X11/xorg.conf</filename>.  Review this file
-	      carefully and check especially the DefaultDepth and
-	      AddARGBGLXVisuals directives.</para>
+	      carefully and check especially the <literal>DefaultDepth</literal> and
+	      <literal>AddARGBGLXVisuals</literal> directives.</para>
 	  </answer>
 	</qandaentry>