merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 21 insertions, 4 deletions

diff --git a/xprop.man b/xprop.man
index 0de6e25..2942d67 100644
--- a/xprop.man
+++ b/xprop.man
@@ -1,5 +1,6 @@
 .\" $Xorg: xprop.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $
 .\" Copyright 1988, 1998  The Open Group
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
@@ -22,7 +23,10 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH XPROP 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xprop/xprop.man,v 1.9 2001/12/14 20:02:14 dawes Exp $
+.\"
+.TH XPROP 1 __vendorversion__
 .SH NAME
 xprop - property displayer for X
 .SH SYNOPSIS
@@ -33,6 +37,7 @@ xprop - property displayer for X
 [-display \fIdisplay\fP]
 [-len \fIn\fP] [-notype] [-fs \fIfile\fP]
 [-remove \fIproperty-name\fP]
+[-set \fIproperty-name\fP \fIvalue\fP]
 [-spy]
 [-f \fIatom\fP \fIformat\fP [\fIdformat\fP]]*
 [\fIformat\fP [\fIdformat\fP] \fIatom\fP]*
@@ -83,7 +88,7 @@ obscured.
 .TP 8
 .B "-display \fIdisplay\fP"
 This argument allows you to specify the server to connect to;
-see \fIX(1)\fP.
+see \fIX(__miscmansuffix__)\fP.
 .PP
 .TP 8
 .B "-len \fIn\fP"
@@ -110,6 +115,11 @@ any) instead of looking for the client window.
 Specifies the name of a property to be removed from the indicated window.
 .PP
 .TP 8
+.B "-set \fIproperty-name\fP \fIvalue\fP"
+Specifies the name of a property and a property value, to be set on the
+indicated window.
+.PP
+.TP 8
 .B "-spy"
 Examine window properties forever, looking for property change events.
 .PP
@@ -174,7 +184,7 @@ or more format characters.  The 0, 8, 16, or 32 specifies how many bits per
 field there are in the property.  Zero is a special case meaning use the
 field size information associated with the property itself.  (This is only
 needed for special cases like type INTEGER which is actually three different
-types depending on the size of the fields of the property)
+types depending on the size of the fields of the property.)
 .PP
 A value of 8 means
 that the property is a sequence of bytes while a value of 16 would mean that
@@ -211,6 +221,13 @@ This field and the next ones until either a 0 or the end of the property
 represent a sequence of bytes.  This format character is only usable with
 a field size of 8 and is most often used to represent a string.
 .TP
+t
+This field and the next ones until either a 0 or the end of the property
+represent an internationalized text string. This format character is only
+usable with a field size of 8. The string is assumed to be in an ICCCM
+compliant encoding and is converted to the current locale encoding before
+being output.
+.TP
 x
 The field is a hex number (like 'c' but displayed in hex - most useful
 for displaying window ids and the like)
@@ -322,6 +339,6 @@ To get default display.
 Specifies the name of a file from which additional formats are to be obtained.
 .PP
 .SH SEE ALSO
-X(1), xwininfo(1)
+X(__miscmansuffix__), xwininfo(1)
 .SH AUTHOR
 Mark Lillibridge, MIT Project Athena