diff --git a/docs/drivers/freedreno.rst b/docs/drivers/freedreno.rst
index c9a98eb6132..fd46cbd59d0 100644
--- a/docs/drivers/freedreno.rst
+++ b/docs/drivers/freedreno.rst
@@ -308,7 +308,7 @@ the GPU (including its internal hang detection).  If a fault in GPU address
 space happened, you should expect to find a message from the iommu, with the
 faulting address and a hardware unit involved:
 
-.. code-block:: console
+.. code-block:: text
 
   *** gpu fault: ttbr0=000000001c941000 iova=000000010066a000 dir=READ type=TRANSLATION source=TP|VFD (0,0,0,1)
 
diff --git a/docs/gallium/buffermapping.rst b/docs/gallium/buffermapping.rst
index 0681e8fc1fa..5299ec39a22 100644
--- a/docs/gallium/buffermapping.rst
+++ b/docs/gallium/buffermapping.rst
@@ -20,7 +20,7 @@ behavior.
 Portal 2
 ========
 
-.. code-block:: console
+.. code-block:: text
 
   1030842 glXSwapBuffers(dpy = 0x82a8000, drawable = 20971540)
   1030876 glBufferDataARB(target = GL_ELEMENT_ARRAY_BUFFER, size = 65536, data = NULL, usage = GL_DYNAMIC_DRAW)
@@ -54,7 +54,7 @@ the GPU access from the previous frame has completed. This pattern of
 incrementing ``glBufferSubData()`` offsets interleaved with draws from that data
 is common among newer Valve games.
 
-.. code-block:: console
+.. code-block:: text
 
   [ during setup ]
 
@@ -93,7 +93,7 @@ during setup.
 Terraria
 ========
 
-.. code-block:: console
+.. code-block:: text
 
   167581 glXSwapBuffers(dpy = 0x3004630, drawable = 25165844)
 
@@ -114,7 +114,7 @@ synchronization.
 Don't Starve
 ============
 
-.. code-block:: console
+.. code-block:: text
 
   7251917 glGenBuffers(n = 1, buffers = &115052)
   7251918 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = 115052)
@@ -142,7 +142,7 @@ always happen at the end of the next frame.
 Euro Truck Simulator
 ====================
 
-.. code-block:: console
+.. code-block:: text
 
   [usage of VBO 14,15]
   [...]
@@ -199,7 +199,7 @@ different buffer.
 Plague Inc
 ==========
 
-.. code-block:: console
+.. code-block:: text
 
   1640732 glXSwapBuffers(dpy = 0xb218f20, drawable = 23068674)
   1640733 glClientWaitSync(sync = 0xb4141430, flags = 0x0, timeout = 0) = GL_ALREADY_SIGNALED
@@ -246,7 +246,7 @@ ranges when in explicit mode.
 Darkest Dungeon
 ===============
 
-.. code-block:: console
+.. code-block:: text
 
   938384 glXSwapBuffers(dpy = 0x377fcd0, drawable = 23068692)
   
@@ -276,7 +276,7 @@ frame.
 Tabletop Simulator
 ==================
 
-.. code-block:: console
+.. code-block:: text
 
   1287594 glXSwapBuffers(dpy = 0x3e10810, drawable = 23068692)
   1287595 glClientWaitSync(sync = 0x7abf554e37b0, flags = 0x0, timeout = 0) = GL_ALREADY_SIGNALED
@@ -306,7 +306,7 @@ the current frame, so the unsynchronized access to the buffers is safe.
 Hollow Knight
 =============
 
-.. code-block:: console
+.. code-block:: text
 
   1873034 glXSwapBuffers(dpy = 0x28609d0, drawable = 23068692)
   1873035 glClientWaitSync(sync = 0x7b1a5ca6e130, flags = 0x0, timeout = 0) = GL_ALREADY_SIGNALED
@@ -344,7 +344,7 @@ frame's buffer.
 Borderlands 2
 =============
 
-.. code-block:: console
+.. code-block:: text
 
   3561998 glFlush()
   3562004 glXSwapBuffers(dpy = 0xbaf0f90, drawable = 23068705)
diff --git a/docs/install.rst b/docs/install.rst
index 74f4199129b..dfa62ab38c7 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -212,7 +212,7 @@ When compilation has finished, look in the top-level ``lib/`` (or
 ``lib64/``) directory. You'll see a set of library files similar to
 this:
 
-.. code-block:: console
+.. code-block:: text
 
    lrwxrwxrwx    1 brian    users          10 Mar 26 07:53 libGL.so -> libGL.so.1*
    lrwxrwxrwx    1 brian    users          19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100*
@@ -226,7 +226,7 @@ the OSMesa (Off-Screen) interface library.
 
 If you built the DRI hardware drivers, you'll also see the DRI drivers:
 
-.. code-block:: console
+.. code-block:: text
 
    -rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so
    -rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i965_dri.so
diff --git a/docs/releasing.rst b/docs/releasing.rst
index f663522b3a5..e5843fd3ad8 100644
--- a/docs/releasing.rst
+++ b/docs/releasing.rst
@@ -112,7 +112,7 @@ good contact point.
    then they should be squashed together. The commit messages and the
    "``cherry picked from``"-tags must be preserved.
 
-   .. code-block:: console
+   .. code-block:: text
 
       git show b10859ec41d09c57663a258f43fe57c12332698e