From 95b737b6771123d94f8a1249b6a5c4d7c80b1556 Mon Sep 17 00:00:00 2001 From: Benjamin Poserow Date: Thu, 6 Nov 2014 22:43:54 -0500 Subject: [PATCH] +doc #15542 Change FSM doc rst file to correctly specify None value for infinite timeout rather than Duration.Inf --- akka-docs/rst/scala/fsm.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/akka-docs/rst/scala/fsm.rst b/akka-docs/rst/scala/fsm.rst index 4a00697000..18946204b5 100644 --- a/akka-docs/rst/scala/fsm.rst +++ b/akka-docs/rst/scala/fsm.rst @@ -123,9 +123,8 @@ Reference The FSM Trait and Object ------------------------ -The :class:`FSM` trait may only be mixed into an :class:`Actor`. Instead of -extending :class:`Actor`, the self type approach was chosen in order to make it -obvious that an actor is actually created: +The :class:`FSM` trait inherits directly from :class:`Actor`, when you +extend :class:`FSM` you must be aware that an actor is actually created: .. includecode:: code/docs/actor/FSMDocSpec.scala :include: simple-fsm @@ -207,7 +206,7 @@ Each FSM needs a starting point, which is declared using The optionally given timeout argument overrides any specification given for the desired initial state. If you want to cancel a default timeout, use -:obj:`Duration.Inf`. +:obj:`None`. Unhandled Events ----------------