diff --git a/docs/source/command_line.rst b/docs/source/command_line.rst
index 5a674af4ee579..4c00fe9b1ed27 100644
--- a/docs/source/command_line.rst
+++ b/docs/source/command_line.rst
@@ -465,7 +465,8 @@ The following flags adjust how mypy handles values of type ``None``.
     .. warning::
 
         ``--no-strict-optional`` is evil. Avoid using it and definitely do
-        not use it without understanding what it does.
+        not use it without understanding what it does. See also the
+        :confval:`strict_optional` config file option.
 
 
 .. _configuring-warnings:
diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst
index 18bb32d0d02c1..3ab90404e62b4 100644
--- a/docs/source/config_file.rst
+++ b/docs/source/config_file.rst
@@ -626,7 +626,8 @@ section of the command line docs.
     .. warning::
 
         ``strict_optional = false`` is evil. Avoid using it and definitely do
-        not use it without understanding what it does.
+        not use it without understanding what it does. See also the
+        :option:`--no-strict-optional <mypy --no-strict-optional>` command-line flag.
 
 
 Configuring warnings