diff --git a/doc_src/index.rst b/doc_src/index.rst
index 95f501e53..09202a19a 100644
--- a/doc_src/index.rst
+++ b/doc_src/index.rst
@@ -63,9 +63,15 @@ Default Shell
 
 There are multiple ways to switch to fish (or any other shell) as your default.
 
-The simpler is to set your terminal to start fish. See its configuration and set the program to start to ``/usr/local/bin/fish`` (if that's where fish is installed - substitute another location as appropriate).
+The simplest method is to set your terminal emulator (eg GNOME Terminal, Apple's Terminal.app, or Konsole) to start fish directly. See its configuration and set the program to start to ``/usr/local/bin/fish`` (if that's where fish is installed - substitute another location as appropriate).
 
-The more involved and complete way is to set fish as your login shell. To do that, you need to:
+Alternatively, you can set fish as your login shell so that it will be started by all terminal logins, including SSH.
+
+.. warning::
+
+    Setting fish as your login shell may cause issues, such as an incorrect :envvar:`PATH`. Some operating systems, including a number of Linux distributions, require the login shell to be Bourne-compatible and to read configuration from ``/etc/profile``. fish may not be suitable as a login shell on these systems.
+
+To change your login shell to fish:
 
 1. Add the shell to ``/etc/shells`` with::
 
@@ -75,11 +81,7 @@ The more involved and complete way is to set fish as your login shell. To do tha
 
     > chsh -s /usr/local/bin/fish
 
-Again, substitute the path to fish for /usr/local/bin/fish - see ``command -s fish`` inside fish. To change it back to another shell, just substitute ``/usr/local/bin/fish`` with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps above.
-
-.. warning::
-
-   Setting fish as your login shell may have issues, because some operating systems (including a bunch of linux distributions) only do some of their configuration in shell startup files like /etc/profile. So you could notice e.g. $PATH being wrong, and you would have to redo that setup.
+Again, substitute the path to fish for ``/usr/local/bin/fish`` - see ``command -s fish`` inside fish. To change it back to another shell, just substitute ``/usr/local/bin/fish`` with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps above.
 
 Uninstalling
 ------------
diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 3795956ff..0b5bb37bd 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -517,7 +517,7 @@ div.body .internal.reference:link {
     div.body a {
         color: #2092fa;
     }
-    
+
     /* Color based on the Name.Function (.nf) class from pygments.css. */
     .command { color: #008fd7 }
 
@@ -529,4 +529,8 @@ div.body .internal.reference:link {
     code {
         background-color: rgba(200, 200, 255, .1);
     }
+
+    .warning code {
+        background-color: #604040;
+    }
 }