Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
+++ x/wm/openbox.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -72,10 +72,11 @@
     <para role="required">
       <xref linkend="x-window-system"/> and
-      <xref linkend="pango"/> (compiled with support for libXft).
+      <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).
+      <xref linkend="imlib2"/> (to enable icons in the right click menu) and
+      <ulink url="http://freedesktop.org/wiki/Software/pyxdg">PyXDG</ulink>
     </para>
 
@@ -99,6 +100,9 @@
     </para>
 
-<screen><userinput>./configure -&#45;prefix=/usr -&#45;sysconfdir=/etc -&#45;disable-static \
-  -&#45;docdir=/usr/share/doc/openbox-&openbox-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                         /
+            --libexecdir=/usr/lib/openbox         /
+            --sysconfdir=/etc                     /
+            --docdir=/usr/share/doc/openbox-&openbox-version; /
+            --disable-static                      &amp;&amp;
 make</userinput></screen>
 
@@ -118,5 +122,5 @@
 
     <para>
-      <option>-&#45;sysconfdir=/etc</option>: This option puts
+      <option>--sysconfdir=/etc</option>: This option puts
       <application>Openbox</application>'s configuration files in
       /etc/xdg/openbox instead of /usr/etc/xdg/openbox.
@@ -124,13 +128,12 @@
 
     <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>:
+      <option>--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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -142,7 +145,11 @@
 
       <para>
-        /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
-        ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
-      </para>
+        /etc/xdg/openbox/autostart, /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
+        ~/.config/openbox/autostart, ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
+      </para>
+
+      <indexterm zone="openbox openbox-config">
+        <primary sortas="e-AA.autostart">~/.config/openbox/autostart</primary>
+      </indexterm>
 
       <indexterm zone="openbox openbox-config">
@@ -152,4 +159,8 @@
       <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-autostart">/etc/xdg/openbox/autostart</primary>
       </indexterm>
 
@@ -227,8 +238,8 @@
       </para>
 
-<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
-display -backdrop -window root /path/to/beautiful/picture.jpeg
-exec openbox
-HERE_DOC</userinput></screen>
+<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<literal>display -backdrop -window root /path/to/beautiful/picture.jpeg
+exec openbox</literal>
+EOF</userinput></screen>
 
       <para>
@@ -238,6 +249,6 @@
       </para>
 
-<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
-# make an array which lists the pictures:
+<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<literal># make an array which lists the pictures:
 picture_list=(~/.config/backgrounds/*)
 # create a random integer between 0 and the number of pictures:
@@ -245,6 +256,6 @@
 # display the chosen picture:
 display -backdrop -window root "${picture_list[${random_number}]}"
-exec openbox
-HERE_DOC</userinput></screen>
+exec openbox</literal>
+EOF</userinput></screen>
 
       <para>
@@ -255,6 +266,6 @@
       </para>
 
-<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
-. /etc/profile
+<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<literal>. /etc/profile
 picture_list=(~/.config/backgrounds/*)
 random_number=$(( ${RANDOM} % ${#picture_list[*]} ))
@@ -263,6 +274,6 @@
 eval $(dbus-launch --auto-syntax --exit-with-session)
 lxpanel &amp;
-exec openbox
-HERE_DOC</userinput></screen>
+exec openbox</literal>
+EOF</userinput></screen>
     </sect3>
   </sect2>
@@ -278,6 +289,7 @@
       <seglistitem>
         <seg>
-          gdm-control, gnome-panel-control, obxprop, openbox,
-          openbox-gnome-session, openbox-kde-session and openbox-session
+          gdm-control, gnome-panel-control, obxprop, openbox, openbox-autostart,
+          openbox-gnome-session, openbox-kde-session, openbox-session and
+          openbox-xdg-autostart
         </seg>
         <seg>
@@ -349,4 +361,28 @@
       </varlistentry>
 
+      <varlistentry id="openbox-autostart">
+        <term><command>openbox-autostart</command></term>
+        <listitem>
+          <para>
+            is a script that runs commands and applications at Openbox startup.
+          </para>
+          <indexterm zone="openbox openbox-autostart">
+            <primary sortas="b-openbox-autostart">openbox-autostart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-xdg-autostart">
+        <term><command>openbox-xdg-autostart</command></term>
+        <listitem>
+          <para>
+            is a script that runs xdg autostart .desktop files.
+          </para>
+          <indexterm zone="openbox openbox-xdg-autostart">
+            <primary sortas="b-openbox-xdg-autostart">openbox-xdg-autostart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="openbox-gnome-session">
         <term><command>openbox-gnome-session</command></term>
@@ -354,6 +390,6 @@
           <para>
             is a script to launch an <application>Gnome</application> session
-            with openbox as your window manager from your
-            <filename>~/.xinitrc</filename>.
+            with <application>Openbox</application> as your window manager from
+            your <filename>~/.xinitrc</filename>.
           </para>
           <indexterm zone="openbox openbox-gnome-session">
