[xorg-commit-diffs] xc/lib/Xaw Xaw.man, 1.1.4.1.6.1, 1.1.4.1.6.2 XawInit.h, 1.1.4.1.6.1, 1.1.4.1.6.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/Xaw
In directory pdx:/tmp/cvs-serv13014/lib/Xaw

Modified Files:
      Tag: XORG-RELEASE-1
	Xaw.man XawInit.h 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



Index: Xaw.man
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Xaw.man,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.2
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.2
--- a/Xaw.man	4 Mar 2004 17:46:50 -0000	1.1.4.1.6.1
+++ b/Xaw.man	2 Apr 2004 21:47:11 -0000	1.1.4.1.6.2
@@ -24,7 +24,7 @@
 .\" dealings in this Software without prior written authorization from the
 .\" XFree86 Project.
 .\"
-.\" Author: Paulo César Pereira de Andrade
+.\" Author: Paulo César Pereira de Andrade
 .\"
 .\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.7 2001/11/04 21:16:39 paulo Exp $
 .\"
@@ -39,9 +39,10 @@
 .SH DESCRIPTION
 .B Xaw
 is a widget set based on the X Toolkit Intrinsics (Xt) Library.  This
-manual page describes the additions and modifications to the Xaw library
-made by XFree86 (Xaw7), as well as some of the common interfaces between
-its version and the previous X Consortium release (Xaw6).
+release by the X.org Foundation includes additions and modifications
+originally made for The XFree86 Project, Inc.  This manual page describes
+these changes as well as some of the common interfaces between its version
+and the previous X Consortium release (Xaw6).
 .SH ACTIONS
 All of the \fIXaw\fR widgets now have the additional translations
 .B call-proc, declare, get-values
@@ -580,7 +581,8 @@
 Newman, Jeanne Rich, Terry Weissman, Mike Gancarz, Phil Karlton, Kathleen
 Langone, Ram Rao, Smokey Wallace, Al Mento, and Jean Diaz.
 .PP
-XFree86's additions and modifications to \fIXaw\fR were written by Paulo
+The additions and modifications to \fIXaw\fR which were
+originally made for XFree86 were written by Paulo
 C\('esar Pereira de Andrade.
 .SH SEE ALSO
 .I Athena Widget Set - C Language Interface

Index: XawInit.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/XawInit.h,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.2
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.2
--- a/XawInit.h	4 Mar 2004 17:46:50 -0000	1.1.4.1.6.1
+++ b/XawInit.h	2 Apr 2004 21:47:11 -0000	1.1.4.1.6.2
@@ -24,10 +24,11 @@
  */
 /* $XFree86: xc/lib/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */
 
+/* $XdotOrg$ */
 #ifndef _XawInit_h
 #define _XawInit_h
 
-#define XawVendor	"XFree86"
+#define XawVendor	XVENDORNAMESHORT
 
 #ifdef OLDXAW
 #define XawVersion	6700002L