diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:31 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:31 +0000 |
commit | 697693f53073b57bb30503829fb8ec1acdb9a218 (patch) | |
tree | 0c5f169629860fc85624e92a68da8207ac27110a /specs | |
parent | a65ace52f7767e5ccc7d731d2a4b5efad92d0235 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)
Diffstat (limited to 'specs')
-rw-r--r-- | specs/CTEXT/ctext.tbl.ms | 2 | ||||
-rw-r--r-- | specs/ICCCM/icccm.ms | 2 | ||||
-rw-r--r-- | specs/SM/xsmp.ms | 2 | ||||
-rw-r--r-- | specs/X11/CH02 | 2 | ||||
-rw-r--r-- | specs/X11/CH09 | 2 | ||||
-rw-r--r-- | specs/X11/CH13 | 2 | ||||
-rw-r--r-- | specs/X11/CH14 | 2 | ||||
-rw-r--r-- | specs/X11/glossary | 2 | ||||
-rw-r--r-- | specs/XDMCP/xdmcp.ms | 10 | ||||
-rw-r--r-- | specs/XIM/xim.ms | 2 | ||||
-rw-r--r-- | specs/XProtocol/X11.encoding | 2 | ||||
-rw-r--r-- | specs/Xext/DPMS.ms | 2 | ||||
-rw-r--r-- | specs/Xext/buffer.ms | 2 | ||||
-rw-r--r-- | specs/Xext/evi.ms | 2 | ||||
-rw-r--r-- | specs/Xext/shape.ms | 24 | ||||
-rw-r--r-- | specs/Xext/sync.tex | 2 | ||||
-rw-r--r-- | specs/Xi/porting.ms | 2 | ||||
-rw-r--r-- | specs/Xmu/Xmu.ms | 2 | ||||
-rw-r--r-- | specs/Xserver/analysis.tex | 2 | ||||
-rw-r--r-- | specs/Xserver/secint.tex | 2 | ||||
-rw-r--r-- | specs/i18n/Framework.ms | 2 | ||||
-rw-r--r-- | specs/rstart/rstart.ms | 2 | ||||
-rw-r--r-- | specs/specindex.html | 2 | ||||
-rw-r--r-- | specs/xtrans/Xtrans.mm | 2 |
24 files changed, 44 insertions, 34 deletions
diff --git a/specs/CTEXT/ctext.tbl.ms b/specs/CTEXT/ctext.tbl.ms index 64b3f79..b7edfff 100644 --- a/specs/CTEXT/ctext.tbl.ms +++ b/specs/CTEXT/ctext.tbl.ms @@ -1,6 +1,6 @@ .\" Use tbl and -ms .\" -.\" $XFree86: xc/doc/specs/CTEXT/ctext.tbl.ms,v 1.2 2000/12/11 19:39:40 dawes Exp $ +.\" $XFree86$ .\" .\" --- bP --- bulleted paragraph macro .\" diff --git a/specs/ICCCM/icccm.ms b/specs/ICCCM/icccm.ms index 1a26c09..c094a10 100644 --- a/specs/ICCCM/icccm.ms +++ b/specs/ICCCM/icccm.ms @@ -3,7 +3,7 @@ .\" .\" .\" -.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.3 2001/01/17 16:57:41 dawes Exp $ +.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.2 2000/12/11 19:39:43 dawes Exp $ .\" .\" Use tbl, eqn, -ms, and macros.t .\" @(#)icccm.ms 1.50 16 Apr 1994 14:13:55 diff --git a/specs/SM/xsmp.ms b/specs/SM/xsmp.ms index 0a962e4..3f24869 100644 --- a/specs/SM/xsmp.ms +++ b/specs/SM/xsmp.ms @@ -1,6 +1,6 @@ .\" Use tbl, -ms, and macros.t .\" $Xorg: xsmp.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/SM/xsmp.ms,v 1.2 2003/07/09 15:27:25 tsi Exp $ +.\" $XFree86$ .EH '''' .OH '''' .EF '''' diff --git a/specs/X11/CH02 b/specs/X11/CH02 index df7d676..61554b8 100644 --- a/specs/X11/CH02 +++ b/specs/X11/CH02 @@ -40,7 +40,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/specs/X11/CH02,v 1.2 2003/07/09 15:27:25 tsi Exp $ +.\" $XFree86$ \& .sp 1 .ce 3 diff --git a/specs/X11/CH09 b/specs/X11/CH09 index 078bc19..3821745 100644 --- a/specs/X11/CH09 +++ b/specs/X11/CH09 @@ -40,7 +40,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/specs/X11/CH09,v 1.3 2003/07/18 15:53:24 tsi Exp $ +.\" $XFree86: xc/doc/specs/X11/CH09,v 1.2 2003/07/09 15:27:25 tsi Exp $ \& .sp 1 .ce 3 diff --git a/specs/X11/CH13 b/specs/X11/CH13 index b9f0266..66cfba1 100644 --- a/specs/X11/CH13 +++ b/specs/X11/CH13 @@ -41,7 +41,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/specs/X11/CH13,v 1.5 2000/12/04 18:49:17 dawes Exp $ +.\" $XFree86: xc/doc/specs/X11/CH13,v 1.4 2000/11/28 18:49:17 dawes Exp $ .\" \& .sp 1 diff --git a/specs/X11/CH14 b/specs/X11/CH14 index 16d66e7..6b0792d 100644 --- a/specs/X11/CH14 +++ b/specs/X11/CH14 @@ -41,7 +41,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/specs/X11/CH14,v 1.2 2000/11/28 18:49:19 dawes Exp $ +.\" $XFree86$ .\" \& .sp 1 diff --git a/specs/X11/glossary b/specs/X11/glossary index 7aea056..9abb4ab 100644 --- a/specs/X11/glossary +++ b/specs/X11/glossary @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/specs/X11/glossary,v 1.2 2000/11/28 18:49:19 dawes Exp $ +.\" $XFree86$ .\" \& .sp 1 diff --git a/specs/XDMCP/xdmcp.ms b/specs/XDMCP/xdmcp.ms index 90d31da..8346403 100644 --- a/specs/XDMCP/xdmcp.ms +++ b/specs/XDMCP/xdmcp.ms @@ -1,4 +1,5 @@ .\" Use eqn, tbl, and -ms +.\" $XdotOrg: xc/doc/specs/XDMCP/xdmcp.ms,v 1.1.4.2.4.1 2004/03/04 17:46:01 eich Exp $ .\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $ .\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.2 2003/07/09 15:27:26 tsi Exp $ .EQ @@ -17,7 +18,7 @@ define cc % "\\fR}\\fP" % .ce 7 \s+2\fBX Display Manager Control Protocol\fP\s-2 -\s+1\fBVersion 1.1 +\s+1\fBVersion 1.1 DRAFT X.Org Standard @@ -1694,9 +1695,10 @@ Protocol Encoding When XDMCP is implemented on top of the Internet User Datagram Protocol (UDP), port number 177 is to be used. When using UDP over IPv4, Broadcast Query packets are sent via UDP broadcast. When using UDP over IPv6, Broadcast Query -packets are sent via multicast, either to the officially registered XDMCP -multicast address of (TBD) or to a locally assigned multicast address. -The version number in all packets will be 1. +packets are sent via multicast, either to an address in the IANA registered +XDMCP multicast address range of FF0\fIX\fP:0:0:0:0:0:0:12B +(where the \fIX\fP is replaced by a valid scope id) or to a locally assigned +multicast address. The version number in all packets will be 1. Packet opcodes are 16-bit integers. .RS .TS diff --git a/specs/XIM/xim.ms b/specs/XIM/xim.ms index c7f80c2..5ffb74b 100644 --- a/specs/XIM/xim.ms +++ b/specs/XIM/xim.ms @@ -1,6 +1,6 @@ .\" $Xorg: xim.ms,v 1.3 2000/08/17 19:42:21 cpqbld Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms -.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.3 2001/01/17 16:57:42 dawes Exp $ +.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.2 2000/12/14 17:48:58 dawes Exp $ .EH '''' .OH '''' .EF '''' diff --git a/specs/XProtocol/X11.encoding b/specs/XProtocol/X11.encoding index 346a374..5233c2a 100644 --- a/specs/XProtocol/X11.encoding +++ b/specs/XProtocol/X11.encoding @@ -1,5 +1,5 @@ .\" $Xorg: X11.encoding,v 1.3 2000/08/17 19:42:23 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/XProtocol/X11.encoding,v 1.2 2003/07/09 15:27:26 tsi Exp $ +.\" $XFree86$ \& .sp 1 .ps 11 diff --git a/specs/Xext/DPMS.ms b/specs/Xext/DPMS.ms index 5c87093..0636bf3 100644 --- a/specs/Xext/DPMS.ms +++ b/specs/Xext/DPMS.ms @@ -1,5 +1,5 @@ .\" Use -ms and macros.t -.\" $XFree86: xc/doc/specs/Xext/DPMS.ms,v 1.2 1998/12/20 11:56:39 dawes Exp $ +.\" $XFree86$ .EH '''' .OH '''' .EF '''' diff --git a/specs/Xext/buffer.ms b/specs/Xext/buffer.ms index 06a6013..8f4c085 100644 --- a/specs/Xext/buffer.ms +++ b/specs/Xext/buffer.ms @@ -3,7 +3,7 @@ .\" .\" .\" -.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.4 2001/01/17 16:57:43 dawes Exp $ +.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.3 2000/03/03 23:16:24 dawes Exp $ .TL Extending X for Double-Buffering, Multi-Buffering, and Stereo .AU diff --git a/specs/Xext/evi.ms b/specs/Xext/evi.ms index 52fe25f..601fdc1 100644 --- a/specs/Xext/evi.ms +++ b/specs/Xext/evi.ms @@ -4,7 +4,7 @@ .\" .\" .\" -.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.4 2001/01/17 16:57:44 dawes Exp $ +.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.3 2000/03/03 23:16:24 dawes Exp $ .EH '''' .OH '''' .EF '''' diff --git a/specs/Xext/shape.ms b/specs/Xext/shape.ms index a39fd2a..6ebdbe4 100644 --- a/specs/Xext/shape.ms +++ b/specs/Xext/shape.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: shape.ms,v 1.3 2000/08/17 19:42:36 cpqbld Exp $ +.\" $XdotOrg: xc/doc/specs/Xext/shape.ms,v 1.1.10.1 2004/03/16 02:44:56 alanc Exp $ .\" edited for DP edits and code consistency w/ core protocol/xlib 4/1/96 .EH '''' .OH '''' @@ -15,8 +16,8 @@ Shape Extension Protocol\fP\s-2 .sp 3 .ce 3 -Version 1.0 -X Consortium Standard +Version 1.0.1 +X.Org Standard X Version 11, Release 6.4 .sp 6 .ce 4 @@ -27,7 +28,7 @@ MIT X Consortium .nr PS 9 .sp 8 .LP -Copyright \(co 1989 X Consortium +Copyright \(co 1989, 2004 The Open Group .LP Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal @@ -42,13 +43,13 @@ all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .LP -Except as contained in this notice, the name of the X Consortium shall not be +Except as contained in this notice, the name of the Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. +in this Software without prior written authorization from the Open Group. .ps 10 .nr PS 10 .bp 1 @@ -736,7 +737,7 @@ Requests .PN ShapeInputSelected .sp 6p 1 CARD8 opcode - 1 6 shape opcode + 1 7 shape opcode 2 2 request length 4 WINDOW destination window .De @@ -759,7 +760,7 @@ Requests .PN ShapeGetRectangles .sp 6p 1 CARD8 opcode - 1 7 shape opcode + 1 8 shape opcode 2 3 request length 4 WINDOW window 1 SHAPE_KIND source kind @@ -877,3 +878,10 @@ the default clip region, the client clip region (if any) and the client bounding region (if any). Otherwise, the effective clip region is the same as the default clip region. .KE +.NH 1 +Revision History +.LP +1.0 - 1989 - Original Revision +.LP +1.0.1 - March 2004 - Corrected misnumbering of \fIShapeInputSelected\fP +and \fIShapeGetRectangles\fP requests in encoding section. diff --git a/specs/Xext/sync.tex b/specs/Xext/sync.tex index 22a2884..b202abc 100644 --- a/specs/Xext/sync.tex +++ b/specs/Xext/sync.tex @@ -20,7 +20,7 @@ % IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT % OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. % -% $XFree86: xc/doc/specs/Xext/sync.tex,v 1.3 2001/04/27 12:58:27 dawes Exp $ +% $XFree86$ %\documentstyle[a4]{article} \documentstyle{article} diff --git a/specs/Xi/porting.ms b/specs/Xi/porting.ms index 0298957..58280ab 100644 --- a/specs/Xi/porting.ms +++ b/specs/Xi/porting.ms @@ -1,4 +1,4 @@ -.\" $XFree86: xc/doc/specs/Xi/porting.ms,v 1.2 2000/12/04 23:25:59 dawes Exp $ +.\" $XFree86$ .\" Input Extension Porting Document .EH '''' .OH '''' diff --git a/specs/Xmu/Xmu.ms b/specs/Xmu/Xmu.ms index dadbfb8..c647bdf 100644 --- a/specs/Xmu/Xmu.ms +++ b/specs/Xmu/Xmu.ms @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/specs/Xmu/Xmu.ms,v 1.2 2000/11/28 18:49:20 dawes Exp $ +.\" $XFree86$ .\" .sp 8 .ce 2 diff --git a/specs/Xserver/analysis.tex b/specs/Xserver/analysis.tex index 87edc71..a2eeabd 100644 --- a/specs/Xserver/analysis.tex +++ b/specs/Xserver/analysis.tex @@ -2,7 +2,7 @@ \setlength{\parindent}{0 pt} \setlength{\parskip}{6pt} -% $XFree86: xc/doc/specs/Xserver/analysis.tex,v 1.2 2001/04/19 23:36:35 dawes Exp $ +% $XFree86$ \begin{document} diff --git a/specs/Xserver/secint.tex b/specs/Xserver/secint.tex index 3e17dba..56aac6c 100644 --- a/specs/Xserver/secint.tex +++ b/specs/Xserver/secint.tex @@ -2,7 +2,7 @@ \setlength{\parindent}{0 pt} \setlength{\parskip}{6pt} -% $XFree86: xc/doc/specs/Xserver/secint.tex,v 1.2 2001/04/19 23:36:35 dawes Exp $ +% $XFree86$ \begin{document} diff --git a/specs/i18n/Framework.ms b/specs/i18n/Framework.ms index 9366185..67c8a0c 100644 --- a/specs/i18n/Framework.ms +++ b/specs/i18n/Framework.ms @@ -1,6 +1,6 @@ .\" $Xorg: Framework.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms -.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.5 2001/02/09 00:02:52 dawes Exp $ +.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.4 2001/01/17 16:57:45 dawes Exp $ .EH '''' .OH '''' .EF '''' diff --git a/specs/rstart/rstart.ms b/specs/rstart/rstart.ms index 2800442..e243fdc 100644 --- a/specs/rstart/rstart.ms +++ b/specs/rstart/rstart.ms @@ -1,4 +1,4 @@ -.\" $XFree86: xc/doc/specs/rstart/rstart.ms,v 1.2 2001/05/29 18:14:12 dawes Exp $ +.\" $XFree86$ .ds iL Brown .ds iI J. .ds iO Quarterdeck Office Systems diff --git a/specs/specindex.html b/specs/specindex.html index e70cd60..b05ac1e 100644 --- a/specs/specindex.html +++ b/specs/specindex.html @@ -107,7 +107,7 @@ <li><a href="ctlseqs.html">Xterm control sequences</a> <a href="../PDF/ctlseqs.pdf">[PDF]</a></li> </ul> - <!-- $XFree86: xc/doc/specs/specindex.html,v 1.3 2003/10/19 02:30:29 dawes Exp $ --> + <!-- $XFree86: xc/doc/specs/specindex.html,v 1.4 2003/12/06 19:11:52 dawes Exp $ --> </body> </html> diff --git a/specs/xtrans/Xtrans.mm b/specs/xtrans/Xtrans.mm index 4176ec0..0d39e7d 100644 --- a/specs/xtrans/Xtrans.mm +++ b/specs/xtrans/Xtrans.mm @@ -1,4 +1,4 @@ -.\" $XFree86: xc/doc/specs/xtrans/Xtrans.mm,v 1.3 2003/11/16 16:40:19 herrb Exp $ +.\" $XFree86: xc/doc/specs/xtrans/Xtrans.mm,v 1.2 2003/07/09 15:27:27 tsi Exp $ '\".nr Ej 1 .PH "'''" .ce |