Fixed several typos from spell-checking.

src/mesa/glapi/glapi.c

@@ -1,4 +1,4 @@
-/* $Id: glapi.c,v 1.67.4.2 2003/01/18 13:42:06 jrfonseca Exp $ */
+/* $Id: glapi.c,v 1.67.4.3 2003/01/19 18:47:53 jrfonseca Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -240,7 +240,7 @@ static GLboolean DispatchOverride = GL_FALSE;
  * 
  * \param str string.
  *
- * \return a pointer to an allocated copy of \p str if sucessful, or NULL if
+ * \return a pointer to an allocated copy of \p str if successful, or NULL if
  * not enough memory.
  * 
  * strdup() is actually not a standard ANSI C or POSIX routine.
@@ -276,7 +276,7 @@ str_dup(const char *str)
  * If more than one thread is detected then permanently sets ThreadSafe to
  * true.
  *
- * Once ThreadSafe is true, it make sure that the calling thread's disptach
+ * Once ThreadSafe is true, it make sure that the calling thread's dispatch
  * pointer isn't null.
  * 
  * \note Is a no-op if not compiled with threads support.
@@ -376,7 +376,7 @@ _glapi_get_context(void)
  * \sa _glapi_get_dispatch().
  *
  * \internal
- * If the dispatch table is being overriden then set the the real dispatch
+ * If the dispatch table is being overridden then set the the real dispatch
  * table pointer (_glapi_RealDispatch) instead of the current dispatch table
  * pointer (_glapi_Dispatch).
  *
@@ -669,7 +669,7 @@ extern void __glapi_sparc_icache_flush(unsigned int *);
  * \internal
  * We need assembly language in order to accomplish this.
  * 
- * The function body is generated in dinamically allocated memory from a static
+ * The function body is generated in dynamically allocated memory from a static
  * machine instruction template specific to the target processor.
  */
 static void *
@@ -776,7 +776,7 @@ generate_entrypoint(GLuint functionOffset)
  * \param offset dispatch table offset.
  *
  * \internal
- * Same as generate_entrypoint(), but without allocating the stuv and copying
+ * Same as generate_entrypoint(), but without allocating the stub and copying
  * the template.
  */
 static void

src/miniglx/dri_util.c

@@ -343,7 +343,7 @@ static void driDestroyDrawable(Display *dpy, void *drawablePrivate)
  * 
  * \internal
  * This function allocates and fills a __DRIdrawablePrivateRec structure,
- * initializing the invariant window dimensions and cliprects.  It obtains the
+ * initializing the invariant window dimensions and clip rects.  It obtains the
  * visual config, converts it into a __GLcontextModesRec and passes it to
  * __DriverAPIRec::CreateBuffer to create a buffer.
  */
@@ -372,7 +372,7 @@ static void *driCreateDrawable(Display *dpy, int scrn,
     pdp->display = dpy;
     pdp->screen = scrn;
 
-    /* Initialize with the invariant window dimensions and cliprects here.
+    /* Initialize with the invariant window dimensions and clip rects here.
      */
     pdp->x = 0;
     pdp->y = 0;
@@ -474,7 +474,7 @@ static void driDestroyContext(Display *dpy, int scrn, void *contextPrivate)
  * \param dpy the display handle.
  * \param scrn the screen number.
  * \param vis the visual information.
- * \param sharedPrivate the shared context dependent methods or NULL if non-existant.
+ * \param sharedPrivate the shared context dependent methods or NULL if non-existent.
  * \param pctx will receive the context dependent methods.
  *
  * \returns a opaque pointer to the per-context private information on success, or NULL
@@ -482,7 +482,7 @@ static void driDestroyContext(Display *dpy, int scrn, void *contextPrivate)
  * 
  * \internal
  * This function allocates and fills a __DRIcontextPrivateRec structure.  It
- * gets the visual config, converts it into a __GLcontextModesRec and passes it
+ * gets the visual, converts it into a __GLcontextModesRec and passes it
  * to __DriverAPIRec::CreateContext to create the context.
  */
 static void *driCreateContext(Display *dpy, XVisualInfo *vis,
@@ -752,7 +752,7 @@ __driUtilCreateScreenNoDRM(Display *dpy, int scrn, __DRIscreen *psc,
  * \internal
  * These can be put in place and safely used prior to __driUtilCreateScreen()
  * being called.  This allows glXCreateContext() to be called prior to
- * XCreateWindow(), but still allows XCreateWindow() to deterimine the virtual
+ * XCreateWindow(), but still allows XCreateWindow() to determine the virtual
  * resolution (a screen parameter as far as the driver is concerned).
  */
 void

src/miniglx/dri_util.h

@@ -98,8 +98,8 @@ do {                                                                    \
 /**
  * \brief Driver callback functions.
  *
- * Each DRI driver must have one of these structs with all the pointers set to
- * appropriate functions within the driver.
+ * Each DRI driver must have one of these structures with all the pointers set
+ * to appropriate functions within the driver.
  * 
  * When glXCreateContext() is called, for example, it'll call a helper function
  * dri_util.c which in turn will jump through the \a CreateContext pointer in
@@ -142,12 +142,12 @@ struct __DriverAPIRec {
     void (*DestroyBuffer)(__DRIdrawablePrivate *driDrawPriv);
 
     /**
-     * \brief Buffer swaping callback 
+     * \brief Buffer swapping callback 
      */
     void (*SwapBuffers)(__DRIdrawablePrivate *driDrawPriv);
 
     /**
-     * \brief Context actication callback
+     * \brief Context activation callback
      */
     GLboolean (*MakeCurrent)(__DRIcontextPrivate *driContextPriv,
                              __DRIdrawablePrivate *driDrawPriv,
@@ -205,7 +205,7 @@ struct __DRIdrawablePrivateRec {
     int refcount;
 
     /**
-     * \brief Index of this drawable's information in the SAREA.
+     * \brief Index of this drawable information in the SAREA.
      */
     unsigned int index;
 
@@ -415,9 +415,10 @@ struct __DRIscreenPrivateRec {
      * other context. 
      *
      * A dummy hHWContext is created for this context, and is used by the GL
-     * core when a HW lock is required but the drawable is not currently bound
-     * (e.g., potentially during a SwapBuffers request).  The dummy context is
-     * created when the first "real" context is created on this screen.
+     * core when a hardware lock is required but the drawable is not currently
+     * bound (e.g., potentially during a SwapBuffers request).  The dummy
+     * context is created when the first "real" context is created on this
+     * screen.
      */
     __DRIcontextPrivate dummyContextPriv;
 

src/miniglx/drm.h

@@ -237,8 +237,8 @@ typedef struct drm_map {
 typedef struct drm_client {
 	int		idx;	/**< Which client desired? */
 	int		auth;	/**< Is client authenticated? */
-	unsigned long	pid;	/**< Process id */
-	unsigned long	uid;	/**< User id */
+	unsigned long	pid;	/**< Process ID */
+	unsigned long	uid;	/**< User ID */
 	unsigned long	magic;	/**< Magic */
 	unsigned long	iocs;	/**< Ioctl count */
 } drm_client_t;
@@ -330,8 +330,8 @@ typedef enum drm_dma_flags {
 
 				      /* Flags for DMA buffer request */
 	_DRM_DMA_WAIT	      = 0x10, /**< Wait for free buffers */
-	_DRM_DMA_SMALLER_OK   = 0x20, /**< Smaller-than-requested buffers ok */
-	_DRM_DMA_LARGER_OK    = 0x40  /**< Larger-than-requested buffers ok */
+	_DRM_DMA_SMALLER_OK   = 0x20, /**< Smaller-than-requested buffers OK */
+	_DRM_DMA_LARGER_OK    = 0x40  /**< Larger-than-requested buffers OK */
 } drm_dma_flags_t;
 
 
@@ -381,7 +381,7 @@ typedef struct drm_buf_free {
  * \sa drm_buf_map.
  */
 typedef struct drm_buf_pub {
-	int		  idx;	       /**< Index into master buflist */
+	int		  idx;	       /**< Index into the master buffer list */
 	int		  total;       /**< Buffer size */
 	int		  used;	       /**< Amount of buffer in use (for DMA) */
 	void		  *address;    /**< Address of buffer */
@@ -392,8 +392,8 @@ typedef struct drm_buf_pub {
  * \brief DRM_IOCTL_MAP_BUFS ioctl argument type.
  */
 typedef struct drm_buf_map {
-	int	      count;	/**< Length of buflist */
-	void	      *virtual;	/**< Mmaped area in user-virtual */
+	int	      count;	/**< Length of the buffer list */
+	void	      *virtual;	/**< Mmap'd area in user-virtual */
 	drm_buf_pub_t *list;	/**< Buffer information */
 } drm_buf_map_t;
 
@@ -401,7 +401,7 @@ typedef struct drm_buf_map {
 /**
  * \brief DRM_IOCTL_DMA ioctl argument type.
  *
- * Indices here refer to the offset into buflist in drm_buf_get_t.
+ * Indices here refer to the offset into the buffer list in drm_buf_get.
  *
  * \sa drmDMA().
  */

src/miniglx/miniglx.c

@@ -22,7 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: miniglx.c,v 1.1.4.40 2003/01/19 14:08:20 jrfonseca Exp $ */
+/* $Id: miniglx.c,v 1.1.4.41 2003/01/19 18:47:54 jrfonseca Exp $ */
 
 
 /**
@@ -74,7 +74,7 @@
 /**
  * \page datatypes Notes on the XVisualInfo, Visual, and __GLXvisualConfig data types
  * 
- * -# X (unfortunately) has two (or three) datatypes which
+ * -# X (unfortunately) has two (or three) data types which
  *    describe visuals.  Ideally, there would just be one.
  * -# We need the #__GLXvisualConfig type to augment #XVisualInfo and #Visual
  *    because we need to describe the GLX-specific attributes of visuals.
@@ -334,7 +334,7 @@ OpenFBDev( Display *dpy )
  *
  * Attempts to draws a bitmap with a gradient.
  *
- * \todo Timings are hardcoded in the code for a set of supported modes.
+ * \todo Timings are hard-coded in the source for a set of supported modes.
  */
 static GLboolean
 SetupFBDev( Display *dpy, Window win )
@@ -661,8 +661,8 @@ _glthread_GetID(void)
 
 
 /**
- * \brief Scan linux /prog/bus/pci/devices file to determine hardware
- * chipset based on supplied busid.
+ * \brief Scan Linux /prog/bus/pci/devices file to determine hardware
+ * chipset based on supplied bus ID.
  * 
  * \return non-zeros on success, zero otherwise.
  * 
@@ -708,7 +708,7 @@ static int get_chipset_from_busid( Display *dpy )
 /**
  * \brief Read settings from a configuration file.
  * 
- * The configuration file is usually "/etc/minigilx.conf", but can be overriden
+ * The configuration file is usually "/etc/miniglx.conf", but can be overridden
  * with the MINIGLX_CONF environment variable. 
  *
  * The format consists in \code option = value \endcode lines. The option names 
@@ -835,7 +835,7 @@ static int __read_config_file( Display *dpy )
  * Calls OpenFBDev() to open the framebuffer device and calls
  * MiniGLXDriverRec::initFBDev to do the client-side initialization on it.
  *
- * Loads the DRI driver and pulls in MiniGLX-specific hooks into a
+ * Loads the DRI driver and pulls in Mini GLX specific hooks into a
  * MiniGLXDriverRec structure, and the standard DRI \e __driCreateScreen hook.
  * Asks the driver for a list of supported visuals.  Performs the per-screen
  * client-side initialization - has to be done this here as it depends on the
@@ -881,7 +881,7 @@ XOpenDisplay( const char *display_name )
       return NULL;
    }
 
-   /* Pull in MiniGLX-specific hooks:
+   /* Pull in Mini GLX specific hooks:
     */
    dpy->driver = (struct MiniGLXDriverRec *) dlsym(dpy->dlHandle,
 						   "__driMiniGLXDriver");
@@ -1003,7 +1003,7 @@ XCloseDisplay( Display *display )
  * screen width such as 1024 or 1280. 
  * \param height the window height. For Mini GLX, this specifies the desired
  * screen height such as 768 or 1024.
- * \param border_width the border sith. For Mini GLX, it should be zero.
+ * \param border_width the border width. For Mini GLX, it should be zero.
  * \param depth the window pixel depth. For Mini GLX, this should be the depth
  * found in the #XVisualInfo object returned by glXChooseVisual() 
  * \param class the window class. For Mini GLX this value should be
@@ -1183,20 +1183,20 @@ XMapWindow( Display *display, Window w )
  * \brief Create color map structure.
  *
  * \param dpy the display handle as returned by XOpenDisplay().
- * \param w the window on whose screen you want to create a colormap. This
+ * \param w the window on whose screen you want to create a color map. This
  * parameter is ignored by Mini GLX but should be the value returned by the
  * \code RootWindow(display, 0) \endcode macro.
  * \param visual a visual type supported on the screen. This parameter is
  * ignored by Mini GLX but should be the XVisualInfo::visual returned by
  * glXChooseVisual().
- * \param alloc the colormap entries to be allocated. This parameter is ignored
+ * \param alloc the color map entries to be allocated. This parameter is ignored
  * by Mini GLX but should be set to #AllocNone.
  *
  * \return the color map.
  * 
  * \internal
  * This function is only provided to ease porting.  Practically a no-op -
- * returns a pointer to a dinamically allocated chunk of memory (one byte).
+ * returns a pointer to a dynamically allocated chunk of memory (one byte).
  */
 Colormap
 XCreateColormap( Display *dpy, Window w, Visual *visual, int alloc )
@@ -1210,10 +1210,10 @@ XCreateColormap( Display *dpy, Window w, Visual *visual, int alloc )
 
 
 /**
- * \brief Destroy colormap structure.
+ * \brief Destroy color map structure.
  *
  * \param display The display handle as returned by XOpenDisplay().
- * \param colormap the colormap to destroy.
+ * \param colormap the color map to destroy.
  *
  * \internal
  * This function is only provided to ease porting.  Practically a no-op. 
@@ -1597,7 +1597,7 @@ glXGetConfig( Display *dpy, XVisualInfo *vis, int attrib, int *value )
  *
  * \internal
  * This function creates and initializes a ::MiniGLXContextRec structure and
- * calls the __DRIscreenRec::createContext method to initalize the client
+ * calls the __DRIscreenRec::createContext method to initialize the client
  * private data.
  */ 
 GLXContext
@@ -1796,8 +1796,8 @@ glXGetCurrentDrawable( void )
  * prevent linking the application with older versions of the library.
  * 
  * \internal
- * Returns the function address by looking up its name in a static (name, func)
- * pair list.
+ * Returns the function address by looking up its name in a static (name,
+ * address) pair list.
  */
 const void *
 glXGetProcAddress( const GLubyte *procName )
@@ -1850,7 +1850,7 @@ glXGetProcAddress( const GLubyte *procName )
  * \sa #MINI_GLX_VERSION_1_0.
  * 
  * \internal
- * Returns the hardcoded Mini GLX version.
+ * Returns the hard-coded Mini GLX version.
  */
 Bool
 glXQueryVersion( Display *dpy, int *major, int *minor )

src/miniglx/miniglxP.h

@@ -176,12 +176,12 @@ struct __DRIdrawableRec {
  * \brief Interface to the DRI driver.
  *
  * This structure is retrieved from the loadable driver by the \e
- * __driMiniGLXDriver symbol to access the MiniGLX-specific hardware
- * initalization and takedown routines.
+ * __driMiniGLXDriver symbol to access the Mini GLX specific hardware
+ * initialization and take down routines.
  */
 struct MiniGLXDriverRec { 
    /**
-    * \brief Get the list of supported configs.
+    * \brief Get the list of supported visuals.
     */
    int (*initScreenConfigs)( struct MiniGLXDisplayRec *dpy,
 			     int *numConfigs, __GLXvisualConfig **configs );
@@ -293,7 +293,7 @@ struct MiniGLXDisplayRec {
    caddr_t MMIOAddress;  /**< \brief start of the mmap'd MMIO region */
    int MMIOSize;         /**< \brief size of the mmap'd MMIO region in bytes */
    int NumWindows;       /**< \brief number of open windows */
-   Window TheWindow;     /**< \brief open windo - only allow one window for now */
+   Window TheWindow;     /**< \brief open window - only allow one window for now */
 
    /**
     * \name Visual configurations
@@ -347,7 +347,7 @@ struct MiniGLXDisplayRec {
    int drmFD;  /**< \brief DRM device file descriptor */
    unsigned long hSAREA;
    unsigned long hFrameBuffer;
-   unsigned int serverContext;	/* temporary drm context -- make an auto var? */
+   unsigned int serverContext;	/* temporary DRM context -- make an auto var? */
    int SAREASize;
    void *pSAREA;
    /*@}*/

src/miniglx/xf86drm.c

@@ -88,7 +88,7 @@
  * \param format printf() like format string.
  *
  * \internal
- * This function is a wrapper arround vfprintf().
+ * This function is a wrapper around vfprintf().
  */
 static void
 drmMsg(const char *format, ...)
@@ -447,7 +447,7 @@ static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s)
  * \note Similar information is available via /proc/dri.
  * 
  * \internal
- * It gets the version information via sucessives DRM_IOCTL_VERSION ioctls,
+ * It gets the version information via successive DRM_IOCTL_VERSION ioctls,
  * first with zeros to get the string lengths, and then the actually strings.
  * It also null-terminates them since they might not be already.
  */
@@ -501,14 +501,14 @@ drmVersionPtr drmGetVersion(int fd)
 /**
  * \brief Get version information for the DRM user space library.
  * 
- * This version number is driver indepedent.
+ * This version number is driver independent.
  * 
  * \param fd file descriptor.
  *
  * \return version information.
  * 
  * \internal
- * This function allocates and fills a drm_version structure with a hardcoded
+ * This function allocates and fills a drm_version structure with a hard coded
  * version number.
  */
 drmVersionPtr drmGetLibVersion(int fd)
@@ -551,7 +551,7 @@ void drmFreeBusid(const char *busid)
  * \return bus ID string.
  *
  * \internal
- * This function gets the bus ID via sucessive DRM_IOCTL_GET_UNIQUE ioctls to
+ * This function gets the bus ID via successive DRM_IOCTL_GET_UNIQUE ioctls to
  * get the string length and data, passing the arguments in a drm_unique
  * structure.
  */
@@ -576,7 +576,7 @@ char *drmGetBusid(int fd)
  * \param fd file descriptor.
  * \param busid bus ID string.
  *
- * \return zero on sucess, negative on failure.
+ * \return zero on success, negative on failure.
  *
  * \internal
  * This function is a wrapper around the DRM_IOCTL_SET_UNIQUE ioctl, passing
@@ -915,7 +915,7 @@ int drmDMA(int fd, drmDMAReqPtr request)
  * 
  * \internal
  * This function translates the arguments into a drm_lock structure and issue
- * the DRM_IOCTL_LOCK ioctl until the lock is sucessfully acquired.
+ * the DRM_IOCTL_LOCK ioctl until the lock is successfully acquired.
  */
 int drmGetLock(int fd, drmContext context, drmLockFlags flags)
 {
@@ -942,7 +942,7 @@ int drmGetLock(int fd, drmContext context, drmLockFlags flags)
  * \param fd file descriptor.
  * \param context context.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_UNLOCK ioctl, passing the
@@ -965,10 +965,10 @@ int drmUnlock(int fd, drmContext context)
  * per-context kernel-level resources to be allocated.
  *
  * \param fd file descriptor.
- * \param handle is set on sucess. To be used by the client when requesting DMA
+ * \param handle is set on success. To be used by the client when requesting DMA
  * dispatch with drmDMA().
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \note May only be called by root.
  * 
@@ -996,12 +996,12 @@ int drmCreateContext(int fd, drmContextPtr handle)
  * \param fd file descriptor.
  * \param handle handle given by drmCreateContext().
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \note May only be called by root.
  * 
  * \internal
- * This function is a wrapper around the DRM_IOCTL_RM_CTX ioctl, passing te
+ * This function is a wrapper around the DRM_IOCTL_RM_CTX ioctl, passing the
  * argument in a drm_ctx structure.
  */
 int drmDestroyContext(int fd, drmContext handle)
@@ -1020,7 +1020,7 @@ int drmDestroyContext(int fd, drmContext handle)
  *
  * \param fd file descriptor.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_ACQUIRE ioctl.
@@ -1037,7 +1037,7 @@ int drmAgpAcquire(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_RELEASE ioctl.
@@ -1055,10 +1055,10 @@ int drmAgpRelease(int fd)
  * \param fd file descriptor.
  * \param mode AGP mode.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
- * This function is a wrapper around the DRM_IOCTL_AGP_ENABLE ioctl, pasing the
+ * This function is a wrapper around the DRM_IOCTL_AGP_ENABLE ioctl, passing the
  * argument in a drm_agp_mode structure.
  */
 int drmAgpEnable(int fd, unsigned long mode)
@@ -1079,9 +1079,9 @@ int drmAgpEnable(int fd, unsigned long mode)
  * \param type type of memory to allocate.
  * \param address if not zero, will be set to the physical address of the
  * allocated memory.
- * \param handle on sucess will be set to a handle of the allocated memory.
+ * \param handle on success will be set to a handle of the allocated memory.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_ALLOC ioctl, passing the
@@ -1108,7 +1108,7 @@ int drmAgpAlloc(int fd, unsigned long size, unsigned long type,
  * \param fd file descriptor.
  * \param handle handle to the allocated memory, as given by drmAgpAllocate().
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_FREE ioctl, passing the
@@ -1132,7 +1132,7 @@ int drmAgpFree(int fd, unsigned long handle)
  * \param handle handle to the allocated memory, as given by drmAgpAllocate().
  * \param offset offset in bytes. It will round to page boundary.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_BIND ioctl, passing the
@@ -1155,7 +1155,7 @@ int drmAgpBind(int fd, unsigned long handle, unsigned long offset)
  * \param fd file descriptor.
  * \param handle handle to the allocated memory, as given by drmAgpAllocate().
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_UNBIND ioctl, passing
@@ -1197,7 +1197,7 @@ int drmAgpVersionMajor(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return minor version number on sucess, or a negative value on failure.
+ * \return minor version number on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1217,7 +1217,7 @@ int drmAgpVersionMinor(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return mode on sucess, or zero on failure.
+ * \return mode on success, or zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1237,7 +1237,7 @@ unsigned long drmAgpGetMode(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return aperture base on sucess, zero on failure.
+ * \return aperture base on success, zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1257,7 +1257,7 @@ unsigned long drmAgpBase(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return aperture size on sucess, zero on failure.
+ * \return aperture size on success, zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1277,7 +1277,7 @@ unsigned long drmAgpSize(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return memory used on sucess, or zero on failure.
+ * \return memory used on success, or zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1297,7 +1297,7 @@ unsigned long drmAgpMemoryUsed(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return memory available on sucess, or zero on failure.
+ * \return memory available on success, or zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1317,7 +1317,7 @@ unsigned long drmAgpMemoryAvail(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return vendor ID on sucess, or zero on failure.
+ * \return vendor ID on success, or zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1337,7 +1337,7 @@ unsigned int drmAgpVendorId(int fd)
  *
  * \param fd file descriptor.
  * 
- * \return zero on sucess, or zero on failure.
+ * \return zero on success, or zero on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the
@@ -1358,7 +1358,7 @@ unsigned int drmAgpDeviceId(int fd)
  * \param fd file descriptor.
  * \param vbl pointer to a drmVBlank structure.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_WAIT_VBLANK ioctl.
@@ -1381,7 +1381,7 @@ int drmWaitVBlank(int fd, drmVBlankPtr vbl)
  * \param fd file descriptor.
  * \param irq IRQ number.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_CONTROL ioctl, passing the
@@ -1403,7 +1403,7 @@ int drmCtlInstHandler(int fd, int irq)
  *
  * \param fd file descriptor.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_CONTROL ioctl, passing the
@@ -1428,7 +1428,7 @@ int drmCtlUninstHandler(int fd)
  * \param devnum device number.
  * \param funcnum function number.
  * 
- * \return IRQ number on sucess, or a negative value on failure.
+ * \return IRQ number on success, or a negative value on failure.
  * 
  * \internal
  * This function is a wrapper around the DRM_IOCTL_IRQ_BUSID ioctl, passing the
@@ -1452,7 +1452,7 @@ int drmGetInterruptFromBusID(int fd, int busnum, int devnum, int funcnum)
  * \param fd file descriptor.
  * \param drmCommandIndex command index 
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * It issues a ioctl given by 
@@ -1480,7 +1480,7 @@ int drmCommandNone(int fd, unsigned long drmCommandIndex)
  * \param data destination pointer of the data to be read.
  * \param size size of the data to be read.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  *
  * \internal
  * It issues a read ioctl given by 
@@ -1509,7 +1509,7 @@ int drmCommandRead(int fd, unsigned long drmCommandIndex,
  * \param data source pointer of the data to be written.
  * \param size size of the data to be written.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * It issues a write ioctl given by 
@@ -1538,7 +1538,7 @@ int drmCommandWrite(int fd, unsigned long drmCommandIndex,
  * \param data source pointer of the data to be read and written.
  * \param size size of the data to be read and written.
  * 
- * \return zero on sucess, or a negative value on failure.
+ * \return zero on success, or a negative value on failure.
  * 
  * \internal
  * It issues a read-write ioctl given by 

src/miniglx/xf86drm.h

@@ -58,7 +58,7 @@ typedef unsigned int  drmSize,     *drmSizePtr;	    /**< For mapped regions */
 typedef void          *drmAddress, **drmAddressPtr; /**< For mapped regions */
 typedef unsigned int  drmContext,  *drmContextPtr;  /**< GLXContext handle */
 typedef unsigned int  drmDrawable, *drmDrawablePtr; /**< Unused */
-typedef unsigned int  drmMagic,    *drmMagicPtr;    /**< Magic for auth */
+typedef unsigned int  drmMagic,    *drmMagicPtr;    /**< Magic for authentication */
 
 /**
  * \brief Driver version information.
@@ -135,8 +135,8 @@ typedef enum {
 
     /* Flags for DMA buffer request */
     DRM_DMA_WAIT         = 0x10, /**< Wait for free buffers */
-    DRM_DMA_SMALLER_OK   = 0x20, /**< Smaller-than-requested buffers ok */
-    DRM_DMA_LARGER_OK    = 0x40  /**< Larger-than-requested buffers ok */
+    DRM_DMA_SMALLER_OK   = 0x20, /**< Smaller-than-requested buffers OK */
+    DRM_DMA_LARGER_OK    = 0x40  /**< Larger-than-requested buffers OK */
 } drmDMAFlags;
 
 typedef enum {
@@ -176,7 +176,7 @@ typedef struct _drmBufInfo {
 } drmBufInfo, *drmBufInfoPtr;
 
 typedef struct _drmBuf {
-    int              idx;	  /**< Index into master buflist */
+    int              idx;	  /**< Index into the master buffer list */
     int              total;	  /**< Buffer size */
     int              used;	  /**< Amount of buffer in use (for DMA) */
     drmAddress       address;	  /**< Address */