*** icccm.ms	2001-03-25 21:12:15+01	1.1
--- icccm.ms	2004-03-23 01:12:23+00
***************
*** 1,4 ****
! .\" $Xorg: icccm.ms,v 1.3 2000/08/17 19:42:08 cpqbld Exp $
  .\" Use tbl, eqn, -ms, and macros.t
  .\" @(#)icccm.ms	1.50	16 Apr 1994	14:13:55
  .EH ''''
--- 1,4 ----
! .\" $Xorg: $
  .\" Use tbl, eqn, -ms, and macros.t
  .\" @(#)icccm.ms	1.50	16 Apr 1994	14:13:55
  .EH ''''
***************
*** 39,49 ****
  .B
  \s+2Inter-Client Communication Conventions Manual\s0
  
! Version 2.0
  
  X Consortium Standard
  
! X Version 11, Release 6.4
  .R
  .ce 0
  .sp 6
--- 39,49 ----
  .B
  \s+2Inter-Client Communication Conventions Manual\s0
  
! Version 2.1
  
  X Consortium Standard
  
! X Version 11, Release 6.7
  .R
  .ce 0
  .sp 6
***************
*** 65,71 ****
  X Window System is a trademark of X Consortium, Inc.
  .LP             
  .LP
! Copyright \(co 1988, 1991, 1993, 1994
  X Consortium
  .LP
  Permission is hereby granted, free of charge, to any person obtaining
--- 65,71 ----
  X Window System is a trademark of X Consortium, Inc.
  .LP             
  .LP
! Copyright \(co 1988, 1991, 1993, 1994, 2004
  X Consortium
  .LP
  Permission is hereby granted, free of charge, to any person obtaining
***************
*** 1389,1394 ****
--- 1389,1395 ----
  USER	TEXT	T{
  The name of the user running the owner
  T}
+ UTF8_STRING	UTF8_STRING	UTF-8 text
  .sp 6p
  _
  .TE
***************
*** 1665,1670 ****
--- 1666,1672 ----
  PIXMAP	32	Fixed-size
  SPAN	32	Fixed-size
  STRING	8	Zero
+ UTF8_STRING	8	Zero
  WINDOW	32	Fixed-size
  .sp 6p
  _
***************
*** 1704,1709 ****
--- 1706,1714 ----
  Other ASCII control characters are explicitly not included in STRING 
  at the present time.
  .LP
+ UTF8_STRING as a type or a target specifies the ISO 10646 or Unicode
+ character set in the UTF-8 encoding.
+ .LP
  COMPOUND_TEXT as a type or a target specifies the Compound Text interchange
  format; see the \fICompound Text Encoding\fP.
  .LP
***************
*** 1729,1737 ****
  property type is suitable.
  .NE
  .LP
! Type STRING, COMPOUND_TEXT, and C_STRING properties will consist of a list
! of elements separated by null characters; other encodings will need to
! specify an appropriate list format.
  .nH 3 "INCR Properties"
  .LP
  Requestors may receive a property of type INCR\**
--- 1734,1742 ----
  property type is suitable.
  .NE
  .LP
! Type STRING, UTF8_STRING, COMPOUND_TEXT, and C_STRING properties will
! consist of a list of elements separated by null characters; other
! encodings will need to specify an appropriate list format.
  .nH 3 "INCR Properties"
  .LP
  Requestors may receive a property of type INCR\**
***************
*** 5501,5506 ****
--- 5506,5517 ----
  Its semantics have also been defined more thoroughly.
  .bP
  Additional editorial and typographical changes have been made.
+ .nH 2 "Version 2.1, March 2004"
+ .LP
+ The following changes have been made in preparation for releasing
+ Version 2.1 with X11R6.7.
+ .bP
+ UTF8_STRING was added as type and target.
  .bp
  .cT "Appendix B" no
  .nH 1 "Suggested Protocol Revisions"