X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=doc%2Fopenbox.1.sgml;h=70766ba468f9f3b4ba7e3c1bdf70f544fabb0c9f;hb=07a34428c0a03d322e725f315cde64d737967a57;hp=b2b4a8363e0875dbb19b39515cbf0ea0ed54c0f1;hpb=e10dd09e4831c2226a30b0454ff0a7615e590269;p=chaz%2Fopenbox

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index b2b4a836..70766ba4 100644
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -41,10 +41,10 @@ manpage.1: manpage.sgml
       <arg><option>--replace</option></arg>
       <arg><option>--reconfigure</option></arg>
       <arg><option>--sm-disable</option></arg>
-      <arg><option>--config <replaceable>TYPE</replaceable></option></arg>
       <arg><option>--sync</option></arg>
       <arg><option>--debug</option></arg>
       <arg><option>--debug-focus</option></arg>
+      <arg><option>--debug-xinerama</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
@@ -63,29 +63,42 @@ 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 withing 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 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
-      is possible by editing the configuration files by hand. The default
-      configuration file is installed in @configdir@/openbox/rc.xml, and the
-      user configuration is placed in ~/.config/openbox/rc.xml. You can copy
-      the default configuration to ~/.config/openbox and edit it to your
-      liking.</para>
-
+      is possible by editing the configuration files by hand. Please note that
+      <command>obconf</command> older than version 2.0 may not work at all
+      for you.</para>
+
+    <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>
     <title>OPTIONS</title>
@@ -114,7 +127,7 @@ manpage.1: manpage.sgml
         <term><option>--reconfigure</option></term>
         <listitem>
           <para>If Openbox is already running on the display, tell it to
-            reload it's configuration.</para>
+            reload its configuration.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -123,12 +136,6 @@ manpage.1: manpage.sgml
           <para>Do not connect to the session manager.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--config<replaceable>TYPE</replaceable></option></term>
-        <listitem>
-          <para>Specify the configuration profile to use.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--sync</option></term>
         <listitem>
@@ -147,6 +154,14 @@ manpage.1: manpage.sgml
           <para>Display debugging output for focus handling.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--debug-xinerama</option></term>
+        <listitem>
+          <para>Split the display into two fake xinerama regions, if
+	    xinerama is not already enabled. This is for debugging
+	    xinerama support.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>