X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=doc%2Fopenbox.1.sgml;h=70766ba468f9f3b4ba7e3c1bdf70f544fabb0c9f;hb=b74cff0302e70d702e958a8205a6f6e2e2858192;hp=1cce5545d1465eeca6df6e7e60bda9bf02ffded4;hpb=5d85502e3b12ae2301b28d624d7fa60a66f646bb;p=chaz%2Fopenbox

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 1cce5545..70766ba4 100644
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -63,20 +63,31 @@ manpage.1: manpage.sgml
       within GNOME or KDE, you can choose the appropriate entry, and it will
       launch GNOME or KDE with Openbox as the window manager.</para>
 
-    <para>If you don't want to run Openbox within a desktop environment, then
-      it is recommended that you instead set up a ~/.xsession file and
-      use the <command>Default</command> session type. The ~/.xsession file
-      should start any applications you want to run at startup, and then run
-      <command>&dhpackage;</command> at the end, such as:</para>
+    <para>The third option at log in, which is <command>Openbox</command>
+      without a session manager, uses the <command>openbox-session</command>
+      command to start Openbox. On log in, <command>&dhpackage;</command> will
+      run the ~/.config/openbox/autostart.sh script if it exists, and will run
+      the system-wide script @configdir@/openbox/autostart.sh otherwise. You
+      may place anything you want to run automatically in those files, for
+      example:
+      </para>
 
-      <blockquote><literallayout>
+    <blockquote><literallayout>
       xsetroot -solid grey &
-      gnome-settings-daemon &
-      exec <command>&dhpackage;</command></literallayout></blockquote>
+      gnome-settings-daemon &</literallayout></blockquote>
+
+    <para>Make sure that each line is followed by a "&" or else the script will
+      stop there and further commands will not be executed. You can use the
+      @configdir@/openbox/autostart.sh file as an example for creating your
+      own.</para>
+
+    <para>The default @configdir@/openbox/autostart.sh runs a number of things
+      with Openbox.</para>
 
     <para>Lastly, if you use <command>startx</command> to launch your X
-      session, you should set up a ~/.xinitrc file, exactly the same as the
-      above ~/.xsession file.</para>
+      session, you can set up a ~/.xinitrc file to run
+      <command>openbox-session</command> and follow the same directions as
+      above regarding the autostart.sh file.</para>
 
     <para>You can use the <command>obconf</command> tool to configure Openbox
       easily with a graphical interface, however more in-depth configuration
@@ -84,9 +95,9 @@ manpage.1: manpage.sgml
       <command>obconf</command> older than version 2.0 may not work at all
       for you.</para>
 
-    <para>The default configuration files are installed in
-      @configdir@/openbox/rc.xml, and the user configuration is placed in
-      ~/.config/openbox/rc.xml. You can copy the default configuration
+    <para>The default configuration and menu files are installed in
+      @configdir@/openbox/, and the user configuration is placed in
+      ~/.config/openbox/. You can copy the default configuration and menus
       to ~/.config/openbox and edit it to your liking.</para>
   </refsect1>
   <refsect1>