diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 35b98273806a..345e8f000a22 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6419,7 +6419,7 @@ receive_replies(ReqId, N, Acc) ->
       <desc>
         <p>Used by a process to redefine the error handler
           for undefined function calls and undefined registered
-          processes. Inexperienced users are not to use this flag,
+          processes. Use this flag with substantial caution,
           as code auto-loading depends on the correct
           operation of the error handling module.</p>
         <p>Returns the old value of the flag.</p>
diff --git a/lib/stdlib/test/shell_docs_SUITE_data/unknown_erlang_process_flag_2_func.txt b/lib/stdlib/test/shell_docs_SUITE_data/unknown_erlang_process_flag_2_func.txt
index 4c3096a3e86e..5019146c4498 100644
--- a/lib/stdlib/test/shell_docs_SUITE_data/unknown_erlang_process_flag_2_func.txt
+++ b/lib/stdlib/test/shell_docs_SUITE_data/unknown_erlang_process_flag_2_func.txt
@@ -63,8 +63,8 @@
                         when Module :: atom(), OldModule :: atom().
 
   Used by a process to redefine the error handler for undefined
-  function calls and undefined registered processes. Use this flag
-  with substantial caution, as code auto-loading depends on
+  function calls and undefined registered processes. Inexperienced
+  users are not to use this flag, as code auto-loading depends on
   the correct operation of the error handling module.
 
   Returns the old value of the flag.