Index: general.ent
===================================================================
--- general.ent	(revision 383811b90c1a9f9887ae04ecf27d55052291e662)
+++ general.ent	(revision ebf1fa3f819ec6467bb932e7a1fda1d8f42a6b5d)
@@ -625,6 +625,7 @@
 
 <!-- Chapter 25 -->
+<!ENTITY fluxbox-version              "1.3.2">
+<!ENTITY openbox-version              "3.5.0">
 <!ENTITY sawfish-version              "1.6.1">
-<!ENTITY fluxbox-version              "1.3.2">
 
 <!-- Unmaintained
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 383811b90c1a9f9887ae04ecf27d55052291e662)
+++ introduction/welcome/changelog.xml	(revision ebf1fa3f819ec6467bb932e7a1fda1d8f42a6b5d)
@@ -48,4 +48,7 @@
           <para>[ken] - added rygel-0.12.5 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - added Openbox 3.5.0.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision ebf1fa3f819ec6467bb932e7a1fda1d8f42a6b5d)
+++ x/wm/openbox.xml	(revision ebf1fa3f819ec6467bb932e7a1fda1d8f42a6b5d)
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY openbox-download-http
+  "http://openbox.org/dist/openbox/openbox-&openbox-version;.tar.gz">
+  <!ENTITY openbox-download-ftp  " ">
+  <!ENTITY openbox-md5sum        "00441b53cf14c03566c8e82643544ff9">
+  <!ENTITY openbox-size          "9 MB">
+  <!ENTITY openbox-buildsize     "18 MB">
+  <!ENTITY openbox-time          "0.3 SBU">
+]>
+
+<sect1 id="openbox" xreflabel="openbox-&openbox-version;">
+  <?dbhtml filename="openbox.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>openbox-&openbox-version;</title>
+
+  <indexterm zone="openbox">
+    <primary sortas="a-openbox">Openbox</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to openbox</title>
+
+    <para>
+      <application>Openbox</application> is a highly configurable desktop
+      window manager with extensive standards support. It allows you to control
+      almost every aspect of how you interact with your desktop.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&openbox-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &openbox-md5sum;
+      </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &openbox-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &openbox-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &openbox-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Openbox Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="pkgconfig"/>, 
+      <xref linkend="x-window-system"/> and
+      <xref linkend="pango"/> (compiled with support for libXft).
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="imlib2"/> (to enable icons in the right click menu).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/openbox"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Openbox</title>
+
+    <para>
+      Install <application>Openbox</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure -&#45;prefix=/usr -&#45;sysconfdir=/etc -&#45;disable-static \
+  -&#45;docdir=/usr/share/doc/openbox-&openbox-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>-&#45;sysconfdir=/etc</option>: This option puts
+      <application>Openbox</application>'s configuration files in
+      /etc/xdg/openbox instead of /usr/etc/xdg/openbox.
+    </para>
+
+    <para>
+      <option>-&#45;disable-static</option>: This option stops it compiling
+      static versions of the libraries.
+    </para>
+
+    <para>
+      <option>-&#45;docdir=/usr/share/doc/openbox-&openbox-version;</option>:
+      this puts a few files in a versioned directory in
+      <filename class="directory">/usr/share/doc</filename>.
+    </para>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Openbox</title>
+
+    <sect3 id="openbox-config">
+      <title>Config Files</title>
+      <para>In ~/.config/openbox and /etc/xdg/openbox,
+      <filename>menu.xml</filename> and <filename>rc.xml</filename></para>
+
+      <indexterm zone="openbox openbox-config">
+        <primary sortas="e-AA.menu">~/.config/openbox/menu.xml</primary>
+      </indexterm>
+
+      <indexterm zone="openbox openbox-config">
+        <primary sortas="e-AA.rc">~/.config/openbox/rc.xml</primary>
+      </indexterm>
+
+      <indexterm zone="openbox openbox-config">
+        <primary sortas="e-etc-path-menu">/etc/xdg/openbox/menu.xml</primary>
+      </indexterm>
+
+      <indexterm zone="openbox openbox-config">
+        <primary sortas="e-etc-path-rc">/etc/xdg/openbox/rc.xml</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>
+        <application>Openbox</application>'s right click menu is used to launch
+        programs. The menu itself is configured with 2 files,
+        <filename>/etc/xdg/openbox/menu.xml</filename> and
+        <filename>~/.config/openbox/menu.xml</filename>. If
+        <filename>~/.config/openbox/menu.xml</filename> doesn't exist then
+        <application>Openbox</application> will copy
+        <filename>/etc/xdg/openbox/menu.xml</filename> to
+        <filename>~/.config/openbox/menu.xml</filename> when it is launched.
+      </para>
+
+      <para>
+        <filename>~/.config/openbox/menu.xml</filename> can be edited with a
+        text editor or you can install
+        <ulink url="http://obmenu.sourceforge.net/">Obmenu</ulink> (requires
+        <xref linkend="python2"/>, <application>PyXML</application> and
+        <application>PyGTK</application>).
+      </para>
+
+      <para>
+        Many other aspects of <application>Openbox</application>'s behaviour are
+        configured with <filename>~/.config/openbox/rc.xml</filename> such as
+        what keybindings are used to launch programs or which mouse button
+        launches the main menu.
+      </para>
+
+      <para>
+        Details of the theme that <application>Openbox</application> applies to
+        window decorations are configured in
+        <filename>~/.config/openbox/rc.xml</filename>. You can get a list of the
+        available themes with the command:
+      </para>
+
+<screen role="user"><userinput>ls -d /usr/share/themes/*/openbox-3 | sed 's#.*es/##;s#/o.*##'</userinput></screen>
+    </sect3>
+
+    <sect3  id="openbox-init">
+      <title>Starting Openbox</title>
+
+      <para>
+        To automatically start <command>openbox</command> when you start
+        <application>Xorg</application>:
+      </para>
+
+<screen role="user"><userinput>echo openbox &gt; ~/.xinitrc</userinput></screen>
+
+      <para>
+        Alternatively, use the <command>openbox-session</command> script to
+        launch <command>openbox</command>. It runs another script,
+        <filename>~/.config/openbox/autostart</filename> and if that doesn't
+        exist it runs <filename>/etc/xdg/openbox/autostart</filename>. You can
+        create <filename>~/.config/openbox/autostart</filename> and edit it to
+        start any other programs you want running during your
+        <application>Openbox</application> session (eg, a panel or Dbus).
+      </para>
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gdm-control, gnome-panel-control, obxprop, openbox,
+          openbox-gnome-session, openbox-kde-session and openbox-session
+        </seg>
+        <seg>
+          libobrender.so and libobt.so
+        </seg>
+        <seg>
+          /etc/xdg/openbox, /usr/include/openbox,
+          /usr/share/doc/openbox-&openbox-version; and /usr/share/themes.
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gdm-control">
+        <term><command>gdm-control</command></term>
+        <listitem>
+          <para>
+            is a command line tool to send signals to
+            <application>GDM</application>.
+          </para>
+          <indexterm zone="openbox gdm-control">
+            <primary sortas="b-gdm-control">gdm-control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-panel-control">
+        <term><command>gnome-panel-control</command></term>
+        <listitem>
+          <para>
+            is a command line utility to invoke the <application>Gnome
+            Panel</application> run dialog/menu.
+          </para>
+          <indexterm zone="openbox gnome-panel-control">
+            <primary
+            sortas="b-gnome-panel-control">gnome-panel-control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="obxprop">
+        <term><command>obxprop</command></term>
+        <listitem>
+          <para>
+            is a tool for displaying the properties on an x window. It has a
+            similar functionality to <command>xprop</command>, but allows you to
+            see UTF-8 strings as text.
+          </para>
+          <indexterm zone="openbox obxprop">
+            <primary sortas="b-obxprop">obxprop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-prog">
+        <term><command>openbox</command></term>
+        <listitem>
+          <para>
+            is a standards compliant, highly configurable, window manager.
+          </para>
+          <indexterm zone="openbox openbox">
+            <primary sortas="b-openbox">openbox</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-gnome-session">
+        <term><command>openbox-gnome-session</command></term>
+        <listitem>
+          <para>
+            is a script to launch an <application>Gnome</application> session
+            with openbox as your window manager from your
+            <filename>~/.xinitrc</filename>.
+          </para>
+          <indexterm zone="openbox openbox-gnome-session">
+            <primary
+            sortas="b-openbox-gnome-session">openbox-gnome-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-kde-session">
+        <term><command>openbox-kde-session</command></term>
+        <listitem>
+          <para>
+            is a script to launch an <application>KDE</application> session with
+            <application>Openbox</application> as your window manager from your
+            <filename>~/.xinitrc</filename>.
+          </para>
+          <indexterm zone="openbox openbox-kde-session">
+            <primary
+            sortas="b-openbox-kde-session">openbox-kde-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-session">
+        <term><command>openbox-session</command></term>
+        <listitem>
+          <para>
+            is a script to launch an <application>Openbox</application> session
+            from your <filename>~/.xinitrc</filename>.
+          </para>
+          <indexterm zone="openbox openbox-session">
+            <primary sortas="b-openbox-session">openbox-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libobrender">
+        <term><filename class="libraryfile">libobrender.so</filename></term>
+        <listitem>
+          <para>
+            contains the functions used by <application>Openbox</application>
+            for theme rendering.
+          </para>
+          <indexterm zone="openbox libobrender">
+            <primary sortas="c-libobrender">libobrender.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libobt">
+        <term><filename class="libraryfile">libobt.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Openbox</application> toolkit library.
+          </para>
+          <indexterm zone="openbox libobt">
+            <primary sortas="c-libobt">libobt.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision 383811b90c1a9f9887ae04ecf27d55052291e662)
+++ x/wm/wm.xml	(revision ebf1fa3f819ec6467bb932e7a1fda1d8f42a6b5d)
@@ -54,6 +54,7 @@
   </sect1>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openbox.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sawfish.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-wms.xml"/>
