[xorg-commit-diffs] xc/doc/specs/FSProtocol protocol.ms, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

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

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


Index: protocol.ms
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/FSProtocol/protocol.ms,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/protocol.ms	14 Nov 2003 15:54:31 -0000	1.1
+++ b/protocol.ms	15 Apr 2004 10:13:29 -0000	1.1.4.1
@@ -1,4 +1,5 @@
 .\" $Xorg: protocol.ms,v 1.3 2000/08/17 19:42:07 cpqbld Exp $
+.\" $XdotOrg$
 .\" Use tbl, -ms, and macros.t
 .EH ''''
 .OH ''''
@@ -12,9 +13,9 @@
 \s+3\fBThe X Font Service Protocol\fP\s-3
 .sp
 \fBVersion 2.0\fP
-\fBX Consortium Standard\fR
+\fBX Window System Standard\fR
 .sp
-\fBX Version 11, Release 6.4\fR
+\fBX Version 11, Release 6.7\fR
 .sp 6
 Jim Fulton
 Network Computing Devices, Inc.
@@ -63,8 +64,8 @@
 .ps 11
 .nr PS 11
 .bp 1
-.EH '\fBX Font Service Protocol\fP''\fBX11, Release 6.4\fP'
-.OH '\fBX Font Service Protocol\fP''\fBX11, Release 6.4\fP'
+.EH '\fBX Font Service Protocol\fP''\fBX11, Release 6.7\fP'
+.OH '\fBX Font Service Protocol\fP''\fBX11, Release 6.7\fP'
 .EF ''\fB\\\\n(PN\fP''
 .OF ''\fB\\\\n(PN\fP''
 .NH 1
@@ -76,7 +77,7 @@
 The management of fonts in large, heterogeneous environments is one of the
 hardest aspects of using the X Window System.*
 .FS
-* \fIX Window System\fP is a trademark of X Consortium, Inc.
+* \fIX Window System\fP is a trademark of The Open Group.
 .FE
 Multiple formats and the lack of
 a consistent mechanism for exporting font data to all displays on a network