X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=doc%2Fopenbox.1.sgml;h=b173655414ce21bbbd55b8034ded7b4ec11aae6d;hb=db750e5cb03b0507a268f5581fc952b5214cf846;hp=04ce70829b3703163eaac96daccfb45e09f2cd32;hpb=02f6e4509eef69883bce2de1f316983a5d94326f;p=chaz%2Fopenbox

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 04ce7082..b1736554 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,10 +63,10 @@ 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
+    <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 any applications you want to run at startup, and then run
+      should start any applications you want to run at startup, and then run
       <command>&dhpackage;</command> at the end, such as:</para>
 
       <blockquote><literallayout>
@@ -80,11 +80,21 @@ manpage.1: manpage.sgml
 
     <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 @confdir@/xdg/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 files are installed in
+      @configdir@/openbox/, and the user configuration is placed in
+      ~/.config/openbox/. You can copy the default configuration
+      to ~/.config/openbox and edit it to your liking.</para>
+
+    <para>There are 3 default configuration files, <literal>rc.xml</literal>,
+      <literal>rc-gnome.xml</literal>, and <literal>rc-kde.xml</literal>. The
+      rc-gnome.xml is used when you run
+      <command>openbox-gnome-session</command> and the rc-kde.xml is used when
+      you run <command>openbox-kde-session</command>. The configuration
+      files should be named the same in ~/.config/openbox/.</para>
 
   </refsect1>
   <refsect1>
@@ -114,7 +124,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 +133,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 +151,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>
@@ -156,10 +168,10 @@ manpage.1: manpage.sgml
       </para>
 
     <para>The program's full documentation is available on the website:
-      <olink>http://openbox.org/</olink></para>
+      <literal>http://openbox.org/</literal></para>
 
-    <para>Please report bugs to: <olink>http://bugzilla.icculus.org/</olink>
-      </para>
+    <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
+      </literal></para>
   </refsect1>
 </refentry>