Merging XORG-CURRENT into trunkxprint_packagertest_20041125_baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041125lg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

1 files changed, 20 insertions, 19 deletions

diff --git a/man/Xcursor.man b/man/Xcursor.man
index d3168ea..1f9a62a 100644
--- a/man/Xcursor.man
+++ b/man/Xcursor.man
@@ -1,7 +1,8 @@
 .\"
-.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $
+.\" $Id$
+.\"
+.\" Copyright © 2002 Keith Packard
 .\"
-.\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
@@ -25,7 +26,7 @@
 .ns
 .TP \\$1
 ..
-.TH XCURSOR 3 "Version 1.0" "XFree86"
+.TH XCURSOR 3 "Version 1.0" "Keith Packard"
 
 .SH NAME
 XCURSOR \- Cursor management library
@@ -140,7 +141,7 @@ Images look like:
 Xcursor (mostly) follows the freedesktop.org spec for theming icons.  The
 default search path it uses is $HOME/.icons, /usr/share/icons,
 /usr/share/pimaps, /usr/X11R6/lib/X11/icons.  Within each of these
-directories, it searches for a directory using the theme name.  Within the
+directorys, it searches for a directory using the theme name.  Within the
 theme directory, it looks for cursor files in the 'cursors' subdirectory.
 It uses the first cursor file found along  the path.
 .PP
@@ -161,12 +162,12 @@ value containing ARGB with A in the high byte.
 .nf
 .ft CR
     typedef struct _XcursorImage {
-        XcursorDim	size;	    /\(** nominal size for matching */
-        XcursorDim	width;	    /\(** actual width */
-        XcursorDim	height;	    /\(** actual height */
-        XcursorDim	xhot;	    /\(** hot spot x (must be inside image) */
-        XcursorDim	yhot;       /\(** hot spot y (must be inside image) */
-        XcursorPixel    *pixels;    /\(** pointer to pixels */
+        XcursorDim	size;	    /* nominal size for matching */
+        XcursorDim	width;	    /* actual width */
+        XcursorDim	height;	    /* actual height */
+        XcursorDim	xhot;	    /* hot spot x (must be inside image) */
+        XcursorDim	yhot;       /* hot spot y (must be inside image) */
+        XcursorPixel    *pixels;    /* pointer to pixels */
     } XcursorImage;
 .ft
 .fi
@@ -179,8 +180,8 @@ XcursorImages is freed.
 .nf
 .ft CR
     typedef struct _XcursorImages {
-        int             nimage;	    /\(** number of images */
-        XcursorImage    **images;   /\(** array of XcursorImage pointers */
+        int             nimage;	    /* number of images */
+        XcursorImage    **images;   /* array of XcursorImage pointers */
     } XcursorImages;
 .ft
 .fi
@@ -194,10 +195,10 @@ structures can use the same XcursorCursors.
 .nf
 .ft CR
     typedef struct _XcursorCursors {
-        Display     *dpy;	/\(** Display holding cursors */
-        int	    ref;	/\(** reference count */
-        int	    ncursor;	/\(** number of cursors */
-        Cursor	    *cursors;	/\(** array of cursors */
+        Display     *dpy;	/* Display holding cursors */
+        int	    ref;	/* reference count */
+        int	    ncursor;	/* number of cursors */
+        Cursor	    *cursors;	/* array of cursors */
     } XcursorCursors;
 .ft
 .fi
@@ -211,8 +212,8 @@ holds a reference which is removed when the XcursorAnimate is freed.
 .nf
 .ft CR
     typedef struct _XcursorAnimate {
-        XcursorCursors   *cursors;  /\(** list of cursors to use */
-        int		 sequence;  /\(** which cursor is next */
+        XcursorCursors   *cursors;  /* list of cursors to use */
+        int		 sequence;  /* which cursor is next */
     } XcursorAnimate;
 .ft
 .fi
@@ -375,4 +376,4 @@ will probably change radically in the future; weak attempts will be made to
 retain some level of source-file compatibility.
 
 .SH AUTHOR
-Keith Packard, member of the XFree86 Project, Inc.
+Keith Packard