diff --git a/akka-docs/java/untyped-actors.rst b/akka-docs/java/untyped-actors.rst
index ca1005defb..e1fad292fc 100644
--- a/akka-docs/java/untyped-actors.rst
+++ b/akka-docs/java/untyped-actors.rst
@@ -342,11 +342,9 @@ Stopping actors
 
 Actors are stopped by invoking the :meth:`stop` method of a ``ActorRefFactory``,
 i.e. ``ActorContext`` or ``ActorSystem``. Typically the context is used for stopping
-child actors and the system for stopping top level actors. When using the context
-to stop an actor the actual termination of the actor is performed asynchronously,
-i.e. :meth:`stop` may return before the actor is stopped. When using the system to
-stop an actor the :meth:`stop` method will block until the actor is stopped, or
-timeout occurs (``akka.actor.creation-timeout`` :ref:`configuration` property).
+child actors and the system for stopping top level actors. The actual termination of
+the actor is performed asynchronously, i.e. :meth:`stop` may return before the actor is
+stopped.
 
 Processing of the current message, if any, will continue before the actor is stopped,
 but additional messages in the mailbox will not be processed. By default these
diff --git a/akka-docs/scala/actors.rst b/akka-docs/scala/actors.rst
index 526eed201a..04b13f3f92 100644
--- a/akka-docs/scala/actors.rst
+++ b/akka-docs/scala/actors.rst
@@ -409,11 +409,9 @@ Stopping actors
 
 Actors are stopped by invoking the :meth:`stop` method of a ``ActorRefFactory``,
 i.e. ``ActorContext`` or ``ActorSystem``. Typically the context is used for stopping
-child actors and the system for stopping top level actors. When using the context
-to stop an actor the actual termination of the actor is performed asynchronously,
-i.e. :meth:`stop` may return before the actor is stopped. When using the system to
-stop an actor the :meth:`stop` method will block until the actor is stopped, or
-timeout occurs (``akka.actor.creation-timeout`` :ref:`configuration` property).
+child actors and the system for stopping top level actors. The actual termination of
+the actor is performed asynchronously, i.e. :meth:`stop` may return before the actor is
+stopped.
 
 Processing of the current message, if any, will continue before the actor is stopped,
 but additional messages in the mailbox will not be processed. By default these