From: Dana Jansens <danakj@orodu.net>
Date: Mon, 8 Feb 2010 19:28:18 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=6014a41760a107d817422aa5412ccf0ce3fc6e92;hp=31f0c8c1ad8c9acf369ab8336765f4bf673b8e21

Merge branch 'backport' into work
---

diff --git a/.gitignore b/.gitignore
index d48a7c37..3e0eac02 100644
--- 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 91b23033..c60389af 100644
--- 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 f3ac096c..bd8457bf 100644
--- 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 06e78175..5e1a2611 100644
--- 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>