From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 May 2007 23:02:47 +0000 (+0000)
Subject: commit man pages so iit compiles?
X-Git-Tag: openbox-3_3_991-RELEASE~31
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0b56b48ac211a3e5f0c6fa0d7a6fb0613a199e80;p=dana%2Fopenbox.git

commit man pages so iit compiles?
---

diff --git a/doc/openbox-gnome-session.1 b/doc/openbox-gnome-session.1
index d6a5a644..35cd3e10 100644
--- a/doc/openbox-gnome-session.1
+++ b/doc/openbox-gnome-session.1
@@ -16,4 +16,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, Tue 15 May 2007, 11:21 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 19:04 
diff --git a/doc/openbox-kde-session.1 b/doc/openbox-kde-session.1
index 7e18944b..0b248e58 100644
--- a/doc/openbox-kde-session.1
+++ b/doc/openbox-kde-session.1
@@ -16,4 +16,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, Tue 15 May 2007, 11:21 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 19:04 
diff --git a/doc/openbox.1 b/doc/openbox.1
index f3f12c1f..d7296dc0 100644
--- a/doc/openbox.1
+++ b/doc/openbox.1
@@ -19,24 +19,33 @@ 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 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 start any applications you want to run at startup, and then run 
-\fBopenbox\fR at the end, such as: 
+The third option at log in, which is \fBOpenbox\fR       without a session manager, uses the \fBopenbox-session\fR       command to start Openbox. On log in, \fBopenbox\fR will 
+run the ~/.config/openbox/autostart.sh script if it exists, and will run 
+the system-wide script /opt/openbox/etc/xdg/openbox/autostart.sh otherwise. You 
+may place anything you want to run automatically in those files, for 
+example: 
+ 
 .PP 
 .RS 
 .PP 
 .nf 
 xsetroot \-solid grey & 
 gnome-settings-daemon & 
-exec \fBopenbox\fR 
 .fi 
 .RE 
 .PP 
+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 
+/opt/openbox/etc/xdg/openbox/autostart.sh file as an example for creating your 
+own. 
+.PP 
+The default /opt/openbox/etc/xdg/openbox/autostart.sh runs a number of things 
+with Openbox. 
+.PP 
 Lastly, if you use \fBstartx\fR to launch your X 
-session, you should set up a ~/.xinitrc file, exactly the same as the 
-above ~/.xsession file. 
+session, you can set up a ~/.xinitrc file to run 
+\fBopenbox-session\fR and follow the same directions as 
+above regarding the autostart.sh file. 
 .PP 
 You can use the \fBobconf\fR tool to configure Openbox 
 easily with a graphical interface, however more in-depth configuration 
@@ -44,17 +53,10 @@ 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 
+The default configuration and menu files are installed in 
 /opt/openbox/etc/xdg/openbox/, and the user configuration is placed in 
-~/.config/openbox/. You can copy the default configuration 
+~/.config/openbox/. You can copy the default configuration and menus 
 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: 
@@ -89,4 +91,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, 20:35 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 19:04