X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=doc%2Fopenbox.1.in;h=ebf256bd015ec20942aae2776e8fe54de4cc097c;hb=db750e5cb03b0507a268f5581fc952b5214cf846;hp=a4b6d6f5340547204fb9c4e07238c275f674d817;hpb=6968c5927b968ab187796b2cc40e4fd052397a18;p=chaz%2Fopenbox

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index a4b6d6f5..ebf256bd 100644
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -4,7 +4,7 @@ openbox \(em Next generation, highly configurable window manager
  
 .SH "SYNOPSIS" 
 .PP 
-\fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-version\fP]  [\fB\-\-replace\fP]  [\fB\-\-reconfigure\fP]  [\fB\-\-sm-disable\fP]  [\fB\-\-config \fITYPE\fR\fP]  [\fB\-\-sync\fP]  [\fB\-\-debug\fP]  [\fB\-\-debug-focus\fP]  
+\fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-version\fP]  [\fB\-\-replace\fP]  [\fB\-\-reconfigure\fP]  [\fB\-\-sm-disable\fP]  [\fB\-\-sync\fP]  [\fB\-\-debug\fP]  [\fB\-\-debug-focus\fP]  [\fB\-\-debug-xinerama\fP]  
 .SH "DESCRIPTION" 
 .PP 
 Openbox is a next generation, highly 
@@ -19,10 +19,10 @@ in the login session type menu for Openbox:
 within GNOME or KDE, you can choose the appropriate entry, and it will 
 launch GNOME or KDE with Openbox as the window manager. 
 .PP 
-If you don't want to run Openbox withing a desktop environment, then 
+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 \fBDefault\fR 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 
 \fBopenbox\fR at the end, such as: 
 .PP 
 .RS 
@@ -40,11 +40,21 @@ above ~/.xsession file.
 .PP 
 You can use the \fBobconf\fR 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. 
+is possible by editing the configuration files by hand. Please note that 
+\fBobconf\fR older than version 2.0 may not work at all 
+for you. 
+.PP 
+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. 
+.PP 
+There are 3 default configuration files, \fBrc.xml\fP, 
+\fBrc-gnome.xml\fP, and \fBrc-kde.xml\fP. The 
+rc-gnome.xml is used when you run 
+\fBopenbox-gnome-session\fR and the rc-kde.xml is used when 
+you run \fBopenbox-kde-session\fR. The configuration 
+files should be named the same in ~/.config/openbox/. 
 .SH "OPTIONS" 
 .PP 
 These are the possible options that \fBopenbox\fR accepts: 
@@ -56,17 +66,19 @@ Show the version of the program.
 Replace the currently running window manager. 
 .IP "\fB\-\-reconfigure\fP" 10 
 If Openbox is already running on the display, tell it to 
-reload it's configuration. 
+reload its configuration. 
 .IP "\fB\-\-sm-disable\fP" 10 
 Do not connect to the session manager. 
-.IP "\fB\-\-config\fITYPE\fR\fP" 10 
-Specify the configuration profile to use. 
 .IP "\fB\-\-sync\fP" 10 
 Run in synchronous mode (for debugging). 
 .IP "\fB\-\-debug\fP" 10 
 Display debugging output. 
 .IP "\fB\-\-debug-focus\fP" 10 
 Display debugging output for focus handling. 
+.IP "\fB\-\-debug-xinerama\fP" 10 
+Split the display into two fake xinerama regions, if 
+xinerama is not already enabled. This is for debugging 
+xinerama support. 
 .SH "SEE ALSO" 
 .PP 
 obconf (1), openbox-gnome-session (1), openbox-kde-session (1). 
@@ -77,4 +89,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Sun 13 May 2007, 18:06 
+.\" created by instant / docbook-to-man, Sun 13 May 2007, 20:34