1
commit c94992179e99f4088f3a1cb8e304a9fb6035170d
2
Author: John Vogel <jvogel4@stny.rr.com>
3
Date: Sat Mar 17 12:33:24 2012 -0400
5
Update manpage to current version. (Fix bug 5444)
7
diff --git a/doc/openbox.1.in b/doc/openbox.1.in
8
index d508e8c..bd3747f 100644
10
+++ b/doc/openbox.1.in
11
@@ -58,11 +58,14 @@ to ~/.config/openbox and edit it to your liking.
13
These are the possible options that \fBopenbox\fR accepts:
14
.IP "\fB\-\-help\fP" 10
15
-Show a summary of the options available.
16
+Show a summary of the command line options available
18
.IP "\fB\-\-version\fP" 10
19
-Show the version of the program.
20
+Show the version of the program and exit.
21
.IP "\fB\-\-replace\fP" 10
22
Replace the currently running window manager.
23
+.IP "\fB\-\-config-file FILE\fP" 10
24
+Specify the path to the config file to use.
25
.IP "\fB\-\-reconfigure\fP" 10
26
If Openbox is already running on the display, tell it to
27
reload its configuration.
28
@@ -70,14 +73,20 @@ reload its configuration.
29
If Openbox is already running on the display, tell it to
30
restart. This is useful if you have upgraded Openbox and don't
32
+.IP "\fB\-\-exit\fP" 10
34
.IP "\fB\-\-sm-disable\fP" 10
35
Do not connect to the session manager.
36
.IP "\fB\-\-sync\fP" 10
37
Run in synchronous mode (for debugging).
38
+.IP "\fB\-\-startup CMD\fP" 10
39
+Run CMD after starting.
40
.IP "\fB\-\-debug\fP" 10
41
Display debugging output.
42
.IP "\fB\-\-debug-focus\fP" 10
43
Display debugging output for focus handling.
44
+.IP "\fB\-\-debug-session\fP" 10
45
+Display debugging output for session management.
46
.IP "\fB\-\-debug-xinerama\fP" 10
47
Split the display into two fake xinerama regions, if
48
xinerama is not already enabled. This is for debugging
49
@@ -92,4 +101,4 @@ The program's full documentation is available on the website:
51
Please report bugs to: \fBhttp://bugzilla.icculus.org/
53
-.\" created by instant / docbook-to-man, Wed 06 Jan 2010, 13:40
54
+.\" created by instant / docbook-to-man, Sun 30 Sep 2012, 17:58
55
diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
56
index 275c324..281f2a0 100644
57
--- a/doc/openbox.1.sgml
58
+++ b/doc/openbox.1.sgml
59
@@ -106,13 +106,14 @@ manpage.1: manpage.sgml
61
<term><option>--help</option></term>
63
- <para>Show a summary of the options available.</para>
64
+ <para>Show a summary of the command line options available
69
<term><option>--version</option></term>
71
- <para>Show the version of the program.</para>
72
+ <para>Show the version of the program and exit.</para>
76
@@ -122,6 +123,12 @@ manpage.1: manpage.sgml
80
+ <term><option>--config-file FILE</option></term>
82
+ <para>Specify the path to the config file to use.</para>
86
<term><option>--reconfigure</option></term>
88
<para>If Openbox is already running on the display, tell it to
89
@@ -137,6 +144,12 @@ manpage.1: manpage.sgml
93
+ <term><option>--exit</option></term>
95
+ <para>Exit Openbox.</para>
99
<term><option>--sm-disable</option></term>
101
<para>Do not connect to the session manager.</para>
102
@@ -149,6 +162,12 @@ manpage.1: manpage.sgml
106
+ <term><option>--startup CMD</option></term>
108
+ <para>Run CMD after starting.</para>
112
<term><option>--debug</option></term>
114
<para>Display debugging output.</para>
115
@@ -161,6 +180,12 @@ manpage.1: manpage.sgml
119
+ <term><option>--debug-session</option></term>
121
+ <para>Display debugging output for session management.</para>
125
<term><option>--debug-xinerama</option></term>
127
<para>Split the display into two fake xinerama regions, if
128
--- a/doc/openbox-session.1.in
129
+++ b/doc/openbox-session.1.in
130
@@ -12,8 +12,8 @@ to save your state from one log in to th
133
On log in, \fBopenbox-session\fR will run the
134
-~/.config/openbox/autostart.sh script if it exists, and will run the
135
-system-wide script @configdir@/openbox/autostart.sh otherwise. You may
136
+~/.config/openbox/autostart script if it exists, and will run the
137
+system-wide script @configdir@/openbox/autostart otherwise. You may
138
place anything you want to run automatically in those files, for example:
141
@@ -27,7 +27,7 @@ gnome-settings-daemon &
143
Make sure that each line is followed by a "&" or else the script will
144
stop there and further commands will not be executed. You can use the
145
-@configdir@/openbox/autostart.sh file as an example for creating your
146
+@configdir@/openbox/autostart file as an example for creating your
150
--- a/doc/openbox-session.1.sgml
151
+++ b/doc/openbox-session.1.sgml
152
@@ -44,8 +44,8 @@ manpage.1: manpage.sgml
155
<para>On log in, <command>&dhpackage;</command> will run the
156
- ~/.config/openbox/autostart.sh script if it exists, and will run the
157
- system-wide script @configdir@/openbox/autostart.sh otherwise. You may
158
+ ~/.config/openbox/autostart script if it exists, and will run the
159
+ system-wide script @configdir@/openbox/autostart otherwise. You may
160
place anything you want to run automatically in those files, for example:
163
@@ -55,7 +55,7 @@ manpage.1: manpage.sgml
165
<para>Make sure that each line is followed by a "&" or else the script will
166
stop there and further commands will not be executed. You can use the
167
- @configdir@/openbox/autostart.sh file as an example for creating your
168
+ @configdir@/openbox/autostart file as an example for creating your