[xorg-commit-diffs] xc/doc/specs/XProtocol X11.protocol, 1.1.4.2, 1.1.4.3 indexmacros.t, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/doc/specs/XProtocol
In directory pdx:/home/eich/tstbuild/xc/doc/specs/XProtocol

Modified Files:
      Tag: XORG-CURRENT
	X11.protocol indexmacros.t 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: X11.protocol
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/XProtocol/X11.protocol,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/X11.protocol	26 Nov 2003 22:48:18 -0000	1.1.4.2
+++ b/X11.protocol	15 Apr 2004 10:13:43 -0000	1.1.4.3
@@ -1,4 +1,5 @@
 .\" $Xorg: X11.protocol,v 1.4 $
+.\" $XdotOrg$
 .\"
 .\"
 .\"
@@ -31,7 +32,7 @@
 .LP
 X Window System is a trademark of The Open Group.
 .LP
-Copyright \(co 1986, 1987, 1988, 1994, 2002 The Open Group
+Copyright \(co 1986, 1987, 1988, 1994, 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
@@ -124,8 +125,8 @@
 X Consortium, Inc.
 .De
 .bp 1
-.EH '\fBX Protocol\fP''\fBX11, Release 6.4\fP'
-.OH '\fBX Protocol\fP''\fBX11, Release 6.4\fP'
+.EH '\fBX Protocol\fP''\fBX11, Release 6.7\fP'
+.OH '\fBX Protocol\fP''\fBX11, Release 6.7\fP'
 .EF ''\fB % \fP''
 .OF ''\fB % \fP''
 .NH 1
@@ -533,6 +534,7 @@
 [family: 
 .Pn { Internet , 
 .PN InternetV6 , 
+.PN ServerInterpreted ,
 .PN DECnet , 
 .PN Chaos }
 T}
@@ -941,7 +943,7 @@
 Note that they are predefined only in the sense of having numeric values, 
 not in the sense of having required semantics.
 The core protocol imposes no semantics on these names,
-but semantics are specified in other X.Org standards,
+but semantics are specified in other X Window System standards,
 such as the \fIInter-Client Communication Conventions Manual\fP
 and the \fIX Logical Font Description Conventions\fP.
 .LP
@@ -8733,9 +8735,15 @@
 and the subnet number is always the second byte.
 The server performs no automatic swapping on the address bytes.
 .LP
-The ServerInterpreted family may be of any length up to 65535 bytes.
-The address is simply a string of characters which is interpreted by
-the server.  The server performs no automatic swapping on the address bytes.
+For the ServerInterpreted family, the address may be of any
+length up to 65535 bytes.  The address consists of two strings
+of ASCII characters, separated by a byte with a value of 0.
+The first string represents the type of address, and the second
+string contains the address value.  Address types and the syntax
+for their associated values will be registered via the X.Org Registry.
+Implementors who wish to add implementation specific types may register
+a unique prefix with the X.Org registry to prevent namespace
+collisions. 
 .LP
 Use of a host address in the ChangeHosts request is deprecated.  It is
 only useful when a host has a unique, constant address, a requirement

Index: indexmacros.t
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/XProtocol/indexmacros.t,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/indexmacros.t	14 Nov 2003 15:54:32 -0000	1.1
+++ b/indexmacros.t	15 Apr 2004 10:13:43 -0000	1.1.4.1
@@ -1,3 +1,3 @@
-.eh '\s+1\fBX Protocol\fP''\fBX11, Release 6.4\fP\s-1'
-.oh '\s+1\fBX Protocol\fP''\fBX11, Release 6.4\fP\s-1'
+.eh '\s+1\fBX Protocol\fP''\fBX11, Release 6.7\fP\s-1'
+.oh '\s+1\fBX Protocol\fP''\fBX11, Release 6.7\fP\s-1'
 .so index.pageno