70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-RELEASE-1

10 files changed, 25 insertions, 14 deletions

diff --git a/man/XSetWMProperties.man b/man/XSetWMProperties.man
index f041d509..2398fbc9 100644
--- a/man/XSetWMProperties.man
+++ b/man/XSetWMProperties.man
@@ -332,7 +332,8 @@ errors.
 .LP
 The function
 .ZN Xutf8SetWMProperties
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH PROPERTIES
diff --git a/man/XmbDrawImageString.man b/man/XmbDrawImageString.man
index 4fa0a24a..e47c033b 100644
--- a/man/XmbDrawImageString.man
+++ b/man/XmbDrawImageString.man
@@ -203,7 +203,8 @@ The behavior for an invalid codepoint is undefined.
 .LP
 The function
 .ZN Xutf8TextExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbDrawString.man b/man/XmbDrawString.man
index 0f4d2a97..8af12eda 100644
--- a/man/XmbDrawString.man
+++ b/man/XmbDrawString.man
@@ -194,7 +194,8 @@ The behavior for an invalid codepoint is undefined.
 .LP
 The function
 .ZN Xutf8DrawString
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
index ba79cfbd..9a34e99b 100644
--- a/man/XmbDrawText.man
+++ b/man/XmbDrawText.man
@@ -42,7 +42,7 @@
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
 .\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.4 2003/04/28 22:17:58 herrb Exp $
-.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.4.4.2 2004-03-04 17:45:54 eich Exp $
+.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.4.4.3 2004-04-02 21:47:10 eich Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -216,7 +216,8 @@ The behavior for an invalid codepoint is undefined.
 .LP
 The function
 .ZN Xutf8DrawText
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH STRUCTURES
diff --git a/man/XmbLookupString.man b/man/XmbLookupString.man
index 3b751745..fc30f4a2 100644
--- a/man/XmbLookupString.man
+++ b/man/XmbLookupString.man
@@ -301,7 +301,8 @@ even though it does not have any more keyboard focus.
 .LP
 The function
 .ZN Xutf8LookupString
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbResetIC.man b/man/XmbResetIC.man
index d0f131da..e71465b6 100644
--- a/man/XmbResetIC.man
+++ b/man/XmbResetIC.man
@@ -199,7 +199,8 @@ The client should free the returned string by calling
 .LP
 The function
 .ZN Xutf8ResetIC
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbTextEscapement.man b/man/XmbTextEscapement.man
index 44916eab..8aeb0b08 100644
--- a/man/XmbTextEscapement.man
+++ b/man/XmbTextEscapement.man
@@ -181,7 +181,8 @@ the escapement is always positive.
 .LP
 The function
 .ZN Xutf8TextEscapement
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbTextExtents.man b/man/XmbTextExtents.man
index ca07a88f..4c9ad9d3 100644
--- a/man/XmbTextExtents.man
+++ b/man/XmbTextExtents.man
@@ -217,7 +217,8 @@ The behavior for an invalid codepoint is undefined.
 .LP
 The function
 .ZN Xutf8TextExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index da51fcda..e5c65f2f 100644
--- a/man/XmbTextListToTextProperty.man
+++ b/man/XmbTextListToTextProperty.man
@@ -43,7 +43,7 @@
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
 .\" $XFree86: xc/doc/man/X11/XTLTTProp.man,v 1.6 2003/04/28 22:17:57 herrb Exp $
-.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.4.4.2 2004-03-04 17:45:54 eich Exp $
+.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.4.4.3 2004-04-02 21:47:10 eich Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -230,8 +230,9 @@ this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.
 If the style
 .ZN XUTF8StringStyle
 is specified,
-this encoding is ``UTF8_STRING''. (This is an XFree86 extension introduced in
-XFree86 4.0.2. Its presence is indicated by the macro
+this encoding is ``UTF8_STRING''. 
+(This is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is indicated by the macro
 .ZN X_HAVE_UTF8_STRING .)
 If the style 
 .ZN XTextStyle
@@ -394,7 +395,8 @@ The functions
 .ZN Xutf8TextListToTextProperty
 and
 .ZN Xutf8TextPropertyToTextList
-are an XFree86 extension introduced in XFree86 4.0.2. Their presence is
+are extensions introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Their presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH STRUCTURES
diff --git a/man/XmbTextPerCharExtents.man b/man/XmbTextPerCharExtents.man
index e37ef81a..ba1d2e3a 100644
--- a/man/XmbTextPerCharExtents.man
+++ b/man/XmbTextPerCharExtents.man
@@ -247,7 +247,8 @@ or
 .LP
 The function
 .ZN Xutf8TextPerCharExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"