--- openbox_1.2.xml	2009-08-24 18:55:12.505531059 -0500
+++ ../devspace/documentation/openbox_1.41.xml	2009-08-24 18:57:43.766781265 -0500
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/openbox.xml,v 1.4 2009/08/13 19:54:27 robbat2 Exp $ -->
 
 <guide>
 <title>The Openbox Configuration HOWTO</title>
@@ -21,8 +20,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.2</version>
-<date>2009-06-27</date>
+<version>1.4</version>
+<date>2009-08-13</date>
 
 <chapter>
 <title>Introduction</title>
@@ -56,7 +55,7 @@
 very quickly, even on older hardware. Whether your hardware is old or new,
 Openbox also provides a highly customisable and unobtrusive working
 environment. That means that if you don't want or need a panel, taskbar, clock,
-or any other program, those choices are yours!
+or any other program, those choices are yours to make!
 </p>
 
 </body>
@@ -166,11 +165,11 @@
 The generated menu will be located at
 <path>~/.config/openbox/menu.xml</path>. You can then choose to leave it as 
 your user-specific <path>menu.xml</path>, or to additionally copy it to the 
-system-wide menu configuration as well:
+system-wide menu configuration as well (you must again become root to do so):
 </p>
 
 <pre caption="Overwriting the default system-wide menu.xml files">
-$ <i>cp .config/openbox/menu.xml /etc/xdg/openbox/menu.xml</i>
+# <i>cp .config/openbox/menu.xml /etc/xdg/openbox/menu.xml</i>
 </pre>
 
 <impo>
@@ -188,13 +187,12 @@
 </p>
 
 <pre caption="Editing the menu.xml file">
-&lt;?xml version="1.0" encoding="UTF-8"?7gt;
+&lt;?xml version="1.0" encoding="UTF-8"?gt;
 &lt;openbox_menu&gt;
 &lt;separator label="NAME_OF_SEPARATOR" /&gt;
 &lt;menu id="IDENTIFIER" label="NAME_OF_MENU"&gt;
   &lt;item label="NAME_OF_PROGRAM"&gt;
-    &lt;action
-    name="execute"&gt;&lt;execute&gt;/LOCATION/OF/BINARY&lt;/execute&gt;&lt;/action&gt;
+    &lt;action name="execute"&gt;&lt;execute&gt;/LOCATION/OF/BINARY&lt;/execute&gt;&lt;/action&gt;
   &lt;/item&gt;
 &lt;/menu&gt;
 &lt;/openbox_menu&gt;
@@ -261,11 +259,11 @@
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;openbox_menu&gt;
 &lt;menu id="1" label="Configuration"&gt;
-  &lt;item label="OpenBox Config&gt;
+  &lt;item label="OpenBox Config"&gt;
     &lt;action name="execute"&gt;&lt;execute&gt;/usr/bin/obconf&lt;/execute&gt;&lt;/action&gt;
   &lt;/item&gt;
 &lt;/menu&gt;
-&lt;/openbox_menu>&gt;
+&lt;/openbox_menu&gt;
 </pre>
 
 </body>
@@ -311,7 +309,8 @@
 <p>
 Adding your own programs to the <path>autostart.sh</path> script is as easy as
 writing in the program name for many applications. For instance, if you have
-Conky (a lightweight system monitor) installed, and want it to start
+<uri link="http://packages.gentoo.org/package/app-admin/conky">Conky</uri> 
+(a lightweight system monitor) installed, and want it to start
 automatically with your Openbox session, you simply add the following line to
 your <path>autostart.sh</path>:
 </p>
@@ -338,10 +337,12 @@
 Some things that you might take for granted in bigger desktop environments are
 not included by default in Openbox. One such thing is setting your desktop
 background. In order to place an image as your wallpaper, you will need to
-emerge a program like feh or nitrogen. Feh is a simple image viewer that can
-also set the background, <e>and</e> it can easily be put into the autostart
-script. Once you have emerged feh, you can issue the following command to set
-the background:
+emerge a program like 
+<uri link="http://packages.gentoo.org/package/media-gfx/feh">feh</uri> or 
+<uri link="http://packages.gentoo.org/package/x11-misc/nitrogen">nitrogen</uri>. 
+Feh is a simple image viewer that can also set the background, <e>and</e> it 
+can easily be put into the autostart script. Once you have emerged feh, you 
+can issue the following command to set the background:
 </p>
 
 <pre caption="Using feh to set the background image">
@@ -374,10 +375,7 @@
 <p>
 Installing nitrogen and getting it into your Openbox menu requires a few more
 steps than are readily apparent. Firstly, and most obviously, you need to
-<c>emerge nitrogen</c>. Due to <uri
-link="http://bugs.gentoo.org/show_bug.cgi?id=267231">this library dependency
-bug</uri>, you may also need to <c>emerge --oneshot librsvg</c> to avoid a
-runtime termination error. Secondly, you need to run nitrogen with your
+<c>emerge nitrogen</c>. Secondly, you need to run nitrogen with your
 backgrounds folder appended:
 </p>
 
@@ -468,7 +466,7 @@
     link="http://packages.gentoo.org/package/x11-terms/terminal">Terminal</uri>
     is the VTE-based default for the Xfce desktop environment, so it does
     require some Xfce libraries to run. However, it is still fairly speedy, and
-    supports transparency and is easily customized.
+    supports transparency and is easily customised.
   </li>
 </ul>
 
@@ -504,7 +502,7 @@
     is the powerful file manager from the GNOME desktop environment. It features
     volume management, thumbnails for images, searching, and some system
     configuration. As it depends on many of the GNOME libraries for proper
-    function, it can seem a heavy compared to some of the other file managers.
+    function, it can seem a bit heavy compared to some of the other file managers.
   </li>
   <li>
     <uri link="http://packages.gentoo.org/package/app-misc/gentoo">Gentoo</uri>