Merge branch 'backport' into work

diff --git a/.gitignore b/.gitignore
index d48a7c37e1315d2606e7f78415b6bf4659e37460..3e0eac02e5b4a233637f5b721b108d36494c98e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ doc/openbox-gnome-session.1
 doc/openbox-kde-session.1
 doc/openbox-session.1
 doc/openbox.1
+doc/obxprop.1
 libtool
 ltmain.sh
 m4/*.m4

diff --git a/Makefile.am b/Makefile.am
index 91b2303397f7c72f8daf0e1fb087b7deca506e69..c60389af5a3a760a642451123d60bf1a537b6895 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -542,7 +542,8 @@ nodist_man_MANS = \
        doc/openbox.1 \
        doc/openbox-session.1 \
        doc/openbox-gnome-session.1 \
-       doc/openbox-kde-session.1
+       doc/openbox-kde-session.1 \
+       doc/obxprop.1
 
 EXTRA_DIST = \
        config.rpath

diff --git a/doc/obxprop.1.in b/doc/obxprop.1.in
index f3ac096c5d7bfd7eee486272472d9c1374b942ac..bd8457bf233795cdc73bbef0667c900f1cceb086 100644 (file)
--- a/doc/obxprop.1.in
+++ b/doc/obxprop.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\-\-display\fP]  [DISPLAY]  [\fB\-\-id\fP]  [ID]  [\fB\-\-root\fP]  
+\fBopenbox\fR [\fB\-\-help\fP]  [\fB\-\-display\fP]  [DISPLAY]  [\fB\-\-id\fP]  [ID]  [\fB\-\-root\fP]  [\-\-]  [PROPERTY \&...]  
 .SH "DESCRIPTION" 
 .PP 
 obxprop is a tool for displaying the properties on an x 
@@ -32,6 +32,11 @@ Specify the X display to use.
 .IP "ID" 10 
 Specify the window identifier for the window whose properties 
 will be displayed. 
+.PP 
+Similar to \fBxprop\fR, 
+you may pass one or more property names to have 
+\fBopenbox\fR limit its output to only the properties 
+requested. 
 .SH "SEE ALSO" 
 .PP 
 openbox (1), openbox-session(1), openbox-gnome-session(1), 
@@ -39,4 +44,4 @@ openbox-kde-session(1).
 .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, Mon 08 Feb 2010, 14:21 

diff --git a/doc/obxprop.1.sgml b/doc/obxprop.1.sgml
index 06e78175170703ce8d7fe332ea53b1c58e57ba5f..5e1a2611f797f4f917454c76676593873be7fcc0 100644 (file)
--- a/doc/obxprop.1.sgml
+++ b/doc/obxprop.1.sgml
@@ -40,6 +40,8 @@ manpage.1: manpage.sgml
       <arg><option>--display</option></arg><arg>DISPLAY</arg>
       <arg><option>--id</option></arg><arg>ID</arg>
       <arg><option>--root</option></arg>
+      <arg>--</arg>
+      <arg rep="Repeat">PROPERTY</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
@@ -56,7 +58,8 @@ manpage.1: manpage.sgml
       clicking on it.</para>
 
     <para>Primarily, this tool exists for Openbox users to see the value of the
-      _OB_NAME, _OB_CLASS, and _OB_ROLE properties, which Openbox uses for
+      _OB_APP_NAME, _OB_APP_CLASS, _OB_APP_ROLE, and _OB_APP_TYPE properties,
+      which Openbox uses for
       matching windows against user-defined application rules.</para>
   </refsect1>
   <refsect1>
@@ -84,6 +87,11 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
     </variablelist>
+
+    <para>Similar to <command>xprop</command>,
+      you may pass one or more property names to have
+      <command>&dhpackage;</command> limit its output to only the properties
+      requested.</para>
   </refsect1>
   <refsect1>
     <title>SEE ALSO</title>