diff --git a/doc/source/install/configure-ipmi.rst b/doc/source/install/configure-ipmi.rst
index ea7c3e946a..5a458d968e 100644
--- a/doc/source/install/configure-ipmi.rst
+++ b/doc/source/install/configure-ipmi.rst
@@ -48,8 +48,8 @@ IPMI configuration
 ~~~~~~~~~~~~~~~~~~
 
 If there are slow or unresponsive BMCs in the environment, the
-``command_retry_timeout`` configuration option in the ``[ipmi]`` section may
-need to be lowered. The default is fairly conservative, as setting this timeout
+``min_command_interval`` configuration option in the ``[ipmi]`` section may
+need to be raised. The default is fairly conservative, as setting this timeout
 too low can cause older BMCs to crash and require a hard-reset.
 
 Collecting sensor data
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 5676c04d51..e82e15fd5e 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -1903,20 +1903,15 @@
 
 # Maximum time in seconds to retry retryable IPMI operations.
 # (An operation is retryable, for example, if the requested
-# operation fails because the BMC is busy.) There is a
-# tradeoff when setting this value. Setting this too low may
-# cause older BMCs to crash and require a hard reset. However,
-# setting too high can cause the sync power state periodic
-# task to hang when there are slow or unresponsive BMCs.
-# (integer value)
+# operation fails because the BMC is busy.) Setting this too
+# high can cause the sync power state periodic task to hang
+# when there are slow or unresponsive BMCs. (integer value)
 #command_retry_timeout = 60
 
 # DEPRECATED: Maximum time in seconds to retry IPMI
-# operations. There is a tradeoff when setting this value.
-# Setting this too low may cause older BMCs to crash and
-# require a hard reset. However, setting too high can cause
-# the sync power state periodic task to hang when there are
-# slow or unresponsive BMCs. (integer value)
+# operations. Setting this too high can cause the sync power
+# state periodic task to hang when there are slow or
+# unresponsive BMCs. (integer value)
 # This option is deprecated for removal.
 # Its value may be silently ignored in the future.
 # Reason: Use option [ipmi]/command_retry_timeout to specify
diff --git a/ironic/conf/ipmi.py b/ironic/conf/ipmi.py
index c62b71dbba..e957d8c79c 100644
--- a/ironic/conf/ipmi.py
+++ b/ironic/conf/ipmi.py
@@ -25,17 +25,13 @@ opts = [
                help=_('Maximum time in seconds to retry retryable IPMI '
                       'operations. (An operation is retryable, for '
                       'example, if the requested operation fails '
-                      'because the BMC is busy.) There is a tradeoff when '
-                      'setting this value. Setting this too low may cause '
-                      'older BMCs to crash and require a hard reset. However, '
-                      'setting too high can cause the sync power state '
+                      'because the BMC is busy.) Setting this too high '
+                      'can cause the sync power state '
                       'periodic task to hang when there are slow or '
                       'unresponsive BMCs.')),
     cfg.IntOpt('retry_timeout',
                help=_('Maximum time in seconds to retry IPMI operations. '
-                      'There is a tradeoff when setting this value. Setting '
-                      'this too low may cause older BMCs to crash and require '
-                      'a hard reset. However, setting too high can cause the '
+                      'Setting this too high can cause the '
                       'sync power state periodic task to hang when there are '
                       'slow or unresponsive BMCs.'),
                deprecated_for_removal=True,