merge XFree86 4.3.99.901 (RC1) from vendor branch

52 files changed, 522 insertions, 449 deletions

diff --git a/man/XAddHost.man b/man/XAddHost.man
index a4e5b27c..92190a70 100644
--- a/man/XAddHost.man
+++ b/man/XAddHost.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.3 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.4 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -298,9 +299,9 @@ structure contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int family;	/* for example FamilyInternet */
-	int length;	/* length of address, in bytes */
-	char *address;	/* pointer to where to find the address */
+	int family;	/\(** for example FamilyInternet */
+	int length;	/\(** length of address, in bytes */
+	char *address;	/\(** pointer to where to find the address */
 } XHostAddress;
 .De
 .LP
diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man
index 64049e40..e476a920 100644
--- a/man/XAllocSizeHints.man
+++ b/man/XAllocSizeHints.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.6 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XAllocSizeHints.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -323,7 +324,7 @@ The
 .ZN XSizeHints
 structure contains:
 .LP
-/* Size hints mask bits */
+/\(** Size hints mask bits */
 .TS
 lw(.5i) lw(1.1i) lw(1.5i) lw(3.1i).
 T{
@@ -333,7 +334,7 @@ T}	T{
 T}	T{
 (1L << 0)
 T}	T{
-/* user specified x, y */
+/\(** user specified x, y */
 T}
 T{
 \&#define
@@ -342,7 +343,7 @@ T}	T{
 T}	T{
 (1L << 1)
 T}	T{
-/* user specified width, height */
+/\(** user specified width, height */
 T}
 T{
 \&#define
@@ -351,7 +352,7 @@ T}	T{
 T}	T{
 (1L << 2)
 T}	T{
-/* program specified position */
+/\(** program specified position */
 T}
 T{
 \&#define
@@ -360,7 +361,7 @@ T}	T{
 T}	T{
 (1L << 3)
 T}	T{
-/* program specified size */
+/\(** program specified size */
 T}
 T{
 \&#define
@@ -369,7 +370,7 @@ T}	T{
 T}	T{
 (1L << 4)
 T}	T{
-/* program specified minimum size */
+/\(** program specified minimum size */
 T}
 T{
 \&#define
@@ -378,7 +379,7 @@ T}	T{
 T}	T{
 (1L << 5)
 T}	T{
-/* program specified maximum size */
+/\(** program specified maximum size */
 T}
 T{
 \&#define
@@ -387,7 +388,7 @@ T}	T{
 T}	T{
 (1L << 6)
 T}	T{
-/* program specified resize increments */
+/\(** program specified resize increments */
 T}
 T{
 \&#define
@@ -396,7 +397,7 @@ T}	T{
 T}	T{
 (1L << 7)
 T}	T{
-/* program specified min and max aspect ratios */
+/\(** program specified min and max aspect ratios */
 T}
 T{
 \&#define
@@ -429,22 +430,22 @@ T}
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
-/* Values */
+/\(** Values */
 
 typedef struct {
-	long flags;	/* marks which fields in this structure are defined */
-	int x, y;	/* Obsolete */
-	int width, height;	/* Obsolete */
+	long flags;	/\(** marks which fields in this structure are defined */
+	int x, y;	/\(** Obsolete */
+	int width, height;	/\(** Obsolete */
 	int min_width, min_height;
 	int max_width, max_height;
 	int width_inc, height_inc;
 	struct {
-	       int x;	/* numerator */
-	       int y;	/* denominator */
+	       int x;	/\(** numerator */
+	       int y;	/\(** denominator */
 	} min_aspect, max_aspect;
 	int base_width, base_height;
 	int win_gravity;
-	/* this structure may be extended in the future */
+	/\(** this structure may be extended in the future */
 } XSizeHints;
 .De
 .LP
diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man
index f71fc5b1..668b0f0d 100644
--- a/man/XAllocStandardColormap.man
+++ b/man/XAllocStandardColormap.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.6 2003/11/23 05:40:32 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XAllocStandardColormap.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -283,7 +284,7 @@ The
 .ZN XStandardColormap
 structure contains:
 .LP
-/* Hints */
+/\(** Hints */
 .TS
 lw(.5i) lw(2i) lw(1i).
 T{
@@ -294,7 +295,7 @@ T}	T{
 ( (XID) 1L);
 T}
 .TE
-/* Values */
+/\(** Values */
 .IN "XStandardColormap" "" "@DEF@"
 .Ds 0
 .TA .5i 2.5i
diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man
index e024c703..9f522bd9 100644
--- a/man/XAllocWMHints.man
+++ b/man/XAllocWMHints.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XAllocWMHints.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -217,7 +218,7 @@ The
 .ZN XWMHints
 structure contains:
 .LP
-/* Window manager hints mask bits */
+/\(** Window manager hints mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(2.5i).
 T{
@@ -292,19 +293,19 @@ T}
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
-/* Values */
+/\(** Values */
 
 typedef struct {
-	long flags;	/* marks which fields in this structure are defined */
-	Bool input;	/* does this application rely on the window manager to
+	long flags;	/\(** marks which fields in this structure are defined */
+	Bool input;	/\(** does this application rely on the window manager to
 			get keyboard input? */
-	int initial_state;	/* see below */
-	Pixmap icon_pixmap;	/* pixmap to be used as icon */
-	Window icon_window;	/* window to be used as icon */
-	int icon_x, icon_y;	/* initial position of icon */
-	Pixmap icon_mask;	/* pixmap to be used as mask for icon_pixmap */
-	XID window_group;	/* id of related window group */
-	/* this structure may be extended in the future */
+	int initial_state;	/\(** see below */
+	Pixmap icon_pixmap;	/\(** pixmap to be used as icon */
+	Window icon_window;	/\(** window to be used as icon */
+	int icon_x, icon_y;	/\(** initial position of icon */
+	Pixmap icon_mask;	/\(** pixmap to be used as mask for icon_pixmap */
+	XID window_group;	/\(** id of related window group */
+	/\(** this structure may be extended in the future */
 } XWMHints;
 .De
 .LP
@@ -358,7 +359,7 @@ T}	T{
 T}	T{
 1
 T}	T{
-/* most applications start this way */
+/\(** most applications start this way */
 T}
 T{
 \&#define
@@ -367,7 +368,7 @@ T}	T{
 T}	T{
 3
 T}	T{
-/* application wants to start as an icon */
+/\(** application wants to start as an icon */
 T}
 .TE
 The icon_mask specifies which pixels of the icon_pixmap should be used as the
diff --git a/man/XAnyEvent.man b/man/XAnyEvent.man
index 2560d600..ac95d41c 100644
--- a/man/XAnyEvent.man
+++ b/man/XAnyEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XAnyEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XAnyEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XAnyEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,9 +153,9 @@ have the following common members:
 .ta .5i 3i
 typedef struct {
 	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 } XAnyEvent;
 .De
@@ -185,7 +186,7 @@ structure is a union of the individual structures declared for each event type:
 .TA .5i 3i
 .ta .5i 3i
 typedef union _XEvent {
-	int type;	/* must not be changed */
+	int type;	/\(** must not be changed */
 	XAnyEvent xany;
 	XKeyEvent xkey;
 	XButtonEvent xbutton;
diff --git a/man/XButtonEvent.man b/man/XButtonEvent.man
index 929d4222..652c4bf3 100644
--- a/man/XButtonEvent.man
+++ b/man/XButtonEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XButEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XButEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XButtonEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -157,19 +158,19 @@ events contain:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ButtonPress or ButtonRelease */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* ``event'' window it is reported relative to */
-	Window root;	/* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;	/* milliseconds */
-	int x, y;	/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int button;	/* detail */
-	Bool same_screen;	/* same screen flag */
+	int type;	/\(** ButtonPress or ButtonRelease */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** ``event'' window it is reported relative to */
+	Window root;	/\(** root window that the event occurred on */
+	Window subwindow;	/\(** child window */
+	Time time;	/\(** milliseconds */
+	int x, y;	/\(** pointer x, y coordinates in event window */
+	int x_root, y_root;	/\(** coordinates relative to root */
+	unsigned int state;	/\(** key or button mask */
+	unsigned int button;	/\(** detail */
+	Bool same_screen;	/\(** same screen flag */
 } XButtonEvent;
 typedef XButtonEvent XButtonPressedEvent;
 typedef XButtonEvent XButtonReleasedEvent;
@@ -179,19 +180,19 @@ typedef XButtonEvent XButtonReleasedEvent;
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* KeyPress or KeyRelease */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* ``event'' window it is reported relative to */
-	Window root;	/* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;	/* milliseconds */
-	int x, y;	/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int keycode;	/* detail */
-	Bool same_screen;	/* same screen flag */
+	int type;	/\(** KeyPress or KeyRelease */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** ``event'' window it is reported relative to */
+	Window root;	/\(** root window that the event occurred on */
+	Window subwindow;	/\(** child window */
+	Time time;	/\(** milliseconds */
+	int x, y;	/\(** pointer x, y coordinates in event window */
+	int x_root, y_root;	/\(** coordinates relative to root */
+	unsigned int state;	/\(** key or button mask */
+	unsigned int keycode;	/\(** detail */
+	Bool same_screen;	/\(** same screen flag */
 } XKeyEvent;
 typedef XKeyEvent XKeyPressedEvent;
 typedef XKeyEvent XKeyReleasedEvent;
@@ -201,19 +202,19 @@ typedef XKeyEvent XKeyReleasedEvent;
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* MotionNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* ``event'' window reported relative to */
-	Window root;	/* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;	/* milliseconds */
-	int x, y;	/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	char is_hint;	/* detail */
-	Bool same_screen;	/* same screen flag */
+	int type;	/\(** MotionNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** ``event'' window reported relative to */
+	Window root;	/\(** root window that the event occurred on */
+	Window subwindow;	/\(** child window */
+	Time time;	/\(** milliseconds */
+	int x, y;	/\(** pointer x, y coordinates in event window */
+	int x_root, y_root;	/\(** coordinates relative to root */
+	unsigned int state;	/\(** key or button mask */
+	char is_hint;	/\(** detail */
+	Bool same_screen;	/\(** same screen flag */
 } XMotionEvent;
 typedef XMotionEvent XPointerMovedEvent;
 .De
diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man
index 37935d7b..d016fd28 100644
--- a/man/XChangeKeyboardControl.man
+++ b/man/XChangeKeyboardControl.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XChangeKeyboardControl.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -250,7 +251,7 @@ The
 structure contains:
 .LP
 .LP
-/* Mask bits for ChangeKeyboardControl */
+/\(** Mask bits for ChangeKeyboardControl */
 .TS
 lw(.5i) lw(2.5i) lw(.8i).
 T{
@@ -314,7 +315,7 @@ T}
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
-/* Values */
+/\(** Values */
 
 typedef struct {
 	int key_click_percent;
@@ -322,9 +323,9 @@ typedef struct {
 	int bell_pitch;
 	int bell_duration;
 	int led;
-	int led_mode;	/* LedModeOn, LedModeOff */
+	int led_mode;	/\(** LedModeOn, LedModeOff */
 	int key;
-	int auto_repeat_mode;	/* AutoRepeatModeOff, AutoRepeatModeOn, 
+	int auto_repeat_mode;	/\(** AutoRepeatModeOff, AutoRepeatModeOn, 
                             	AutoRepeatModeDefault */
 } XKeyboardControl;
 .De
diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man
index 7773e674..2f45e7d0 100644
--- a/man/XChangeKeyboardMapping.man
+++ b/man/XChangeKeyboardMapping.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XChangeKeyboardMapping.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -427,8 +428,8 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	int max_keypermod;	/* This server's max number of keys per modifier */
-	KeyCode *modifiermap;	/* An 8 by max_keypermod array of the modifiers */
+	int max_keypermod;	/\(** This server's max number of keys per modifier */
+	KeyCode *modifiermap;	/\(** An 8 by max_keypermod array of the modifiers */
 } XModifierKeymap;
 .De
 .SH DIAGNOSTICS
diff --git a/man/XCirculateEvent.man b/man/XCirculateEvent.man
index a5327157..a9f02fff 100644
--- a/man/XCirculateEvent.man
+++ b/man/XCirculateEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCirEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCirEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCirculateEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,13 +153,13 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* CirculateNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** CirculateNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
-	int place;	/* PlaceOnTop, PlaceOnBottom */
+	int place;	/\(** PlaceOnTop, PlaceOnBottom */
 } XCirculateEvent;
 .De
 .LP
diff --git a/man/XCirculateRequestEvent.man b/man/XCirculateRequestEvent.man
index f30667cf..9aa9a20a 100644
--- a/man/XCirculateRequestEvent.man
+++ b/man/XCirculateRequestEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCirREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCirREven.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCirculateRequestEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,13 +153,13 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* CirculateRequest */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** CirculateRequest */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window parent;
 	Window window;
-	int place;	/* PlaceOnTop, PlaceOnBottom */
+	int place;	/\(** PlaceOnTop, PlaceOnBottom */
 } XCirculateRequestEvent;
 .De
 .LP
diff --git a/man/XClientMessageEvent.man b/man/XClientMessageEvent.man
index 6196ccc6..8e635181 100644
--- a/man/XClientMessageEvent.man
+++ b/man/XClientMessageEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCMEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCMEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XClientMessageEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 1i 3i
 .ta .5i 1i 3i
 typedef struct {
-	int type;	/* ClientMessage */
-	unsigned long serial;		/* # of last request processed by server */
-	Bool send_event;		/* true if this came from a SendEvent request */
-	Display *display;		/* Display the event was read from */
+	int type;	/\(** ClientMessage */
+	unsigned long serial;		/\(** # of last request processed by server */
+	Bool send_event;		/\(** true if this came from a SendEvent request */
+	Display *display;		/\(** Display the event was read from */
 	Window window;
 	Atom message_type;
 	int format;
diff --git a/man/XColormapEvent.man b/man/XColormapEvent.man
index e00a1c8c..cbd8f33f 100644
--- a/man/XColormapEvent.man
+++ b/man/XColormapEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCmpEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCmpEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XColormapEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,14 +153,14 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ColormapNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** ColormapNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
-	Colormap colormap;	/* colormap or None */
+	Colormap colormap;	/\(** colormap or None */
 	Bool new;
-	int state;	/* ColormapInstalled, ColormapUninstalled */
+	int state;	/\(** ColormapInstalled, ColormapUninstalled */
 } XColormapEvent;
 .De
 .LP
diff --git a/man/XConfigureEvent.man b/man/XConfigureEvent.man
index 1f63a1db..2f832b64 100644
--- a/man/XConfigureEvent.man
+++ b/man/XConfigureEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XConEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XConEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XConfigureEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ConfigureNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** ConfigureNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
 	int x, y;
diff --git a/man/XConfigureRequestEvent.man b/man/XConfigureRequestEvent.man
index 7a36e4c2..9dd214e7 100644
--- a/man/XConfigureRequestEvent.man
+++ b/man/XConfigureRequestEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XConREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XConREven.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XConfigureRequestEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,17 +153,17 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ConfigureRequest */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** ConfigureRequest */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window parent;
 	Window window;
 	int x, y;
 	int width, height;
 	int border_width;
 	Window above;
-	int detail;	/* Above, Below, TopIf, BottomIf, Opposite */
+	int detail;	/\(** Above, Below, TopIf, BottomIf, Opposite */
 	unsigned long value_mask;
 } XConfigureRequestEvent;
 .De
diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man
index e3855462..b273e5e9 100644
--- a/man/XConfigureWindow.man
+++ b/man/XConfigureWindow.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.6 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XConfigureWindow.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -333,7 +334,7 @@ The
 structure contains:
 .LP
 .LP
-/* Configure window value mask bits */
+/\(** Configure window value mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(.8i).
 T{
@@ -390,7 +391,7 @@ T}
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* Values */
+/\(** Values */
 
 typedef struct {
 	int x, y;
diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man
index 789ea90a..03f7bcd4 100644
--- a/man/XCreateColormap.man
+++ b/man/XCreateColormap.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCreateColormap.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -312,9 +313,9 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	unsigned long pixel;	/* pixel value */
-	unsigned short red, green, blue;	/* rgb values */
-	char flags;	/* DoRed, DoGreen, DoBlue */	
+	unsigned long pixel;	/\(** pixel value */
+	unsigned short red, green, blue;	/\(** rgb values */
+	char flags;	/\(** DoRed, DoGreen, DoBlue */	
 	char pad;
 } XColor;
 .De
diff --git a/man/XCreateGC.man b/man/XCreateGC.man
index 08bf3649..a3cd7f43 100644
--- a/man/XCreateGC.man
+++ b/man/XCreateGC.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.6 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.7 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCreateGC.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -310,7 +311,7 @@ The
 structure contains:
 .LP
 .LP
-/* GC attribute value mask bits */
+/\(** GC attribute value mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(.75i).
 T{
@@ -479,31 +480,31 @@ T}
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* Values */
+/\(** Values */
 
 typedef struct {
-	int function;	/* logical operation */
-	unsigned long plane_mask;	/* plane mask */
-	unsigned long foreground;	/* foreground pixel */
-	unsigned long background;	/* background pixel */
-	int line_width;	/* line width (in pixels) */
-	int line_style;	/* LineSolid, LineOnOffDash, LineDoubleDash */
-	int cap_style;	/* CapNotLast, CapButt, CapRound, CapProjecting */
-	int join_style;	/* JoinMiter, JoinRound, JoinBevel */
-	int fill_style;	/* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
-	int fill_rule;	/* EvenOddRule, WindingRule */
-	int arc_mode;	/* ArcChord, ArcPieSlice */
-	Pixmap tile;	/* tile pixmap for tiling operations */
-	Pixmap stipple;	/* stipple 1 plane pixmap for stippling */
-	int ts_x_origin;	/* offset for tile or stipple operations */
+	int function;	/\(** logical operation */
+	unsigned long plane_mask;	/\(** plane mask */
+	unsigned long foreground;	/\(** foreground pixel */
+	unsigned long background;	/\(** background pixel */
+	int line_width;	/\(** line width (in pixels) */
+	int line_style;	/\(** LineSolid, LineOnOffDash, LineDoubleDash */
+	int cap_style;	/\(** CapNotLast, CapButt, CapRound, CapProjecting */
+	int join_style;	/\(** JoinMiter, JoinRound, JoinBevel */
+	int fill_style;	/\(** FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
+	int fill_rule;	/\(** EvenOddRule, WindingRule */
+	int arc_mode;	/\(** ArcChord, ArcPieSlice */
+	Pixmap tile;	/\(** tile pixmap for tiling operations */
+	Pixmap stipple;	/\(** stipple 1 plane pixmap for stippling */
+	int ts_x_origin;	/\(** offset for tile or stipple operations */
 	int ts_y_origin;
-	Font font;	/* default text font for text operations */
-	int subwindow_mode;	/* ClipByChildren, IncludeInferiors */
-	Bool graphics_exposures;	/* boolean, should exposures be generated */
-	int clip_x_origin;	/* origin for clipping */
+	Font font;	/\(** default text font for text operations */
+	int subwindow_mode;	/\(** ClipByChildren, IncludeInferiors */
+	Bool graphics_exposures;	/\(** boolean, should exposures be generated */
+	int clip_x_origin;	/\(** origin for clipping */
 	int clip_y_origin;
-	Pixmap clip_mask;	/* bitmap clipping; other calls for rects */
-	int dash_offset;	/* patterned/dashed line information */
+	Pixmap clip_mask;	/\(** bitmap clipping; other calls for rects */
+	int dash_offset;	/\(** patterned/dashed line information */
 	char dashes;
 } XGCValues;
 .De
diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man
index f9cd6b4b..1a1168fa 100644
--- a/man/XCreateWindow.man
+++ b/man/XCreateWindow.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.6 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -318,7 +319,7 @@ The
 structure contains:
 .LP
 .LP
-/* Window attribute value mask bits */
+/\(** Window attribute value mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(.8i).
 T{
@@ -431,24 +432,24 @@ T}
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* Values */
+/\(** Values */
 
 typedef struct {
-	Pixmap background_pixmap;	/* background, None, or ParentRelative */
-	unsigned long background_pixel;	/* background pixel */
-	Pixmap border_pixmap;		/* border of the window or CopyFromParent */
-	unsigned long border_pixel;	/* border pixel value */
-	int bit_gravity;	/* one of bit gravity values */
-	int win_gravity;	/* one of the window gravity values */
-	int backing_store;	/* NotUseful, WhenMapped, Always */
-	unsigned long backing_planes;	/* planes to be preserved if possible */
-	unsigned long backing_pixel;	/* value to use in restoring planes */
-	Bool save_under;	/* should bits under be saved? (popups) */
-	long event_mask;	/* set of events that should be saved */
-	long do_not_propagate_mask;	/* set of events that should not propagate */
-	Bool override_redirect;	/* boolean value for override_redirect */
-	Colormap colormap;	/* color map to be associated with window */
-	Cursor cursor;		/* cursor to be displayed (or None) */
+	Pixmap background_pixmap;	/\(** background, None, or ParentRelative */
+	unsigned long background_pixel;	/\(** background pixel */
+	Pixmap border_pixmap;		/\(** border of the window or CopyFromParent */
+	unsigned long border_pixel;	/\(** border pixel value */
+	int bit_gravity;	/\(** one of bit gravity values */
+	int win_gravity;	/\(** one of the window gravity values */
+	int backing_store;	/\(** NotUseful, WhenMapped, Always */
+	unsigned long backing_planes;	/\(** planes to be preserved if possible */
+	unsigned long backing_pixel;	/\(** value to use in restoring planes */
+	Bool save_under;	/\(** should bits under be saved? (popups) */
+	long event_mask;	/\(** set of events that should be saved */
+	long do_not_propagate_mask;	/\(** set of events that should not propagate */
+	Bool override_redirect;	/\(** boolean value for override_redirect */
+	Colormap colormap;	/\(** color map to be associated with window */
+	Cursor cursor;		/\(** cursor to be displayed (or None) */
 } XSetWindowAttributes;
 .De
 .LP
diff --git a/man/XCreateWindowEvent.man b/man/XCreateWindowEvent.man
index ce3caf83..0e8cf7ac 100644
--- a/man/XCreateWindowEvent.man
+++ b/man/XCreateWindowEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCWEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCWEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCreateWindowEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,16 +153,16 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* CreateNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;	/* parent of the window */
-	Window window;	/* window id of window created */
-	int x, y;	/* window location */
-	int width, height;	/* size of window */
-	int border_width;	/* border width */
-	Bool override_redirect;	/* creation should be overridden */
+	int type;	/\(** CreateNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window parent;	/\(** parent of the window */
+	Window window;	/\(** window id of window created */
+	int x, y;	/\(** window location */
+	int width, height;	/\(** size of window */
+	int border_width;	/\(** border width */
+	Bool override_redirect;	/\(** creation should be overridden */
 } XCreateWindowEvent;
 .De
 .LP
diff --git a/man/XCrossingEvent.man b/man/XCrossingEvent.man
index 64a4e5a8..2c7c9138 100644
--- a/man/XCrossingEvent.man
+++ b/man/XCrossingEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XCroEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XCroEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XCrossingEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -154,25 +155,25 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* EnterNotify or LeaveNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* ``event'' window reported relative to */
-	Window root;	/* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;	/* milliseconds */
-	int x, y;	/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	int mode;	/* NotifyNormal, NotifyGrab, NotifyUngrab */
+	int type;	/\(** EnterNotify or LeaveNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** ``event'' window reported relative to */
+	Window root;	/\(** root window that the event occurred on */
+	Window subwindow;	/\(** child window */
+	Time time;	/\(** milliseconds */
+	int x, y;	/\(** pointer x, y coordinates in event window */
+	int x_root, y_root;	/\(** coordinates relative to root */
+	int mode;	/\(** NotifyNormal, NotifyGrab, NotifyUngrab */
 	int detail;
-		/*
+		/\(**
 	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 
 	 	* NotifyNonlinear,NotifyNonlinearVirtual
 	 	*/
-	Bool same_screen;	/* same screen flag */
-	Bool focus;	/* boolean focus */
-	unsigned int state;	/* key or button mask */
+	Bool same_screen;	/\(** same screen flag */
+	Bool focus;	/\(** boolean focus */
+	unsigned int state;	/\(** key or button mask */
 } XCrossingEvent;
 typedef XCrossingEvent XEnterWindowEvent;
 typedef XCrossingEvent XLeaveWindowEvent;
diff --git a/man/XDestroyWindowEvent.man b/man/XDestroyWindowEvent.man
index 34175feb..3c970bb3 100644
--- a/man/XDestroyWindowEvent.man
+++ b/man/XDestroyWindowEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDWEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XDWEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XDestroyWindowEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* DestroyNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** DestroyNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
 } XDestroyWindowEvent;
diff --git a/man/XDrawArc.man b/man/XDrawArc.man
index e26c4697..2a65788f 100644
--- a/man/XDrawArc.man
+++ b/man/XDrawArc.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XDrawArc.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -300,7 +301,7 @@ structure contains:
 typedef struct {
 	short x, y;
 	unsigned short width, height;
-	short angle1, angle2;             /* Degrees * 64 */
+	short angle1, angle2;             /\(** Degrees * 64 */
 } XArc;
 .De
 .LP
diff --git a/man/XDrawText.man b/man/XDrawText.man
index ad6b05b4..6541e36c 100644
--- a/man/XDrawText.man
+++ b/man/XDrawText.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.4 2003/04/28 22:17:54 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XDrawText.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -227,10 +228,10 @@ structures contain:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	char *chars;	/* pointer to string */
-	int nchars;	/* number of characters */
-	int delta;	/* delta between strings */
-	Font font;	/* Font to print it in, None don't change */
+	char *chars;	/\(** pointer to string */
+	int nchars;	/\(** number of characters */
+	int delta;	/\(** delta between strings */
+	Font font;	/\(** Font to print it in, None don't change */
 } XTextItem;
 .De
 .LP
@@ -238,10 +239,10 @@ typedef struct {
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	XChar2b *chars;	/* pointer to two-byte characters */
-	int nchars;	/* number of characters */
-	int delta;	/* delta between strings */
-	Font font;	/* font to print it in, None don't change */
+	XChar2b *chars;	/\(** pointer to two-byte characters */
+	int nchars;	/\(** number of characters */
+	int delta;	/\(** delta between strings */
+	Font font;	/\(** font to print it in, None don't change */
 } XTextItem16;
 .De
 .LP
diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man
index de7ad4c4..bd32cf80 100644
--- a/man/XErrorEvent.man
+++ b/man/XErrorEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XErrEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XErrEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XErrorEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -153,12 +154,12 @@ structure contains:
 .ta .5i 2.5i
 typedef struct {
 	int type;
-	Display *display;	/* Display the event was read from */
-	unsigned long serial;		/* serial number of failed request */
-	unsigned char error_code;	/* error code of failed request */
-	unsigned char request_code;	/* Major op-code of failed request */
-	unsigned char minor_code;	/* Minor op-code of failed request */
-	XID resourceid;		/* resource id */
+	Display *display;	/\(** Display the event was read from */
+	unsigned long serial;		/\(** serial number of failed request */
+	unsigned char error_code;	/\(** error code of failed request */
+	unsigned char request_code;	/\(** Major op-code of failed request */
+	unsigned char minor_code;	/\(** Minor op-code of failed request */
+	XID resourceid;		/\(** resource id */
 } XErrorEvent;
 .De
 .LP
diff --git a/man/XExposeEvent.man b/man/XExposeEvent.man
index 8816189a..9f1aa691 100644
--- a/man/XExposeEvent.man
+++ b/man/XExposeEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XExpEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XExpEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XExposeEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,14 +153,14 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* Expose */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** Expose */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	int x, y;
 	int width, height;
-	int count;	/* if nonzero, at least this many more */
+	int count;	/\(** if nonzero, at least this many more */
 } XExposeEvent;
 .De
 .LP
diff --git a/man/XFocusChangeEvent.man b/man/XFocusChangeEvent.man
index 7c2ac853..868b81a1 100644
--- a/man/XFocusChangeEvent.man
+++ b/man/XFocusChangeEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFCEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFCEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XFocusChangeEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -154,14 +155,14 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* FocusIn or FocusOut */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* window of event */
-	int mode;	/* NotifyNormal, NotifyGrab, NotifyUngrab */
+	int type;	/\(** FocusIn or FocusOut */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** window of event */
+	int mode;	/\(** NotifyNormal, NotifyGrab, NotifyUngrab */
 	int detail;
-		/*
+		/\(**
 	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 
 	 	* NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
 	 	* NotifyPointerRoot, NotifyDetailNone 
diff --git a/man/XFontSetExtents.man b/man/XFontSetExtents.man
index e08ad2d3..fa15a92f 100644
--- a/man/XFontSetExtents.man
+++ b/man/XFontSetExtents.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XFSExt.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XFSExt.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XFontSetExtents.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,8 +153,8 @@ structure contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	XRectangle max_ink_extent;	/* over all drawable characters */
-	XRectangle max_logical_extent;	/* over all drawable characters */
+	XRectangle max_ink_extent;	/\(** over all drawable characters */
+	XRectangle max_logical_extent;	/\(** over all drawable characters */
 } XFontSetExtents;
 .De
 .LP
diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man
index f65861cd..86b2920c 100644
--- a/man/XGetVisualInfo.man
+++ b/man/XGetVisualInfo.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XGetVisualInfo.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -208,7 +209,7 @@ The
 structure contains:
 .LP
 .LP
-/* Visual information mask bits */
+/\(** Visual information mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(.8i).
 T{
@@ -293,7 +294,7 @@ T}
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* Values */
+/\(** Values */
 
 typedef struct {
 	Visual *visual;
diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man
index 9a5067d8..18210bed 100644
--- a/man/XGetWindowAttributes.man
+++ b/man/XGetWindowAttributes.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.4 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XGetWindowAttributes.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -218,27 +219,27 @@ structure contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int x, y;	/* location of window */
-	int width, height;	/* width and height of window */
-	int border_width;	/* border width of window */
-	int depth;	/* depth of window */
-	Visual *visual;	/* the associated visual structure */
-	Window root;	/* root of screen containing window */
-	int class;	/* InputOutput, InputOnly*/
-	int bit_gravity;	/* one of the bit gravity values */
-	int win_gravity;	/* one of the window gravity values */
-	int backing_store;	/* NotUseful, WhenMapped, Always */
-	unsigned long backing_planes;	/* planes to be preserved if possible */
-	unsigned long backing_pixel;	/* value to be used when restoring planes */
-	Bool save_under;	/* boolean, should bits under be saved? */
-	Colormap colormap;	/* color map to be associated with window */
-	Bool map_installed;	/* boolean, is color map currently installed*/
-	int map_state;	/* IsUnmapped, IsUnviewable, IsViewable */
-	long all_event_masks;	/* set of events all people have interest in*/
-	long your_event_mask;	/* my event mask */
-	long do_not_propagate_mask;	/* set of events that should not propagate */
-	Bool override_redirect;	/* boolean value for override-redirect */
-	Screen *screen;	/* back pointer to correct screen */
+	int x, y;	/\(** location of window */
+	int width, height;	/\(** width and height of window */
+	int border_width;	/\(** border width of window */
+	int depth;	/\(** depth of window */
+	Visual *visual;	/\(** the associated visual structure */
+	Window root;	/\(** root of screen containing window */
+	int class;	/\(** InputOutput, InputOnly*/
+	int bit_gravity;	/\(** one of the bit gravity values */
+	int win_gravity;	/\(** one of the window gravity values */
+	int backing_store;	/\(** NotUseful, WhenMapped, Always */
+	unsigned long backing_planes;	/\(** planes to be preserved if possible */
+	unsigned long backing_pixel;	/\(** value to be used when restoring planes */
+	Bool save_under;	/\(** boolean, should bits under be saved? */
+	Colormap colormap;	/\(** color map to be associated with window */
+	Bool map_installed;	/\(** boolean, is color map currently installed*/
+	int map_state;	/\(** IsUnmapped, IsUnviewable, IsViewable */
+	long all_event_masks;	/\(** set of events all people have interest in*/
+	long your_event_mask;	/\(** my event mask */
+	long do_not_propagate_mask;	/\(** set of events that should not propagate */
+	Bool override_redirect;	/\(** boolean value for override-redirect */
+	Screen *screen;	/\(** back pointer to correct screen */
 } XWindowAttributes;
 .De
 .LP
diff --git a/man/XGraphicsExposeEvent.man b/man/XGraphicsExposeEvent.man
index 085d6d43..989e93cd 100644
--- a/man/XGraphicsExposeEvent.man
+++ b/man/XGraphicsExposeEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGEEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGEEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XGraphicsExposeEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -154,16 +155,16 @@ events contain:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* GraphicsExpose */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** GraphicsExpose */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Drawable drawable;
 	int x, y;
 	int width, height;
-	int count;	/* if nonzero, at least this many more */
-	int major_code;	/* core is CopyArea or CopyPlane */
-	int minor_code;	/* not defined in the core */
+	int count;	/\(** if nonzero, at least this many more */
+	int major_code;	/\(** core is CopyArea or CopyPlane */
+	int minor_code;	/\(** not defined in the core */
 } XGraphicsExposeEvent;
 .De
 .LP
@@ -171,13 +172,13 @@ typedef struct {
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* NoExpose */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** NoExpose */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Drawable drawable;
-	int major_code;	/* core is CopyArea or CopyPlane */
-	int minor_code;	/* not defined in the core */
+	int major_code;	/\(** core is CopyArea or CopyPlane */
+	int minor_code;	/\(** not defined in the core */
 } XNoExposeEvent;
 .De
 .LP
diff --git a/man/XGravityEvent.man b/man/XGravityEvent.man
index 2095aed4..c8bb2428 100644
--- a/man/XGravityEvent.man
+++ b/man/XGravityEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XGEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XGEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XGravityEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* GravityNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** GravityNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
 	int x, y;
diff --git a/man/XKeymapEvent.man b/man/XKeymapEvent.man
index 01c75ae4..81bf4ca4 100644
--- a/man/XKeymapEvent.man
+++ b/man/XKeymapEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XKMapEven.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XKMapEven.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XKeymapEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -151,12 +152,12 @@ events contains:
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* generated on EnterWindow and FocusIn when KeymapState selected */
+/\(** generated on EnterWindow and FocusIn when KeymapState selected */
 typedef struct {
-	int type;	/* KeymapNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** KeymapNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	char key_vector[32];
 } XKeymapEvent;	
diff --git a/man/XLoadFont.man b/man/XLoadFont.man
index 52affe75..0e0e06ce 100644
--- a/man/XLoadFont.man
+++ b/man/XLoadFont.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.4 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -312,12 +313,12 @@ structures contain:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	short lbearing;	/* origin to left edge of raster */
-	short rbearing;	/* origin to right edge of raster */
-	short width;	/* advance to next char's origin */
-	short ascent;	/* baseline to top edge of raster */
-	short descent;	/* baseline to bottom edge of raster */
-	unsigned short attributes;	/* per char flags (not predefined) */
+	short lbearing;	/\(** origin to left edge of raster */
+	short rbearing;	/\(** origin to right edge of raster */
+	short width;	/\(** advance to next char's origin */
+	short ascent;	/\(** baseline to top edge of raster */
+	short descent;	/\(** baseline to bottom edge of raster */
+	unsigned short attributes;	/\(** per char flags (not predefined) */
 } XCharStruct;
 .De
 .LP
@@ -335,7 +336,7 @@ typedef struct {
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-typedef struct {	/* normal 16 bit characters are two bytes */
+typedef struct {	/\(** normal 16 bit characters are two bytes */
     unsigned char byte1;
     unsigned char byte2;
 } XChar2b;
@@ -346,22 +347,22 @@ typedef struct {	/* normal 16 bit characters are two bytes */
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	Font fid;	/* Font id for this font */
-	unsigned direction;	/* hint about the direction font is painted */
-	unsigned min_char_or_byte2;	/* first character */
-	unsigned max_char_or_byte2;	/* last character */
-	unsigned min_byte1;	/* first row that exists */
-	unsigned max_byte1;	/* last row that exists */
-	Bool all_chars_exist;	/* flag if all characters have nonzero size */
-	unsigned default_char;	/* char to print for undefined character */
-	int n_properties;	/* how many properties there are */
-	XFontProp *properties;	/* pointer to array of additional properties */
-	XCharStruct min_bounds;	/* minimum bounds over all existing char */
-	XCharStruct max_bounds;	/* maximum bounds over all existing char */
-	XCharStruct *per_char;	/* first_char to last_char information */
-	int ascent;	/* logical extent above baseline for spacing */
-	int descent;	/* logical decent below baseline for spacing */
+	XExtData *ext_data;	/\(** hook for extension to hang data */
+	Font fid;	/\(** Font id for this font */
+	unsigned direction;	/\(** hint about the direction font is painted */
+	unsigned min_char_or_byte2;	/\(** first character */
+	unsigned max_char_or_byte2;	/\(** last character */
+	unsigned min_byte1;	/\(** first row that exists */
+	unsigned max_byte1;	/\(** last row that exists */
+	Bool all_chars_exist;	/\(** flag if all characters have nonzero size */
+	unsigned default_char;	/\(** char to print for undefined character */
+	int n_properties;	/\(** how many properties there are */
+	XFontProp *properties;	/\(** pointer to array of additional properties */
+	XCharStruct min_bounds;	/\(** minimum bounds over all existing char */
+	XCharStruct max_bounds;	/\(** maximum bounds over all existing char */
+	XCharStruct *per_char;	/\(** first_char to last_char information */
+	int ascent;	/\(** logical extent above baseline for spacing */
+	int descent;	/\(** logical decent below baseline for spacing */
 } XFontStruct;
 .De
 .LP
diff --git a/man/XMapEvent.man b/man/XMapEvent.man
index 6f89c17d..1c9653e4 100644
--- a/man/XMapEvent.man
+++ b/man/XMapEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XMEvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XMEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XMapEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,13 +153,13 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* MapNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** MapNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
-	Bool override_redirect;	/* boolean, is override set... */
+	Bool override_redirect;	/\(** boolean, is override set... */
 } XMapEvent;
 .De
 .LP
@@ -207,15 +208,15 @@ events is:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* MappingNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	/* unused */
-	int request;	/* one of MappingModifier, MappingKeyboard,
+	int type;	/\(** MappingNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
+	Window window;	/\(** unused */
+	int request;	/\(** one of MappingModifier, MappingKeyboard,
 		   MappingPointer */
-	int first_keycode;	/* first keycode */
-	int count;	/* defines range of change w. first_keycode*/
+	int first_keycode;	/\(** first keycode */
+	int count;	/\(** defines range of change w. first_keycode*/
 } XMappingEvent;
 .De
 .LP
diff --git a/man/XMapRequestEvent.man b/man/XMapRequestEvent.man
index 90b4ffb0..5ea24ba1 100644
--- a/man/XMapRequestEvent.man
+++ b/man/XMapRequestEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XMREvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XMREvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XMapRequestEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* MapRequest */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** MapRequest */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window parent;
 	Window window;
 } XMapRequestEvent;
diff --git a/man/XPropertyEvent.man b/man/XPropertyEvent.man
index 214cd0c9..d7d098a0 100644
--- a/man/XPropertyEvent.man
+++ b/man/XPropertyEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XPEvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XPEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XPropertyEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,14 +153,14 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* PropertyNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** PropertyNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	Atom atom;
 	Time time;
-	int state;	/* PropertyNewValue or PropertyDelete */
+	int state;	/\(** PropertyNewValue or PropertyDelete */
 } XPropertyEvent;
 .De
 .LP
diff --git a/man/XReparentEvent.man b/man/XReparentEvent.man
index 5cc986cc..8d9e831d 100644
--- a/man/XReparentEvent.man
+++ b/man/XReparentEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XREvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XREvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XReparentEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ReparentNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** ReparentNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
 	Window parent;
diff --git a/man/XResizeRequestEvent.man b/man/XResizeRequestEvent.man
index 00d45f36..2aa53195 100644
--- a/man/XResizeRequestEvent.man
+++ b/man/XResizeRequestEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XRREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XRREvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XResizeRequestEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* ResizeRequest */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** ResizeRequest */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	int width, height;
 } XResizeRequestEvent;
diff --git a/man/XSelectionClearEvent.man b/man/XSelectionClearEvent.man
index 6c553450..069c86e7 100644
--- a/man/XSelectionClearEvent.man
+++ b/man/XSelectionClearEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSCEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSCEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XSelectionClearEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* SelectionClear */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** SelectionClear */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	Atom selection;
 	Time time;
diff --git a/man/XSelectionEvent.man b/man/XSelectionEvent.man
index f38648fa..36f5b0a5 100644
--- a/man/XSelectionEvent.man
+++ b/man/XSelectionEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSEvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XSelectionEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,14 +153,14 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* SelectionNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** SelectionNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window requestor;
 	Atom selection;
 	Atom target;
-	Atom property;	/* atom or None */
+	Atom property;	/\(** atom or None */
 	Time time;
 } XSelectionEvent;
 .De
diff --git a/man/XSelectionRequestEvent.man b/man/XSelectionRequestEvent.man
index e9cbb45a..23843f52 100644
--- a/man/XSelectionRequestEvent.man
+++ b/man/XSelectionRequestEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XSREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XSREvent.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XSelectionRequestEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* SelectionRequest */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** SelectionRequest */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window owner;
 	Window requestor;
 	Atom selection;
diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man
index 185fa8d7..8eb608a1 100644
--- a/man/XStringListToTextProperty.man
+++ b/man/XStringListToTextProperty.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\"
-.\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.5 2003/04/28 22:17:56 herrb Exp $
+.\" $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 $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -229,10 +230,10 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	unsigned char *value;	/* property data */
-	Atom encoding;	/* type of property */
-	int format;	/* 8, 16, or 32 */
-	unsigned long nitems;	/* number of items in value */
+	unsigned char *value;	/\(** property data */
+	Atom encoding;	/\(** type of property */
+	int format;	/\(** 8, 16, or 32 */
+	unsigned long nitems;	/\(** number of items in value */
 } XTextProperty;
 .De
 .SH "SEE ALSO"
diff --git a/man/XUnmapEvent.man b/man/XUnmapEvent.man
index e983c8a7..5604fb10 100644
--- a/man/XUnmapEvent.man
+++ b/man/XUnmapEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XUmapEven.man,v 1.2 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XUmapEven.man,v 1.3 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XUnmapEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* UnmapNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** UnmapNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window event;
 	Window window;
 	Bool from_configure;
diff --git a/man/XVisibilityEvent.man b/man/XVisibilityEvent.man
index 4bd013aa..5a92b6ec 100644
--- a/man/XVisibilityEvent.man
+++ b/man/XVisibilityEvent.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XVEvent.man,v 1.3 2001/08/13 19:34:52 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XVEvent.man,v 1.4 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XVisibilityEvent.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -152,10 +153,10 @@ events contains:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	int type;	/* VisibilityNotify */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
+	int type;	/\(** VisibilityNotify */
+	unsigned long serial;	/\(** # of last request processed by server */
+	Bool send_event;	/\(** true if this came from a SendEvent request */
+	Display *display;	/\(** Display the event was read from */
 	Window window;
 	int state;
 } XVisibilityEvent;
diff --git a/man/XcmsColor.man b/man/XcmsColor.man
index 8f8ccfac..d8ff8a65 100644
--- a/man/XcmsColor.man
+++ b/man/XcmsColor.man
@@ -39,7 +39,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XcmsClr.man,v 3.4 2001/01/27 18:20:06 dawes Exp $
+.\" $XFree86: xc/doc/man/X11/XcmsClr.man,v 3.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XcmsColor.man,v 1.1.4.2 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -150,7 +151,7 @@ contains:
 .Ds 0
 .TA .5i 1i 2.5i
 .ta .5i 1i 2.5i
-typedef unsigned long XcmsColorFormat;			/* Color Specification Format */
+typedef unsigned long XcmsColorFormat;			/\(** Color Specification Format */
 
 typedef struct {
 	union {
@@ -166,7 +167,7 @@ typedef struct {
 	} spec;
 	unsigned long pixel;
 	XcmsColorFormat format;
-} XcmsColor;			/* Xcms Color Structure */
+} XcmsColor;			/\(** Xcms Color Structure */
 .De
 .LP
 .Ds 0
@@ -175,20 +176,20 @@ typedef struct {
 typedef double XcmsFloat;
 
 typedef struct {
-	unsigned short red;	/* 0x0000 to 0xffff */
-	unsigned short green;	/* 0x0000 to 0xffff */
-	unsigned short blue;	/* 0x0000 to 0xffff */
-} XcmsRGB;		/* RGB Device */
+	unsigned short red;	/\(** 0x0000 to 0xffff */
+	unsigned short green;	/\(** 0x0000 to 0xffff */
+	unsigned short blue;	/\(** 0x0000 to 0xffff */
+} XcmsRGB;		/\(** RGB Device */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat red;	/* 0.0 to 1.0 */
-	XcmsFloat green;	/* 0.0 to 1.0 */
-	XcmsFloat blue;	/* 0.0 to 1.0 */
-} XcmsRGBi;		/* RGB Intensity */
+	XcmsFloat red;	/\(** 0.0 to 1.0 */
+	XcmsFloat green;	/\(** 0.0 to 1.0 */
+	XcmsFloat blue;	/\(** 0.0 to 1.0 */
+} XcmsRGBi;		/\(** RGB Intensity */
 .De
 .LP
 .Ds 0
@@ -196,59 +197,59 @@ typedef struct {
 .ta .5i 2.5i
 typedef struct {
 	XcmsFloat X;
-	XcmsFloat Y;	/* 0.0 to 1.0 */
+	XcmsFloat Y;	/\(** 0.0 to 1.0 */
 	XcmsFloat Z;
-} XcmsCIEXYZ;		/* CIE XYZ */
+} XcmsCIEXYZ;		/\(** CIE XYZ */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat u_prime;	/* 0.0 to ~0.6 */
-	XcmsFloat v_prime;	/* 0.0 to ~0.6 */
-	XcmsFloat Y; 	/* 0.0 to 1.0 */
-} XcmsCIEuvY;		/* CIE u'v'Y */
+	XcmsFloat u_prime;	/\(** 0.0 to ~0.6 */
+	XcmsFloat v_prime;	/\(** 0.0 to ~0.6 */
+	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+} XcmsCIEuvY;		/\(** CIE u'v'Y */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat x; 	/* 0.0 to ~.75 */
-	XcmsFloat y; 	/* 0.0 to ~.85 */
-	XcmsFloat Y; 	/* 0.0 to 1.0 */
-} XcmsCIExyY;		/* CIE xyY */
+	XcmsFloat x; 	/\(** 0.0 to ~.75 */
+	XcmsFloat y; 	/\(** 0.0 to ~.85 */
+	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+} XcmsCIExyY;		/\(** CIE xyY */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat L_star; 	/* 0.0 to 100.0 */
+	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
 	XcmsFloat a_star;
 	XcmsFloat b_star;
-} XcmsCIELab;		/* CIE L*a*b* */
+} XcmsCIELab;		/\(** CIE L*a*b* */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat L_star; 	/* 0.0 to 100.0 */
+	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
 	XcmsFloat u_star;
 	XcmsFloat v_star;
-} XcmsCIELuv;		/* CIE L*u*v* */
+} XcmsCIELuv;		/\(** CIE L*u*v* */
 .De
 .LP
 .Ds 0
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	XcmsFloat H; 	/* 0.0 to 360.0 */
-	XcmsFloat V; 	/* 0.0 to 100.0 */
-	XcmsFloat C; 	/* 0.0 to 100.0 */
-} XcmsTekHVC;		/* TekHVC */
+	XcmsFloat H; 	/\(** 0.0 to 360.0 */
+	XcmsFloat V; 	/\(** 0.0 to 100.0 */
+	XcmsFloat C; 	/\(** 0.0 to 100.0 */
+} XcmsTekHVC;		/\(** TekHVC */
 .De
 .LP
 .Ds 0
@@ -259,7 +260,7 @@ typedef struct {
 	XcmsFloat pad1;
 	XcmsFloat pad2;
 	XcmsFloat pad3;
-} XcmsPad;		/* four doubles */
+} XcmsPad;		/\(** four doubles */
 .De
 .SH DESCRIPTION
 The
diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
index eaeb8f06..fe3740c3 100644
--- a/man/XmbDrawText.man
+++ b/man/XmbDrawText.man
@@ -41,7 +41,8 @@
 .\" of this documentation for any purpose.
 .\" 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 $
+.\" $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 $
 .\" 
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -226,10 +227,10 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	char *chars;	/* pointer to string */
-	int nchars;	/* number of bytes */
-	int delta;	/* pixel delta between strings */
-	XFontSet font_set; 	/* fonts, None means don't change */
+	char *chars;	/\(** pointer to string */
+	int nchars;	/\(** number of bytes */
+	int delta;	/\(** pixel delta between strings */
+	XFontSet font_set; 	/\(** fonts, None means don't change */
 } XmbTextItem;
 .De
 The
@@ -239,10 +240,10 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	wchar_t *chars;	/* pointer to wide char string */
-	int nchars;	/* number of wide characters */
-	int delta;	/* pixel delta between strings */
-	XFontSet font_set;	/* fonts, None means don't change */
+	wchar_t *chars;	/\(** pointer to wide char string */
+	int nchars;	/\(** number of wide characters */
+	int delta;	/\(** pixel delta between strings */
+	XFontSet font_set;	/\(** fonts, None means don't change */
 } XwcTextItem;
 .De
 .SH "SEE ALSO"
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index 8959ca61..41b01940 100644
--- a/man/XmbTextListToTextProperty.man
+++ b/man/XmbTextListToTextProperty.man
@@ -42,7 +42,8 @@
 .\" of this documentation for any purpose.
 .\" 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 $
+.\" $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 $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -405,10 +406,10 @@ structure contains:
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	unsigned char *value;	/* property data */
-	Atom encoding;	/* type of property */
-	int format;	/* 8, 16, or 32 */
-	unsigned long nitems;	/* number of items in value */
+	unsigned char *value;	/\(** property data */
+	Atom encoding;	/\(** type of property */
+	int format;	/\(** 8, 16, or 32 */
+	unsigned long nitems;	/\(** number of items in value */
 } XTextProperty;
 .De
 .LP
@@ -444,11 +445,11 @@ T}
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef enum {
-	XStringStyle,		/* STRING */
-	XCompoundTextStyle,	/* COMPOUND_TEXT */
-	XTextStyle,		/* text in owner's encoding (current locale) */
-	XStdICCTextStyle,	/* STRING, else COMPOUND_TEXT */
-	XUTF8StringStyle	/* UTF8_STRING */
+	XStringStyle,		/\(** STRING */
+	XCompoundTextStyle,	/\(** COMPOUND_TEXT */
+	XTextStyle,		/\(** text in owner's encoding (current locale) */
+	XStdICCTextStyle,	/\(** STRING, else COMPOUND_TEXT */
+	XUTF8StringStyle	/\(** UTF8_STRING */
 } XICCEncodingStyle;
 .De
 .SH "SEE ALSO"
diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man
index d5b79b67..3ae93ba9 100644
--- a/man/XrmInitialize.man
+++ b/man/XrmInitialize.man
@@ -40,7 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.4 2003/04/28 22:17:55 herrb Exp $
+.\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
+.\" $XdotOrg: lib/X11/man/XrmInitialize.man,v 1.1.4.3 2003-12-06 13:22:41 kaleb Exp $
 .\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
@@ -232,14 +233,14 @@ typedef struct {
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef enum {
-	XrmoptionNoArg,	/* Value is specified in XrmOptionDescRec.value */
-	XrmoptionIsArg,	/* Value is the option string itself */
-	XrmoptionStickyArg,	/* Value is characters immediately following option */
-	XrmoptionSepArg,	/* Value is next argument in argv */
-	XrmoptionResArg,	/* Resource and value in next argument in argv */
-	XrmoptionSkipArg,	/* Ignore this option and the next argument in argv */
-	XrmoptionSkipLine,	/* Ignore this option and the rest of argv */
-	XrmoptionSkipNArgs	/* Ignore this option and the next
+	XrmoptionNoArg,	/\(** Value is specified in XrmOptionDescRec.value */
+	XrmoptionIsArg,	/\(** Value is the option string itself */
+	XrmoptionStickyArg,	/\(** Value is characters immediately following option */
+	XrmoptionSepArg,	/\(** Value is next argument in argv */
+	XrmoptionResArg,	/\(** Resource and value in next argument in argv */
+	XrmoptionSkipArg,	/\(** Ignore this option and the next argument in argv */
+	XrmoptionSkipLine,	/\(** Ignore this option and the rest of argv */
+	XrmoptionSkipNArgs	/\(** Ignore this option and the next
 		\ \ \ XrmOptionDescRec.value arguments in argv */
 } XrmOptionKind;
 .De
@@ -248,10 +249,10 @@ typedef enum {
 .TA .5i 2.5i
 .ta .5i 2.5i
 typedef struct {
-	char *option;	/* Option specification string in argv		    */
-	char *specifier;	/* Binding and resource name (sans application name)    */
-	XrmOptionKind argKind;	/* Which style of option it is	    */
-	XPointer value;	/* Value to provide if XrmoptionNoArg or 
+	char *option;	/\(** Option specification string in argv		    */
+	char *specifier;	/\(** Binding and resource name (sans application name)    */
+	XrmOptionKind argKind;	/\(** Which style of option it is	    */
+	XPointer value;	/\(** Value to provide if XrmoptionNoArg or 
 		\ \ \ XrmoptionSkipNArgs   */
 } XrmOptionDescRec, *XrmOptionDescList;
 .De
diff --git a/src/ConnDis.c b/src/ConnDis.c
index 667214c7..739d49b0 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
 /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
 /*
  
@@ -24,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.27 2003/07/20 16:12:14 tsi Exp $ */
+/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
 
 /* 
  * This file contains operating system dependencies.
@@ -1081,6 +1082,32 @@ GetAuthorization(
 	    break;
 	}
 #endif /* AF_INET */
+#if defined(IPv6) && defined(AF_INET6)
+	case AF_INET6:
+	  /* XXX This should probably never happen */
+	{
+	    unsigned char ipv4mappedprefix[] = {
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
+	    
+	    /* In the case of v4 mapped addresses send the v4 
+	       part of the address - addr is already in network byte order */
+	    if (memcmp(addr+8, ipv4mappedprefix, 12) == 0) {
+		for (i = 20 ; i < 24; i++)
+		    xdmcp_data[j++] = ((char *)addr)[i];
+	    
+		/* Port number */
+		for (i=2; i<4; i++)
+		    xdmcp_data[j++] = ((char *)addr)[i];
+		break;
+	    } else {
+		/* Fake data to keep the data aligned. Otherwise the 
+		   the server will bail about incorrect timing data */
+		for (i = 0; i < 8; i++) {
+		    xdmcp_data[j++] = 0;
+		}
+	    }
+	}
+#endif /* AF_INET6 */
 #ifdef AF_UNIX
 	case AF_UNIX:
 	{
diff --git a/src/SetLocale.c b/src/SetLocale.c
index c44c3bc3..decfcf55 100644
--- a/src/SetLocale.c
+++ b/src/SetLocale.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
 /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
 
 /*
@@ -65,8 +66,6 @@ from The Open Group.
 
 #define MAXLOCALE	64	/* buffer size of locale name */
 
-#define MAXLOCALE	64	/* buffer size of locale name */
-
 #ifdef X_LOCALE
 
 /* alternative setlocale() for when the OS does not provide one */
diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
index c283be3d..3ec062ee 100644
--- a/src/xcms/HVC.c
+++ b/src/xcms/HVC.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
 /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
 
 /*
@@ -57,8 +58,6 @@
 
 #include <stdio.h>
 
-#include <stdio.h>
-
 /*
  *	DEFINES
  */
diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c
index 4b133cb5..4699a7b4 100644
--- a/src/xcms/cmsColNm.c
+++ b/src/xcms/cmsColNm.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
 /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
 
 /*
@@ -47,7 +48,6 @@
 static Status LoadColornameDB(void);
 
 
-
 /*
  *      LOCAL DEFINES
  *		#define declarations local to this package.