From 9a7879e60bd5aec51a91762ddca1819a11ddaf1e Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 2 Apr 2004 21:47:11 +0000
Subject: 70. Merging in the TM branch (Egbert Eich).

---
 include/X11/Xaw/XawInit.h |  3 ++-
 man/Xaw.man               | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/X11/Xaw/XawInit.h b/include/X11/Xaw/XawInit.h
index da9d446..2e178eb 100644
--- a/include/X11/Xaw/XawInit.h
+++ b/include/X11/Xaw/XawInit.h
@@ -24,10 +24,11 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $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
diff --git a/man/Xaw.man b/man/Xaw.man
index a96b25a..8803f10 100644
--- a/man/Xaw.man
+++ b/man/Xaw.man
@@ -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 @@ Guarino-Reid, Charles Haynes, Rich Hyde, Mary Larson, Joel McCormack, Ron
 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
-- 
cgit v1.2.1