Update manpage to current version. (Fix bug 5444)

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index d508e8c699e09a9404cb88fbcadbd4810bd8a05a..bd3747fbc6392ce4b7fa135aac2cbd4083dacea0 100644 (file)
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -58,11 +58,14 @@ to ~/.config/openbox and edit it to your liking.
 .PP 
 These are the possible options that \fBopenbox\fR accepts: 
 .IP "\fB\-\-help\fP" 10 
 .PP 
 These are the possible options that \fBopenbox\fR accepts: 
 .IP "\fB\-\-help\fP" 10 

-Show a summary of the options available. 
+Show a summary of the command line options available 
+and exit. 

 .IP "\fB\-\-version\fP" 10 
 .IP "\fB\-\-version\fP" 10 

-Show the version of the program. 
+Show the version of the program and exit. 

 .IP "\fB\-\-replace\fP" 10 
 Replace the currently running window manager. 
 .IP "\fB\-\-replace\fP" 10 
 Replace the currently running window manager. 

+.IP "\fB\-\-config-file FILE\fP" 10 
+Specify the path to the config file to use. 

 .IP "\fB\-\-reconfigure\fP" 10 
 If Openbox is already running on the display, tell it to 
 reload its configuration. 
 .IP "\fB\-\-reconfigure\fP" 10 
 If Openbox is already running on the display, tell it to 
 reload its configuration. 


@@ -70,14 +73,20 @@ reload its configuration.
 If Openbox is already running on the display, tell it to 
 restart. This is useful if you have upgraded Openbox and don't 
 want to restart X. 
 If Openbox is already running on the display, tell it to 
 restart. This is useful if you have upgraded Openbox and don't 
 want to restart X. 

+.IP "\fB\-\-exit\fP" 10 
+Exit Openbox. 

 .IP "\fB\-\-sm-disable\fP" 10 
 Do not connect to the session manager. 
 .IP "\fB\-\-sync\fP" 10 
 Run in synchronous mode (for debugging). 
 .IP "\fB\-\-sm-disable\fP" 10 
 Do not connect to the session manager. 
 .IP "\fB\-\-sync\fP" 10 
 Run in synchronous mode (for debugging). 

+.IP "\fB\-\-startup CMD\fP" 10 
+Run CMD after starting. 

 .IP "\fB\-\-debug\fP" 10 
 Display debugging output. 
 .IP "\fB\-\-debug-focus\fP" 10 
 Display debugging output for focus handling. 
 .IP "\fB\-\-debug\fP" 10 
 Display debugging output. 
 .IP "\fB\-\-debug-focus\fP" 10 
 Display debugging output for focus handling. 

+.IP "\fB\-\-debug-session\fP" 10 
+Display debugging output for session management. 

 .IP "\fB\-\-debug-xinerama\fP" 10 
 Split the display into two fake xinerama regions, if 
 xinerama is not already enabled. This is for debugging 
 .IP "\fB\-\-debug-xinerama\fP" 10 
 Split the display into two fake xinerama regions, if 
 xinerama is not already enabled. This is for debugging 


@@ -92,4 +101,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 

-.\" created by instant / docbook-to-man, Wed 06 Jan 2010, 13:40 
+.\" created by instant / docbook-to-man, Sun 30 Sep 2012, 17:58 

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 275c3246ee075516d239e5477b272374707663b8..281f2a01f839d4eefa881b0e1c7b059f1a1c30e6 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -106,13 +106,14 @@ manpage.1: manpage.sgml
       <varlistentry>
         <term><option>--help</option></term>
         <listitem>
       <varlistentry>
         <term><option>--help</option></term>
         <listitem>

-          <para>Show a summary of the options available.</para>
+          <para>Show a summary of the command line options available
+            and exit.</para>

         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--version</option></term>
         <listitem>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--version</option></term>
         <listitem>

-          <para>Show the version of the program.</para>
+          <para>Show the version of the program and exit.</para>

         </listitem>
       </varlistentry>
       <varlistentry>
         </listitem>
       </varlistentry>
       <varlistentry>


@@ -121,6 +122,12 @@ manpage.1: manpage.sgml
           <para>Replace the currently running window manager.</para>
         </listitem>
       </varlistentry>
           <para>Replace the currently running window manager.</para>
         </listitem>
       </varlistentry>

+      <varlistentry>
+        <term><option>--config-file FILE</option></term>
+        <listitem>
+          <para>Specify the path to the config file to use.</para>
+        </listitem>
+      </varlistentry>

       <varlistentry>
         <term><option>--reconfigure</option></term>
         <listitem>
       <varlistentry>
         <term><option>--reconfigure</option></term>
         <listitem>


@@ -136,6 +143,12 @@ manpage.1: manpage.sgml
             want to restart X.</para>
         </listitem>
       </varlistentry>
             want to restart X.</para>
         </listitem>
       </varlistentry>

+      <varlistentry>
+        <term><option>--exit</option></term>
+        <listitem>
+          <para>Exit Openbox.</para>
+        </listitem>
+      </varlistentry>

       <varlistentry>
         <term><option>--sm-disable</option></term>
         <listitem>
       <varlistentry>
         <term><option>--sm-disable</option></term>
         <listitem>


@@ -148,6 +161,12 @@ manpage.1: manpage.sgml
           <para>Run in synchronous mode (for debugging).</para>
         </listitem>
       </varlistentry>
           <para>Run in synchronous mode (for debugging).</para>
         </listitem>
       </varlistentry>

+      <varlistentry>
+        <term><option>--startup CMD</option></term>
+        <listitem>
+          <para>Run CMD after starting.</para>
+        </listitem>
+      </varlistentry>

       <varlistentry>
         <term><option>--debug</option></term>
         <listitem>
       <varlistentry>
         <term><option>--debug</option></term>
         <listitem>


@@ -160,6 +179,12 @@ manpage.1: manpage.sgml
           <para>Display debugging output for focus handling.</para>
         </listitem>
       </varlistentry>
           <para>Display debugging output for focus handling.</para>
         </listitem>
       </varlistentry>

+      <varlistentry>
+        <term><option>--debug-session</option></term>
+        <listitem>
+          <para>Display debugging output for session management.</para>
+        </listitem>
+      </varlistentry>

       <varlistentry>
         <term><option>--debug-xinerama</option></term>
         <listitem>
       <varlistentry>
         <term><option>--debug-xinerama</option></term>
         <listitem>