Merge branch 'main' into add-sections

Author: dukecat0

requirements.txt

@@ -1,5 +1,5 @@
 sphinx==4.0.3
 sphinx-autobuild==0.7.1
 sphinx-inline-tabs==2021.4.11b9
-git+https://github.com/python/python-docs-theme.git#egg=python-docs-theme
+python-docs-theme==2021.5
 git+https://github.com/pypa/pypa-docs-theme.git#egg=pypa-docs-theme

source/guides/installing-stand-alone-command-line-tools.rst

@@ -22,10 +22,21 @@ packages, and allows you to safely run the program from anywhere.
 
 ``pipx`` is installed with ``pip``:
 
-::
+.. tab:: Unix/macOS
+
+  .. code-block:: bash
+
+      python3 -m pip install --user pipx
+
+      python3 -m pipx ensurepath  # ensures the path of the CLI application directory is on your $PATH
+
+.. tab:: Windows
 
-  $ python3 -m pip install --user pipx
-  $ python3 -m pipx ensurepath  # ensures the path of the CLI application directory is on your $PATH
+  .. code-block:: bat
+
+      py -m pip install --user pipx
+      
+      py -m pipx ensurepath
 
 .. Note:: You may need to restart your terminal for the path updates to take effect.
 
@@ -85,11 +96,20 @@ To upgrade or uninstall the package
 
 ``pipx`` can be upgraded or uninstalled with pip
 
-::
+.. tab:: Unix/macOS
+
+  .. code-block:: bash
+
+      python3 -m pip install -U pipx
+      python3 -m pip uninstall pipx
+
+.. tab:: Windows
 
-  $ python3 -m pip install -U pipx
-  $ python3 -m pip uninstall pipx
+  .. code-block:: bat
 
+      py -m pip install -U pipx
+      py -m pip uninstall pipx
+      
 ``pipx`` also allows you to install and run the latest version of a cli tool
 in a temporary, ephemeral environment.
 

source/tutorials/installing-packages.rst

@@ -160,10 +160,19 @@ Ensure pip, setuptools, and wheel are up to date
 
 While ``pip`` alone is sufficient to install from pre-built binary archives,
 up to date copies of the ``setuptools`` and ``wheel`` projects are useful
-to ensure you can also install from source archives::
+to ensure you can also install from source archives:
 
-    python3 -m pip install --upgrade pip setuptools wheel
+.. tab:: Unix/macOS
+
+    .. code-block:: bash
+
+        python3 -m pip install --upgrade pip setuptools wheel
+
+.. tab:: Windows
+
+    .. code-block:: bat
 
+        py -m pip install --upgrade pip setuptools wheel
 
 Optionally, create a virtual environment
 ----------------------------------------