Bump to 3.4.11.1 and update CHANGELOG, add --config-file to man page

diff --git a/CHANGELOG b/CHANGELOG
index 915e3157690a246ac66200fd1a453769c3587c3a..da5f8710cc9f54e7cf4f0b9203ab48e14beb873f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+3.4.11.1:
+  * Updated Polish translation.
+  * Fixed bug #4519 (Incorrect focus in reused windows).
+  * Lower the default submenu open/hide delay from 200ms to 100ms.
+  * Fix some more problems with gnome integration.
+  * Update Clearlooks theme.
+  * Some other small fixes.
+
 3.4.11:
   * Update Hungarian, Japanese, and Latvian translations.
   * Make xdg-autostart use the OPENBOX environment by default, so you can use

diff --git a/Makefile.am b/Makefile.am
index f262fb993b4831e9257c8e7f146008fb12a4f9fb..e2430e0b32454e2b525673539add3b37caea22bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -543,6 +543,7 @@ CLEANFILES = \
        doc/openbox-session.1 \
        doc/openbox-gnome-session.1 \
        doc/openbox-kde-session.1 \
+       doc/obxprop.1 \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session \

diff --git a/configure.ac b/configure.ac
index 1ed2fd27d52fd3ce1f21bdf0962b10703851584a..ef3c4bb1fdc182e195f7a8e7c92449135009c6c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.4.11], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.4.11.1], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 OB_MAJOR_VERSION=3
 OB_MINOR_VERSION=4
-OB_MICRO_VERSION=28
-OB_INTERFACE_AGE=7
-OB_BINARY_AGE=7
+OB_MICRO_VERSION=29
+OB_INTERFACE_AGE=8
+OB_BINARY_AGE=8
 OB_VERSION=$PACKAGE_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index d508e8c699e09a9404cb88fbcadbd4810bd8a05a..89183aaf908edae624e9ed7862e2decdef426c6e 100644 (file)
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -4,7 +4,7 @@ openbox \(em A minimalistic, highly configurable, next generation window
 manager with extensive standards support. 
 .SH "SYNOPSIS" 
 .PP 
-\fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-version\fP]  [\fB\-\-replace\fP]  [\fB\-\-reconfigure\fP]  [\fB\-\-restart\fP]  [\fB\-\-sm-disable\fP]  [\fB\-\-sync\fP]  [\fB\-\-debug\fP]  [\fB\-\-debug-focus\fP]  [\fB\-\-debug-xinerama\fP]  
+\fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-version\fP]  [\fB\-\-replace\fP]  [\fB\-\-reconfigure\fP]  [\fB\-\-restart\fP]  [\fB\-\-config-file FILE\fP]  [\fB\-\-sm-disable\fP]  [\fB\-\-sync\fP]  [\fB\-\-debug\fP]  [\fB\-\-debug-focus\fP]  [\fB\-\-debug-xinerama\fP]  
 .SH "DESCRIPTION" 
 .PP 
 Openbox is minimalistic, highly configurable, next generation window 
@@ -70,6 +70,9 @@ 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. 
+.IP "\fB\-\-config-file FILE\fP" 10 
+Use FILE for configuration instead of looking for rc.xml 
+in the XDG search path. FILE is an absolute path. 
 .IP "\fB\-\-sm-disable\fP" 10 
 Do not connect to the session manager. 
 .IP "\fB\-\-sync\fP" 10 
@@ -92,4 +95,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, Wed 06 Jan 2010, 13:40 
+.\" created by instant / docbook-to-man, Fri 26 Mar 2010, 01:55 

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 275c3246ee075516d239e5477b272374707663b8..a06d0cfcd081df6aceea5d0b2ae0c8ae48965eb1 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -41,6 +41,7 @@ manpage.1: manpage.sgml
       <arg><option>--replace</option></arg>
       <arg><option>--reconfigure</option></arg>
       <arg><option>--restart</option></arg>
+      <arg><option>--config-file FILE</option></arg>
       <arg><option>--sm-disable</option></arg>
       <arg><option>--sync</option></arg>
       <arg><option>--debug</option></arg>
@@ -136,6 +137,13 @@ manpage.1: manpage.sgml
             want to restart X.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--config-file FILE</option></term>
+        <listitem>
+          <para>Use FILE for configuration instead of looking for rc.xml
+            in the XDG search path. FILE is an absolute path.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--sm-disable</option></term>
         <listitem>