Xutf8->XFree86utf8

11 files changed, 77 insertions, 77 deletions

diff --git a/man/XSetWMProperties.man b/man/XSetWMProperties.man
index 743586e5..ece91390 100644
--- a/man/XSetWMProperties.man
+++ b/man/XSetWMProperties.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XSetWMProperties 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties
+XSetWMProperties, XmbSetWMProperties, XFree86utf8SetWMProperties \- set standard window properties
 .SH SYNTAX
 .HP
 void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
@@ -156,7 +156,7 @@ void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
 \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
 XClassHint *\fIclass_hints\fP\^); 
 .HP
-void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+void XFree86utf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
 *\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
 \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
 XClassHint *\fIclass_hints\fP\^); 
@@ -243,7 +243,7 @@ any directory prefixes, is substituted for res_name.
 The
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 convenience functions provide a simple programming interface 
 for setting those essential window properties that are used 
 for communicating with other clients
@@ -256,7 +256,7 @@ they set the WM_ICON_NAME property.
 The window_name and icon_name arguments are null-terminated strings, for
 .ZN XmbSetWMProperties
 in the encoding of the current locale, for
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 in UTF-8 encoding.
 If the arguments can be fully converted to the STRING encoding,
 the properties are created with type ``STRING''; 
@@ -266,14 +266,14 @@ and the properties are created with type ``COMPOUND_TEXT''.
 If the normal_hints argument is non-NULL,
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 call
 .ZN XSetWMNormalHints ,
 which sets the WM_NORMAL_HINTS property (see section 14.1.7).
 If the wm_hints argument is non-NULL, 
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 call
 .ZN XSetWMHints ,
 which sets the WM_HINTS property (see section 14.1.6).
@@ -281,7 +281,7 @@ which sets the WM_HINTS property (see section 14.1.6).
 If the argv argument is non-NULL,
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 set the WM_COMMAND property from argv and argc.
 An argc of zero indicates a zero-length command.
 .LP
@@ -292,7 +292,7 @@ The hostname of the machine is stored using
 If the class_hints argument is non-NULL,
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 set the WM_CLASS property.
 If the res_name member in the 
 .ZN XClassHint
@@ -315,7 +315,7 @@ in the properties.
 For clients that need to process the property text in a locale,
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 set the WM_LOCALE_NAME property to be the name of the current locale.
 The name is assumed to be in the Host Portable Character Encoding
 and is converted to STRING for storage in the property.
@@ -323,7 +323,7 @@ and is converted to STRING for storage in the property.
 .ZN XSetWMProperties ,
 .ZN XmbSetWMProperties
 and
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 can generate
 .ZN BadAlloc
 and
@@ -331,7 +331,7 @@ and
 errors.
 .LP
 The function
-.ZN Xutf8SetWMProperties
+.ZN XFree86utf8SetWMProperties
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man
index 8eb608a1..425c8069 100644
--- a/man/XStringListToTextProperty.man
+++ b/man/XStringListToTextProperty.man
@@ -42,7 +42,7 @@
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
 .\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.6 2003/11/23 05:40:33 dawes Exp $
-.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
+.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.4 2003-12-08 21:35:37 kaleb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -216,7 +216,7 @@ The
 .ZN XFreeStringList 
 function releases memory allocated by 
 .ZN XmbTextPropertyToTextList ,
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 and
 .ZN XTextPropertyToStringList
 and the missing charset list allocated by 
diff --git a/man/XmbDrawImageString.man b/man/XmbDrawImageString.man
index 80725e97..61abeac7 100644
--- a/man/XmbDrawImageString.man
+++ b/man/XmbDrawImageString.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XmbDrawImageString 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set
+XmbDrawImageString, XwcDrawImageString, XFree86utf8DrawImageString \- draw image text using a single font set
 .SH SYNTAX
 .HP
 void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
@@ -154,7 +154,7 @@ void XwcDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
 XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
 wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^); 
 .HP
-void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+void XFree86utf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
 XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
 *\fIstring\fP\^, int \fInum_bytes\fP\^); 
 .SH ARGUMENTS
@@ -183,14 +183,14 @@ The
 .ZN XmbDrawImageString ,
 .ZN XwcDrawImageString
 and
-.ZN Xutf8DrawImageString
+.ZN XFree86utf8DrawImageString
 functions fill a destination rectangle with the background pixel defined
 in the GC and then paint the text with the foreground pixel.
 The filled rectangle is the rectangle returned to overall_logical_return by
 .ZN XmbTextExtents ,
 .ZN XwcTextExtents
 or 
-.ZN Xutf8TextExtents
+.ZN XFree86utf8TextExtents
 for the same text and 
 .ZN XFontSet .
 .LP
@@ -202,7 +202,7 @@ with the default string returned by
 The behavior for an invalid codepoint is undefined.
 .LP
 The function
-.ZN Xutf8TextExtents
+.ZN XFree86utf8TextExtents
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbDrawString.man b/man/XmbDrawString.man
index f3e52634..21410cbb 100644
--- a/man/XmbDrawString.man
+++ b/man/XmbDrawString.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XmbDrawString 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set
+XmbDrawString, XwcDrawString, XFree86utf8DrawString \- draw text using a single font set
 .SH SYNTAX
 .HP
 void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
@@ -154,7 +154,7 @@ void XwcDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
 \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t
 *\fIstring\fP\^, int \fInum_wchars\fP\^); 
 .HP
-void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+void XFree86utf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
 XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
 *\fIstring\fP\^, int \fInum_bytes\fP\^);
 .SH ARGUMENTS
@@ -183,7 +183,7 @@ The
 .ZN XmbDrawString ,
 .ZN XwcDrawString
 and
-.ZN Xutf8DrawString
+.ZN XFree86utf8DrawString
 functions draw the specified text with the foreground pixel.
 When the 
 .ZN XFontSet
@@ -193,7 +193,7 @@ with the default string returned by
 The behavior for an invalid codepoint is undefined.
 .LP
 The function
-.ZN Xutf8DrawString
+.ZN XFree86utf8DrawString
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
index fe3740c3..06ba844a 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.5 2003/11/23 05:40:33 dawes Exp $
-.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
+.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.4 2003-12-08 21:35:37 kaleb Exp $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -144,7 +144,7 @@
 .ny0
 .TH XmbDrawText 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets 
+XmbDrawText, XwcDrawText, XFree86utf8DrawText \- draw text using multiple font sets 
 .SH SYNTAX
 .HP
 void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
@@ -155,7 +155,7 @@ void XwcDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
 \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int
 \fInitems\fP\^); 
 .HP
-void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+void XFree86utf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
 \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);
 .SH ARGUMENTS
 .IP \fId\fP 1i
@@ -179,7 +179,7 @@ The
 .ZN XmbDrawText ,
 .ZN XwcDrawText 
 and 
-.ZN Xutf8DrawText 
+.ZN XFree86utf8DrawText 
 functions allow complex spacing and font set shifts between text strings.
 Each text item is processed in turn, with the origin of a text
 element advanced in the primary draw direction by the escapement of the
@@ -197,16 +197,16 @@ will not be drawn.
 .ZN XmbDrawText ,
 .ZN XwcDrawText
 and
-.ZN Xutf8DrawText
+.ZN XFree86utf8DrawText
 do not perform any context-dependent rendering between text segments.
 Clients may compute the drawing metrics by passing each text segment to
 .ZN XmbTextExtents ,
 .ZN XwcTextExtents ,
-.ZN Xutf8TextExtents
+.ZN XFree86utf8TextExtents
 or
 .ZN XmbTextPerCharExtents ,
 .ZN XwcTextPerCharExtents .
-.ZN Xutf8TextPerCharExtents .
+.ZN XFree86utf8TextPerCharExtents .
 When the 
 .ZN XFontSet
 has missing charsets, each unavailable character is drawn 
@@ -215,7 +215,7 @@ with the default string returned by
 The behavior for an invalid codepoint is undefined.
 .LP
 The function
-.ZN Xutf8DrawText
+.ZN XFree86utf8DrawText
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbLookupString.man b/man/XmbLookupString.man
index 32b09186..30e43478 100644
--- a/man/XmbLookupString.man
+++ b/man/XmbLookupString.man
@@ -145,7 +145,7 @@
 '\" t
 .TH XmbLookupString 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method
+XmbLookupString, XwcLookupString, XFree86utf8LookupString \- obtain composed input from an input method
 .SH SYNTAX
 .HP
 int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
@@ -156,7 +156,7 @@ int XwcLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP\^,
 wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym
 *\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
 .HP
-int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+int XFree86utf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
 *\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
 *\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
 .SH ARGUMENTS
@@ -182,7 +182,7 @@ The
 .ZN XmbLookupString ,
 .ZN XwcLookupString
 and
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 functions return the string from the input method specified
 in the buffer_return argument.
 If no string is returned,
@@ -196,7 +196,7 @@ the KeySym value does not necessarily correspond to the string returned.
 .LP
 .ZN XmbLookupString
 and
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 return the length of the string in bytes, and
 .ZN XwcLookupString
 returns the length of the string in characters.
@@ -206,7 +206,7 @@ and
 .ZN XwcLookupString
 return text in the encoding of the locale bound to the input method
 of the specified input context, and
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 returns text in UTF-8 encoding.
 .LP
 Each string returned by
@@ -223,7 +223,7 @@ events to
 .ZN XmbLookupString ,
 .ZN XwcLookupString
 and
-.ZN Xutf8LookupString .
+.ZN XFree86utf8LookupString .
 Their behavior when a client passes a 
 .ZN KeyRelease
 event is undefined.
@@ -242,7 +242,7 @@ T}	T{
 The input string to be returned is too large for the supplied buffer_return.
 The required size (for
 .ZN XmbLookupString ,
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 in bytes; for
 .ZN XwcLookupString
 in characters) is returned as the value of the function,
@@ -289,18 +289,18 @@ It does not make any difference if the input context passed as an argument to
 .ZN XmbLookupString ,
 .ZN XwcLookupString
 and
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 is the one currently in possession of the focus or not.
 Input may have been composed within an input context before it lost the focus,
 and that input may be returned on subsequent calls to
 .ZN XmbLookupString ,
 .ZN XwcLookupString
 or
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 even though it does not have any more keyboard focus.
 .LP
 The function
-.ZN Xutf8LookupString
+.ZN XFree86utf8LookupString
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbResetIC.man b/man/XmbResetIC.man
index cb249e16..0f857b57 100644
--- a/man/XmbResetIC.man
+++ b/man/XmbResetIC.man
@@ -143,14 +143,14 @@
 .ny0
 .TH XmbResetIC 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context
+XmbResetIC, XwcResetIC, XFree86utf8ResetIC \- reset the state of an input context
 .SH SYNTAX
 .HP
 char *XmbResetIC\^(\^XIC \fIic\fP\^); 
 .HP
 wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^); 
 .HP
-char *Xutf8ResetIC\^(\^XIC \fIic\fP\^); 
+char *XFree86utf8ResetIC\^(\^XIC \fIic\fP\^); 
 .SH ARGUMENTS
 .IP \fIic\fP 1i
 Specifies the input context.
@@ -162,7 +162,7 @@ is set to
 .ZN XmbResetIC ,
 .ZN XwcResetIC
 and
-.ZN Xutf8ResetIC
+.ZN XFree86utf8ResetIC
 reset an input context to its initial state;
 when
 .ZN XNResetState
@@ -176,7 +176,7 @@ Calling
 .ZN XmbResetIC ,
 .ZN XwcResetIC
 or
-.ZN Xutf8ResetIC
+.ZN XFree86utf8ResetIC
 does not change the focus.
 .LP
 The return value of
@@ -186,7 +186,7 @@ The return value of
 .ZN XwcResetIC
 is its current preedit string as a wide character string.
 The return value of
-.ZN Xutf8ResetIC
+.ZN XFree86utf8ResetIC
 is its current preedit string as an UTF-8 string.
 If there is any preedit text drawn or visible to the user,
 then these procedures must return a non-NULL string.
@@ -198,7 +198,7 @@ The client should free the returned string by calling
 .ZN XFree .
 .LP
 The function
-.ZN Xutf8ResetIC
+.ZN XFree86utf8ResetIC
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbTextEscapement.man b/man/XmbTextEscapement.man
index 61d1256e..ce07f7ba 100644
--- a/man/XmbTextEscapement.man
+++ b/man/XmbTextEscapement.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XmbTextEscapement 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
+XmbTextEscapement, XwcTextEscapement, XFree86utf8TextEscapement \- obtain the escapement of text
 .SH SYNTAX
 .HP
 int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
@@ -152,7 +152,7 @@ int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
 int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
 int \fInum_wchars\fP\^); 
 .HP
-int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, 
+int XFree86utf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, 
 int \fInum_bytes\fP\^); 
 .SH ARGUMENTS
 .IP \fIfont_set\fP 1i
@@ -168,7 +168,7 @@ The
 .ZN XmbTextEscapement ,
 .ZN XwcTextEscapement
 and
-.ZN Xutf8TextEscapement
+.ZN XFree86utf8TextEscapement
 functions return the escapement in pixels of the specified string as a value,
 using the fonts loaded for the specified font set.
 The escapement is the distance in pixels in the primary draw
@@ -180,7 +180,7 @@ Regardless of the character rendering order,
 the escapement is always positive.
 .LP
 The function
-.ZN Xutf8TextEscapement
+.ZN XFree86utf8TextEscapement
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbTextExtents.man b/man/XmbTextExtents.man
index d329148b..aa5d89ee 100644
--- a/man/XmbTextExtents.man
+++ b/man/XmbTextExtents.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XmbTextExtents 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
+XmbTextExtents, XwcTextExtents, XFree86utf8TextExtents \- compute text extents
 .SH SYNTAX
 .HP
 int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
@@ -154,7 +154,7 @@ int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^, int
 \fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
 *\fIoverall_logical_return\fP\^); 
 .HP
-int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+int XFree86utf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
 \fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
 *\fIoverall_logical_return\fP\^);
 .SH ARGUMENTS
@@ -176,7 +176,7 @@ The
 .ZN XmbTextExtents ,
 .ZN XwcTextExtents
 and
-.ZN Xutf8TextExtents
+.ZN XFree86utf8TextExtents
 functions set the components of the specified overall_ink_return and
 overall_logical_return
 arguments to the overall bounding box of the string's image
@@ -185,7 +185,7 @@ They return the value returned by
 .ZN XmbTextEscapement ,
 .ZN XwcTextEscapement
 or
-.ZN Xutf8TextEscapement .
+.ZN XFree86utf8TextEscapement .
 These metrics are relative to the drawing origin of the string,
 using the fonts loaded for the specified font set.
 .LP
@@ -216,7 +216,7 @@ so that the metrics represent the text as it will actually be drawn.
 The behavior for an invalid codepoint is undefined.
 .LP
 The function
-.ZN Xutf8TextExtents
+.ZN XFree86utf8TextExtents
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index 41b01940..860fe494 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.7 2003/11/23 05:40:33 dawes Exp $
-.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
+.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.4 2003-12-08 21:35:37 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -146,7 +146,7 @@
 '\" t
 .TH XmbTextListToTextProperty 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbTextListToTextProperty, XwcTextListToTextProperty, Xutf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, Xutf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
+XmbTextListToTextProperty, XwcTextListToTextProperty, XFree86utf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, XFree86utf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
 .SH SYNTAX
 .HP
 int XmbTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
@@ -157,7 +157,7 @@ int XwcTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, wchar_t
 **\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
 XTextProperty *\fItext_prop_return\fP\^); 
 .HP
-int Xutf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+int XFree86utf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
 **\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
 XTextProperty *\fItext_prop_return\fP\^); 
 .HP
@@ -168,7 +168,7 @@ int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
 *\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int
 *\fIcount_return\fP\^); 
 .HP
-int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+int XFree86utf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
 *\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
 .HP
 void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^); 
@@ -203,7 +203,7 @@ The
 .ZN XmbTextListToTextProperty ,
 .ZN XwcTextListToTextProperty
 and
-.ZN Xutf8TextListToTextProperty
+.ZN XFree86utf8TextListToTextProperty
 functions set the specified 
 .ZN XTextProperty
 value to a set of null-separated elements representing the concatenation
@@ -213,7 +213,7 @@ strings must be given in the current locale encoding (for
 and
 .ZN XwcTextListToTextProperty ),
 or in UTF-8 encoding (for
-.ZN Xutf8TextListToTextProperty ).
+.ZN XFree86utf8TextListToTextProperty ).
 .LP
 The functions set the encoding field of text_prop_return to an
 .ZN Atom 
@@ -228,7 +228,7 @@ or
 is specified,
 this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.
 If the style
-.ZN XUTF8StringStyle
+.ZN XFree86Utf8StringStyle
 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
@@ -276,7 +276,7 @@ The
 .ZN XmbTextPropertyToTextList ,
 .ZN XwcTextPropertyToTextList
 and 
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 functions return a list of text strings representing the
 null-separated elements of the specified
 .ZN XTextProperty
@@ -286,7 +286,7 @@ structure. The returned strings are encoded using the current locale encoding
 and
 .ZN XwcTextPropertyToTextList )
 or in UTF-8 (for
-.ZN Xutf8TextPropertyToTextList ).
+.ZN XFree86utf8TextPropertyToTextList ).
 The data in text_prop must be format 8.
 .LP
 Multiple elements of the property (for example, the strings in a disjoint
@@ -298,7 +298,7 @@ If insufficient memory is available for the list and its elements,
 .ZN XmbTextPropertyToTextList ,
 .ZN XwcTextPropertyToTextList
 and
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 return 
 .ZN XNoMemory .
 If the current locale is not supported,
@@ -324,7 +324,7 @@ Otherwise,
 .ZN XmbTextPropertyToTextList ,
 .ZN XwcTextPropertyToTextList
 and
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 return the list of null-terminated text strings to list_return
 and the number of text strings to count_return.
 .LP
@@ -340,14 +340,14 @@ Otherwise,
 .ZN XmbTextPropertyToTextList ,
 .ZN XwcTextPropertyToTextList
 and
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 return 
 .ZN Success .
 .LP
 To free the storage for the list and its contents returned by
 .ZN XmbTextPropertyToTextList
 or
-.ZN Xutf8TextPropertyToTextList ,
+.ZN XFree86utf8TextPropertyToTextList ,
 use
 .ZN XFreeStringList .
 To free the storage for the list and its contents returned by
@@ -391,9 +391,9 @@ It may be freed after the current locale is changed.
 Until freed, it will not be modified by Xlib.
 .LP
 The functions
-.ZN Xutf8TextListToTextProperty
+.ZN XFree86utf8TextListToTextProperty
 and
-.ZN Xutf8TextPropertyToTextList
+.ZN XFree86utf8TextPropertyToTextList
 are an XFree86 extension introduced in XFree86 4.0.2. Their presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
@@ -449,7 +449,7 @@ typedef enum {
 	XCompoundTextStyle,	/\(** COMPOUND_TEXT */
 	XTextStyle,		/\(** text in owner's encoding (current locale) */
 	XStdICCTextStyle,	/\(** STRING, else COMPOUND_TEXT */
-	XUTF8StringStyle	/\(** UTF8_STRING */
+	XFree86Utf8StringStyle	/\(** UTF8_STRING */
 } XICCEncodingStyle;
 .De
 .SH "SEE ALSO"
diff --git a/man/XmbTextPerCharExtents.man b/man/XmbTextPerCharExtents.man
index 084da3ea..a53852d9 100644
--- a/man/XmbTextPerCharExtents.man
+++ b/man/XmbTextPerCharExtents.man
@@ -143,7 +143,7 @@
 .ny0
 .TH XmbTextPerCharExtents 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string
+XmbTextPerCharExtents, XwcTextPerCharExtents, XFree86utf8TextPerCharExtents \- obtain per-character information for a text string
 .SH SYNTAX
 .HP
 Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
@@ -158,7 +158,7 @@ Status XwcTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t
 \fIarray_size\fP\^, int *\fInum_chars_return\fP\^, XRectangle
 *\fIoverall_ink_return\fP\^, XRectangle *\fIoverall_logical_return\fP\^); 
 .HP
-Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+Status XFree86utf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
 *\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
 XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
 *\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
@@ -191,7 +191,7 @@ The
 .ZN XmbTextPerCharExtents ,
 .ZN XwcTextPerCharExtents
 and
-.ZN Xutf8TextPerCharExtents
+.ZN XFree86utf8TextPerCharExtents
 functions return the text dimensions of each character of the specified text,
 using the fonts loaded for the specified font set.
 Each successive element of ink_array_return and logical_array_return
@@ -237,16 +237,16 @@ If the overall_ink_return or overall_logical_return argument is non-NULL,
 .ZN XmbTextPerCharExtents ,
 .ZN XwcTextPerCharExtents
 and 
-.ZN Xutf8TextPerCharExtents
+.ZN XFree86utf8TextPerCharExtents
 return the maximum extent of the string's metrics to overall_ink_return
 or overall_logical_return, as returned by 
 .ZN XmbTextExtents ,
 .ZN XwcTextExtents
 or 
-.ZN Xutf8TextExtents .
+.ZN XFree86utf8TextExtents .
 .LP
 The function
-.ZN Xutf8TextPerCharExtents
+.ZN XFree86utf8TextPerCharExtents
 is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .