diff --git a/docs/envvars.rst b/docs/envvars.rst
index 2395406c95b..e7da7e9eec3 100644
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -218,7 +218,7 @@ the :doc:`Xlib software driver page <xlibdriver>` for details.
 ``MESA_XSYNC``
    enable synchronous X behavior (for debugging only)
 ``MESA_GLX_FORCE_CI``
-   if set, force GLX to treat 8bpp visuals as CI visuals
+   if set, force GLX to treat 8 BPP visuals as CI visuals
 ``MESA_GLX_FORCE_ALPHA``
    if set, forces RGB windows to have an alpha channel.
 ``MESA_GLX_DEPTH_BITS``
diff --git a/docs/versions.rst b/docs/versions.rst
index 2aaf2212e82..420bb414514 100644
--- a/docs/versions.rst
+++ b/docs/versions.rst
@@ -622,7 +622,7 @@ Bug fixes:
 -  NULL proxy image sent to glTexImageXD() caused crash
 -  added texture state validation optimization (Henk Kok)
 -  fixed colormap reuse problem when using both RGB and CI windows
--  32bpp True/DirectColor X visuals weren't recognized
+-  32 BPP True/DirectColor X visuals weren't recognized
 -  fixed potential problem in evaluators memory allocation
 -  fixed assorted demo compilation bugs
 
@@ -746,7 +746,7 @@ Bug fixes:
 -  glDeleteLists(0, n) caused assertion failure
 -  bilinear texture sampling wasn't accurate enough
 -  glClear w/ glDepthMask(GL_FALSE) didn't work right on 3Dfx
--  color components were reversed on big endian 32 bpp X visuals
+-  color components were reversed on big endian 32 BPP X visuals
 
 Changes:
 
@@ -758,7 +758,7 @@ Changes:
 New:
 
 -  multi-textured points and lines (mjk@nvidia.com)
--  optimized 24bpp X rendering (bernd.paysan@gmx.de)
+-  optimized 24 BPP X rendering (bernd.paysan@gmx.de)
 -  added allegro support (bernie-t@geocities.com)
 -  cleaned-up Windows-related stuff (Ted Jump)
 -  minor stereo changes (KendallB@scitechsoft.com)
@@ -796,7 +796,7 @@ Changes:
 New:
 
 -  optimized glAccum function
--  optimized 24bpp rendering in XMesa driver
+-  optimized 24 BPP rendering in XMesa driver
 -  GLU 1.2 polygon tessellator
 
 Bug Fixes:
@@ -837,7 +837,7 @@ Bug fixes:
 
 -  fixed memcpy bugs in span.c
 -  fixed missing glEnd problem in demos/tessdemo.c
--  fixed bug when clearing 24bpp Ximages
+-  fixed bug when clearing 24 BPP Ximages
 -  fixed clipping problem found in Unreal Tournament
 -  fixed Loki's "ice bug" and "crazy triangles" seen in Heretic2
 -  fixed Loki's 3dfx RGB vs BGR bug
@@ -971,8 +971,8 @@ Bug fixes:
 -  glXCopySubBufferMESA() Y position was off by one
 -  Error checking of glTexSubImage3D() was broken (bug 128775)
 -  glPopAttrib() didn't restore all derived Mesa state correctly
--  Better glReadPixels accuracy for 16bpp color - fixes lots of OpenGL
-   conformance problems at 16bpp.
+-  Better glReadPixels accuracy for 16 BPP color - fixes lots of OpenGL
+   conformance problems at 16 BPP.
 -  clearing depth buffer with scissoring was broken, would segfault
 -  OSMesaGetDepthBuffer() returned bad bytesPerValue value
 -  fixed a line clipping bug (reported by Craig McDaniel)
@@ -1039,7 +1039,7 @@ New:
 -  libOSMesa.so library, contains the OSMesa driver interface
 -  GL/glxext.h header file for GLX extensions
 -  somewhat faster software texturing, fogging, depth testing
--  all color-index conformance tests now pass (only 8bpp tested)
+-  all color-index conformance tests now pass (only 8 BPP tested)
 -  SPARC assembly language TCL optimizations (David Miller)
 -  GL_SGIS_generate_mipmap extension
 
@@ -1143,7 +1143,7 @@ Bug fixes:
 -  glTexEnviv( pname != GL_TEXTURE_ENV_COLOR ) was broken
 -  glReadPixels was sometimes mistakenly clipped by the scissor box
 -  glDraw/ReadPixels didn't catch all the errors that they should have
--  Fixed 24bpp rendering problem in Windows driver (Karl Schultz)
+-  Fixed 24 BPP rendering problem in Windows driver (Karl Schultz)
 -  16-bit GLchan mode fixes (m_trans_tmp.h, s_triangle.c)
 -  Fixed 1-bit float->int conversion bug in glDrawPixels(GL_DEPTH_COMP)
 -  glColorMask as sometimes effecting glXSwapBuffers()