[xorg-commit-diffs] xc/doc/specs/XLFD xlfd.tbl.ms,1.1,1.1.4.1

[Egbert Eich]

Committed by: eich

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

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


Index: xlfd.tbl.ms
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/XLFD/xlfd.tbl.ms,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xlfd.tbl.ms	14 Nov 2003 15:54:32 -0000	1.1
+++ b/xlfd.tbl.ms	15 Apr 2004 10:13:43 -0000	1.1.4.1
@@ -1,5 +1,6 @@
 .\" Use tbl and -ms and macros.t	-*- Nroff -*-
 .\" $Xorg: xlfd.tbl.ms,v 1.3 2000/08/17 19:42:22 cpqbld Exp $
+.\" $XdotOrg$
 .nr sM 4		\" section on Matrix Transformations
 .nr sS 5		\" section on Scalable fonts
 .nr sP 6		\" section on Polymorphic font support
@@ -19,7 +20,7 @@
 
 \fBX Consortium Standard\fP
 
-\fBX Version 11, Release 6.4\fP
+\fBX Version 11, Release 6.7\fP
 .sp 6
 \s+1Jim Flowers\s-1
 .sp 6p
@@ -35,7 +36,7 @@
 .nr PS 9
 .sp 8
 .LP
-\fIX Window System\fP is a trademark of X Consortium, Inc.
+\fIX Window System\fP is a trademark of The Open Group.
 .LP             
 Helvetica and Times are registered trademarks of Linotype Company.
 .LP
@@ -88,8 +89,8 @@
 .ps 11
 .nr PS 11
 .bp 1
-.EH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.4\fP'
-.OH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.4\fP'
+.EH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.7\fP'
+.OH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.7\fP'
 .EF ''\fB\\\\n(PN\fP''
 .OF ''\fB\\\\n(PN\fP''
 .NH 1