diff --git a/docs/html/quickstart.rst b/docs/html/quickstart.rst
index bae9e2286..de0fd711b 100644
--- a/docs/html/quickstart.rst
+++ b/docs/html/quickstart.rst
@@ -10,7 +10,7 @@ Install a package from `PyPI`_:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install SomePackage
          [...]
@@ -18,7 +18,7 @@ Install a package from `PyPI`_:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install SomePackage
          [...]
@@ -26,14 +26,14 @@ Install a package from `PyPI`_:
 
 
 Install a package that's already been downloaded from `PyPI`_ or
-obtained from elsewhere. This is useful if the target macOShine does not have a
+obtained from elsewhere. This is useful if the target machine does not have a
 network connection:
 
 .. tabs::
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install SomePackage-1.0-py2.py3-none-any.whl
          [...]
@@ -41,7 +41,7 @@ network connection:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install SomePackage-1.0-py2.py3-none-any.whl
          [...]
@@ -54,7 +54,7 @@ Show what files were installed:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip show --files SomePackage
          Name: SomePackage
@@ -66,7 +66,7 @@ Show what files were installed:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip show --files SomePackage
          Name: SomePackage
@@ -82,14 +82,14 @@ List what packages are outdated:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip list --outdated
          SomePackage (Current: 1.0 Latest: 2.0)
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip list --outdated
          SomePackage (Current: 1.0 Latest: 2.0)
@@ -100,7 +100,7 @@ Upgrade a package:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --upgrade SomePackage
          [...]
@@ -112,7 +112,7 @@ Upgrade a package:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --upgrade SomePackage
          [...]
@@ -128,7 +128,7 @@ Uninstall a package:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip uninstall SomePackage
          Uninstalling SomePackage:
@@ -138,7 +138,7 @@ Uninstall a package:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip uninstall SomePackage
          Uninstalling SomePackage:
diff --git a/docs/html/reference/pip.rst b/docs/html/reference/pip.rst
index a0c1148bf..ffd6df3d6 100644
--- a/docs/html/reference/pip.rst
+++ b/docs/html/reference/pip.rst
@@ -13,13 +13,13 @@ Usage
 
       .. code-block:: shell
 
-         $ python -m pip <command> [options]
+         python -m pip <command> [options]
 
    .. group-tab:: Windows
 
       .. code-block:: shell
 
-         C:\> py -m pip <command> [options]
+         py -m pip <command> [options]
 
 Description
 ***********
diff --git a/docs/html/reference/pip_check.rst b/docs/html/reference/pip_check.rst
index 07d700475..719528f20 100644
--- a/docs/html/reference/pip_check.rst
+++ b/docs/html/reference/pip_check.rst
@@ -36,7 +36,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip check
             No broken requirements found.
@@ -45,7 +45,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip check
             No broken requirements found.
@@ -58,7 +58,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip check
             pyramid 1.5.2 requires WebOb, which is not installed.
@@ -67,7 +67,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip check
             pyramid 1.5.2 requires WebOb, which is not installed.
@@ -80,7 +80,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip check
             pyramid 1.5.2 has requirement WebOb>=1.3.1, but you have WebOb 0.8.
@@ -89,7 +89,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip check
             pyramid 1.5.2 has requirement WebOb>=1.3.1, but you have WebOb 0.8.
diff --git a/docs/html/reference/pip_download.rst b/docs/html/reference/pip_download.rst
index 141b6e1fa..b4321be13 100644
--- a/docs/html/reference/pip_download.rst
+++ b/docs/html/reference/pip_download.rst
@@ -178,7 +178,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
           $ python -m pip download \
             --only-binary=:all: \
@@ -193,7 +193,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
           C:\> py -m pip download ^
             --only-binary=:all: ^
diff --git a/docs/html/reference/pip_freeze.rst b/docs/html/reference/pip_freeze.rst
index 91c80979a..e7cc14ead 100644
--- a/docs/html/reference/pip_freeze.rst
+++ b/docs/html/reference/pip_freeze.rst
@@ -43,7 +43,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip freeze
             docutils==0.11
@@ -54,7 +54,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip freeze
             docutils==0.11
diff --git a/docs/html/reference/pip_hash.rst b/docs/html/reference/pip_hash.rst
index 7ed39280c..2313cae82 100644
--- a/docs/html/reference/pip_hash.rst
+++ b/docs/html/reference/pip_hash.rst
@@ -53,7 +53,7 @@ Compute the hash of a downloaded archive:
 
   .. group-tab:: Unix/macOS
 
-    .. code-block:: shell
+    .. code-block:: console
 
       $ python -m pip download SomePackage
           Collecting SomePackage
@@ -66,7 +66,7 @@ Compute the hash of a downloaded archive:
 
   .. group-tab:: Windows
 
-    .. code-block:: shell
+    .. code-block:: console
 
       C:\> py -m pip download SomePackage
           Collecting SomePackage
diff --git a/docs/html/reference/pip_install.rst b/docs/html/reference/pip_install.rst
index b2da26240..68728581f 100644
--- a/docs/html/reference/pip_install.rst
+++ b/docs/html/reference/pip_install.rst
@@ -104,7 +104,7 @@ which depends on foo:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
         $ python -m pip install quux
         ...
@@ -116,7 +116,7 @@ which depends on foo:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
         C:\> py -m pip install quux
         ...
@@ -681,7 +681,7 @@ option:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
           $ python -m pip install --require-hashes -r requirements.txt
               ...
@@ -695,7 +695,7 @@ option:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
           C:\> py -m pip install --require-hashes -r requirements.txt
               ...
diff --git a/docs/html/reference/pip_list.rst b/docs/html/reference/pip_list.rst
index bfdef9ebe..cb6064cc0 100644
--- a/docs/html/reference/pip_list.rst
+++ b/docs/html/reference/pip_list.rst
@@ -44,7 +44,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list
             docutils (0.10)
@@ -55,7 +55,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list
             docutils (0.10)
@@ -70,7 +70,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --outdated
             docutils (Current: 0.10 Latest: 0.11)
@@ -78,7 +78,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --outdated
             docutils (Current: 0.10 Latest: 0.11)
@@ -91,7 +91,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --format columns
             Package Version
@@ -102,7 +102,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --format columns
             Package Version
@@ -117,7 +117,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list -o --format columns
             Package    Version Latest Type
@@ -127,7 +127,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list -o --format columns
             Package    Version Latest Type
@@ -142,14 +142,14 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --outdated --not-required
             docutils (Current: 0.10 Latest: 0.11)
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --outdated --not-required
             docutils (Current: 0.10 Latest: 0.11)
@@ -160,7 +160,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --format=legacy
             colorama (0.3.7)
@@ -170,7 +170,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --format=legacy
             colorama (0.3.7)
@@ -184,14 +184,14 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --format=json
             [{'name': 'colorama', 'version': '0.3.7'}, {'name': 'docopt', 'version': '0.6.2'}, ...
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --format=json
             [{'name': 'colorama', 'version': '0.3.7'}, {'name': 'docopt', 'version': '0.6.2'}, ...
@@ -202,7 +202,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip list --format=freeze
             colorama==0.3.7
@@ -212,7 +212,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip list --format=freeze
             colorama==0.3.7
diff --git a/docs/html/reference/pip_search.rst b/docs/html/reference/pip_search.rst
index e0fc3e25b..c0737aa76 100644
--- a/docs/html/reference/pip_search.rst
+++ b/docs/html/reference/pip_search.rst
@@ -42,7 +42,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
             $ python -m pip search peppercorn
             pepperedform    - Helpers for using peppercorn with formprocess.
@@ -50,7 +50,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
             C:\> py -m pip search peppercorn
             pepperedform    - Helpers for using peppercorn with formprocess.
diff --git a/docs/html/reference/pip_show.rst b/docs/html/reference/pip_show.rst
index ae9182f54..71aa27e78 100644
--- a/docs/html/reference/pip_show.rst
+++ b/docs/html/reference/pip_show.rst
@@ -42,7 +42,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
           $ python -m pip show sphinx
           Name: Sphinx
@@ -57,7 +57,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
           C:\> py -m pip show sphinx
           Name: Sphinx
@@ -76,7 +76,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
           $ python -m pip show --verbose sphinx
           Name: Sphinx
@@ -119,7 +119,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
           C:\> py -m pip show --verbose sphinx
           Name: Sphinx
diff --git a/docs/html/reference/pip_uninstall.rst b/docs/html/reference/pip_uninstall.rst
index 165ac4cd5..ecc3b9210 100644
--- a/docs/html/reference/pip_uninstall.rst
+++ b/docs/html/reference/pip_uninstall.rst
@@ -42,7 +42,7 @@ Examples
 
       .. group-tab:: Unix/macOS
 
-        .. code-block:: shell
+        .. code-block:: console
 
           $ python -m pip uninstall simplejson
           Uninstalling simplejson:
@@ -53,7 +53,7 @@ Examples
 
       .. group-tab:: Windows
 
-        .. code-block:: shell
+        .. code-block:: console
 
           C:\> py -m pip uninstall simplejson
           Uninstalling simplejson:
diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index aa18a6f66..64edc0b18 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -414,7 +414,7 @@ To list installed packages:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip list
          docutils (0.9.1)
@@ -424,7 +424,7 @@ To list installed packages:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip list
          docutils (0.9.1)
@@ -439,7 +439,7 @@ To list outdated packages, and show the latest version available:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip list --outdated
          docutils (Current: 0.9.1 Latest: 0.10)
@@ -447,7 +447,7 @@ To list outdated packages, and show the latest version available:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip list --outdated
          docutils (Current: 0.9.1 Latest: 0.10)
@@ -459,7 +459,7 @@ To show details about an installed package:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip show sphinx
          ---
@@ -470,7 +470,7 @@ To show details about an installed package:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip show sphinx
          ---
@@ -953,14 +953,14 @@ From within a ``--no-site-packages`` virtualenv (i.e. the default kind):
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --user SomePackage
          Can not perform a '--user' install. User site-packages are not visible in this virtualenv.
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --user SomePackage
          Can not perform a '--user' install. User site-packages are not visible in this virtualenv.
@@ -973,14 +973,14 @@ is already installed in the virtualenv:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --user SomePackage==0.4
          Will not install to the user site because it will lack sys.path precedence
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --user SomePackage==0.4
          Will not install to the user site because it will lack sys.path precedence
@@ -991,7 +991,7 @@ From within a real python, where ``SomePackage`` is *not* installed globally:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --user SomePackage
          [...]
@@ -999,7 +999,7 @@ From within a real python, where ``SomePackage`` is *not* installed globally:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --user SomePackage
          [...]
@@ -1012,7 +1012,7 @@ is *not* the latest version:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --user SomePackage
          [...]
@@ -1023,7 +1023,7 @@ is *not* the latest version:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --user SomePackage
          [...]
@@ -1039,7 +1039,7 @@ is the latest version:
 
    .. group-tab:: Unix/macOS
 
-      .. code-block:: shell
+      .. code-block:: console
 
          $ python -m pip install --user SomePackage
          [...]
@@ -1054,7 +1054,7 @@ is the latest version:
 
    .. group-tab:: Windows
 
-      .. code-block:: shell
+      .. code-block:: console
 
          C:\> py -m pip install --user SomePackage
          [...]